diff options
87 files changed, 1293 insertions, 886 deletions
diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index bfa786134c..a8e76b254a 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,13 +5,13 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 5.6.0.qualifier +Bundle-Version: 5.7.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[5.6.0,5.7.0)", - org.eclipse.jgit.junit;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lib;version="[5.6.0,5.7.0)", - org.eclipse.jgit.util;version="[5.6.0,5.7.0)", + org.eclipse.jgit.ant.tasks;version="[5.7.0,5.8.0)", + org.eclipse.jgit.junit;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lib;version="[5.7.0,5.8.0)", + org.eclipse.jgit.util;version="[5.7.0,5.8.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.12,5.0.0)" diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 6935af82a4..0a0b1b3656 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ant.test</artifactId> diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index fbce458a35..a0d2fe1531 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 5.6.0.qualifier +Bundle-Version: 5.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[5.6.0,5.7.0)" + org.eclipse.jgit.storage.file;version="[5.7.0,5.8.0)" Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.ant;version="5.6.0", - org.eclipse.jgit.ant.tasks;version="5.6.0"; +Export-Package: org.eclipse.jgit.ant;version="5.7.0", + org.eclipse.jgit.ant.tasks;version="5.7.0"; uses:="org.apache.tools.ant, org.apache.tools.ant.types" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 80c658ec48..21bd52f31e 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.6.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.6.0.qualifier";roots="." +Bundle-Version: 5.7.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 54f8a4b989..a53c7d00b8 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -48,7 +48,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ant</artifactId> diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 956d243ba7..93fee3cecb 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 5.6.0.qualifier +Bundle-Version: 5.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -13,17 +13,17 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)", org.apache.commons.compress.compressors.bzip2;version="[1.4,2.0)", org.apache.commons.compress.compressors.gzip;version="[1.4,2.0)", org.apache.commons.compress.compressors.xz;version="[1.4,2.0)", - org.eclipse.jgit.api;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lib;version="[5.6.0,5.7.0)", - org.eclipse.jgit.nls;version="[5.6.0,5.7.0)", - org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)", - org.eclipse.jgit.util;version="[5.6.0,5.7.0)", + org.eclipse.jgit.api;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lib;version="[5.7.0,5.8.0)", + org.eclipse.jgit.nls;version="[5.7.0,5.8.0)", + org.eclipse.jgit.revwalk;version="[5.7.0,5.8.0)", + org.eclipse.jgit.util;version="[5.7.0,5.8.0)", org.osgi.framework;version="[1.3.0,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.jgit.archive.FormatActivator -Export-Package: org.eclipse.jgit.archive;version="5.6.0"; +Export-Package: org.eclipse.jgit.archive;version="5.7.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.api, org.apache.commons.compress.archivers, org.osgi.framework", - org.eclipse.jgit.archive.internal;version="5.6.0";x-internal:=true + org.eclipse.jgit.archive.internal;version="5.7.0";x-internal:=true diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index c0b96705fe..65250a75c7 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.6.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.6.0.qualifier";roots="." +Bundle-Version: 5.7.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 65a1f52170..907420ca75 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.archive</artifactId> diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index a25db37f54..f74df6d153 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -47,7 +47,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.jgit</groupId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> <artifactId>org.eclipse.jgit.benchmarks</artifactId> <packaging>jar</packaging> @@ -124,7 +124,7 @@ <dependency> <groupId>com.google.errorprone</groupId> <artifactId>error_prone_core</artifactId> - <version>2.3.3</version> + <version>2.3.4</version> </dependency> </dependencies> </plugin> diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 9dfb251080..53a46fc1b9 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -18,88 +18,88 @@ <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ant</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.archive</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.http.apache</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.http.server</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.lfs</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.lfs.server</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.pgm</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ui</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ssh.apache</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.test</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ant.test</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.http.test</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.pgm.test</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.lfs.test</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.lfs.server.test</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ssh.apache.test</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </dependency> </dependencies> diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index ff97910919..f19031f896 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 5.6.0.qualifier +Bundle-Version: 5.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor @@ -23,11 +23,11 @@ Import-Package: org.apache.http;version="[4.3.0,5.0.0)", org.apache.http.impl.client;version="[4.3.0,5.0.0)", org.apache.http.impl.conn;version="[4.3.0,5.0.0)", org.apache.http.params;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[5.6.0,5.7.0)", - org.eclipse.jgit.nls;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport.http;version="[5.6.0,5.7.0)", - org.eclipse.jgit.util;version="[5.6.0,5.7.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="5.6.0"; + org.eclipse.jgit.annotations;version="[5.7.0,5.8.0)", + org.eclipse.jgit.nls;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport.http;version="[5.7.0,5.8.0)", + org.eclipse.jgit.util;version="[5.7.0,5.8.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="5.7.0"; uses:="org.apache.http.client, org.eclipse.jgit.transport.http, org.apache.http.entity, diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 8950164877..6d11830f28 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.6.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.6.0.qualifier";roots="." +Bundle-Version: 5.7.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 4be8a980ff..4c94d21174 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -48,7 +48,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.http.apache</artifactId> diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index b2e85a5117..0e86099903 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 5.6.0.qualifier +Bundle-Version: 5.7.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.http.server;version="5.6.0", - org.eclipse.jgit.http.server.glue;version="5.6.0"; +Export-Package: org.eclipse.jgit.http.server;version="5.7.0", + org.eclipse.jgit.http.server.glue;version="5.7.0"; uses:="javax.servlet,javax.servlet.http", - org.eclipse.jgit.http.server.resolver;version="5.6.0"; + org.eclipse.jgit.http.server.resolver;version="5.7.0"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, @@ -18,14 +18,14 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.servlet;version="[2.5.0,3.2.0)", javax.servlet.http;version="[2.5.0,3.2.0)", - org.eclipse.jgit.annotations;version="[5.6.0,5.7.0)", - org.eclipse.jgit.errors;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.transport.parser;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lib;version="[5.6.0,5.7.0)", - org.eclipse.jgit.nls;version="[5.6.0,5.7.0)", - org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport.resolver;version="[5.6.0,5.7.0)", - org.eclipse.jgit.util;version="[5.6.0,5.7.0)" + org.eclipse.jgit.annotations;version="[5.7.0,5.8.0)", + org.eclipse.jgit.errors;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.storage.file;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.transport.parser;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lib;version="[5.7.0,5.8.0)", + org.eclipse.jgit.nls;version="[5.7.0,5.8.0)", + org.eclipse.jgit.revwalk;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport.resolver;version="[5.7.0,5.8.0)", + org.eclipse.jgit.util;version="[5.7.0,5.8.0)" diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index e051fd8283..d85db5e60e 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.6.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.6.0.qualifier";roots="." +Bundle-Version: 5.7.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 97d90d0b54..e4ce5330ec 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -52,7 +52,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.http.server</artifactId> diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitFilter.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitFilter.java index e9462eeb4c..06970a7693 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitFilter.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitFilter.java @@ -96,6 +96,8 @@ public class GitFilter extends MetaFilter { private ReceivePackFactory<HttpServletRequest> receivePackFactory = new DefaultReceivePackFactory(); + private ReceivePackErrorHandler receivePackErrorHandler; + private final List<Filter> uploadPackFilters = new LinkedList<>(); private final List<Filter> receivePackFilters = new LinkedList<>(); @@ -190,6 +192,17 @@ public class GitFilter extends MetaFilter { } /** + * Set a custom error handler for git-receive-pack. + * + * @param h + * A custom error handler for git-receive-pack. + */ + public void setReceivePackErrorHandler(ReceivePackErrorHandler h) { + assertNotInitialized(); + this.receivePackErrorHandler = h; + } + + /** * Add receive-pack filter * * @param filter @@ -233,7 +246,7 @@ public class GitFilter extends MetaFilter { b = b.through(new ReceivePackServlet.Factory(receivePackFactory)); for (Filter f : receivePackFilters) b = b.through(f); - b.with(new ReceivePackServlet()); + b.with(new ReceivePackServlet(receivePackErrorHandler)); } ServletBinder refs = serve("*/" + Constants.INFO_REFS); diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitSmartHttpTools.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitSmartHttpTools.java index 5e09d012d7..5077e83b36 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitSmartHttpTools.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitSmartHttpTools.java @@ -48,8 +48,6 @@ import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import static org.eclipse.jgit.http.server.ServletUtils.ATTRIBUTE_HANDLER; import static org.eclipse.jgit.transport.GitProtocolConstants.CAPABILITY_SIDE_BAND_64K; -import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_SIDE_BAND; -import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_SIDE_BAND_64K; import static org.eclipse.jgit.transport.SideBandOutputStream.CH_ERROR; import static org.eclipse.jgit.transport.SideBandOutputStream.SMALL_BUF; @@ -64,14 +62,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.eclipse.jgit.internal.transport.parser.FirstCommand; -import org.eclipse.jgit.internal.transport.parser.FirstWant; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.transport.PacketLineIn; import org.eclipse.jgit.transport.PacketLineOut; import org.eclipse.jgit.transport.ReceivePack; import org.eclipse.jgit.transport.RequestNotYetReadException; import org.eclipse.jgit.transport.SideBandOutputStream; -import org.eclipse.jgit.transport.UploadPack; /** * Utility functions for handling the Git-over-HTTP protocol. @@ -220,44 +216,15 @@ public class GitSmartHttpTools { private static void sendUploadPackError(HttpServletRequest req, HttpServletResponse res, String textForGit) throws IOException { + // Do not use sideband. Sideband is acceptable only while packfile is + // being sent. Other places, like acknowledgement section, do not + // support sideband. Use an error packet. ByteArrayOutputStream buf = new ByteArrayOutputStream(128); PacketLineOut pckOut = new PacketLineOut(buf); - - boolean sideband; - UploadPack up = (UploadPack) req.getAttribute(ATTRIBUTE_HANDLER); - if (up != null) { - try { - sideband = up.isSideBand(); - } catch (RequestNotYetReadException e) { - sideband = isUploadPackSideBand(req); - } - } else - sideband = isUploadPackSideBand(req); - - if (sideband) - writeSideBand(buf, textForGit); - else - writePacket(pckOut, textForGit); + writePacket(pckOut, textForGit); send(req, res, UPLOAD_PACK_RESULT_TYPE, buf.toByteArray()); } - private static boolean isUploadPackSideBand(HttpServletRequest req) { - try { - // The client may be in a state where they have sent the sideband - // capability and are expecting a response in the sideband, but we might - // not have an UploadPack, or it might not have read any of the request. - // So, cheat and read the first line. - String line = new PacketLineIn(req.getInputStream()).readString(); - FirstWant parsed = FirstWant.fromLine(line); - return (parsed.getCapabilities().contains(OPTION_SIDE_BAND) - || parsed.getCapabilities().contains(OPTION_SIDE_BAND_64K)); - } catch (IOException e) { - // Probably the connection is closed and a subsequent write will fail, but - // try it just in case. - return false; - } - } - private static void sendReceivePackError(HttpServletRequest req, HttpServletResponse res, String textForGit) throws IOException { ByteArrayOutputStream buf = new ByteArrayOutputStream(128); @@ -308,7 +275,7 @@ public class GitSmartHttpTools { private static void writePacket(PacketLineOut pckOut, String textForGit) throws IOException { - pckOut.writeString("error: " + textForGit); + pckOut.writeString("ERR " + textForGit); } private static void send(HttpServletRequest req, HttpServletResponse res, diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ReceivePackErrorHandler.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ReceivePackErrorHandler.java new file mode 100644 index 0000000000..ee66cb102f --- /dev/null +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ReceivePackErrorHandler.java @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2019, Google LLC and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.http.server; + +import java.io.IOException; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.eclipse.jgit.transport.ReceivePack; +import org.eclipse.jgit.transport.ServiceMayNotContinueException; + +/** + * Handle git-receive-pack errors. + * + * <p> + * This is an entry point for customizing an error handler for git-receive-pack. + * Right before calling {@link ReceivePack#receiveWithExceptionPropagation}, + * JGit will call this handler if specified through {@link GitFilter}. The + * implementation of this handler is responsible for calling + * {@link ReceivePackRunnable} and handling exceptions for clients. + * + * <p> + * If a custom handler is not specified, JGit will use the default error + * handler. + * + * @since 5.6 + */ +public interface ReceivePackErrorHandler { + /** + * @param req + * The HTTP request + * @param rsp + * The HTTP response + * @param r + * A continuation that handles a git-receive-pack request. + * @throws IOException + */ + void receive(HttpServletRequest req, HttpServletResponse rsp, + ReceivePackRunnable r) throws IOException; + + /** Process a git-receive-pack request. */ + public interface ReceivePackRunnable { + /** + * See {@link ReceivePack#receiveWithExceptionPropagation}. + * + * @throws ServiceMayNotContinueException + * @throws IOException + */ + void receive() throws ServiceMayNotContinueException, IOException; + } + +} diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ReceivePackServlet.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ReceivePackServlet.java index aed36560a8..eb130d0a28 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ReceivePackServlet.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ReceivePackServlet.java @@ -71,6 +71,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.errors.CorruptObjectException; import org.eclipse.jgit.errors.PackProtocolException; import org.eclipse.jgit.errors.UnpackException; @@ -161,6 +162,13 @@ class ReceivePackServlet extends HttpServlet { } } + @Nullable + private final ReceivePackErrorHandler handler; + + ReceivePackServlet(@Nullable ReceivePackErrorHandler handler) { + this.handler = handler; + } + /** {@inheritDoc} */ @Override public void doPost(final HttpServletRequest req, @@ -178,34 +186,42 @@ class ReceivePackServlet extends HttpServlet { }; ReceivePack rp = (ReceivePack) req.getAttribute(ATTRIBUTE_HANDLER); - try { - rp.setBiDirectionalPipe(false); - rsp.setContentType(RECEIVE_PACK_RESULT_TYPE); - - rp.receive(getInputStream(req), out, null); - out.close(); - } catch (CorruptObjectException e ) { - // This should be already reported to the client. - getServletContext().log(MessageFormat.format( - HttpServerText.get().receivedCorruptObject, - e.getMessage(), - ServletUtils.identify(rp.getRepository()))); - consumeRequestBody(req); - out.close(); - - } catch (UnpackException | PackProtocolException e) { - // This should be already reported to the client. - log(rp.getRepository(), e.getCause()); - consumeRequestBody(req); - out.close(); - - } catch (Throwable e) { - log(rp.getRepository(), e); - if (!rsp.isCommitted()) { - rsp.reset(); - sendError(req, rsp, SC_INTERNAL_SERVER_ERROR); + rp.setBiDirectionalPipe(false); + rsp.setContentType(RECEIVE_PACK_RESULT_TYPE); + + if (handler != null) { + handler.receive(req, rsp, () -> { + rp.receiveWithExceptionPropagation(getInputStream(req), out, + null); + out.close(); + }); + } else { + try { + rp.receive(getInputStream(req), out, null); + out.close(); + } catch (CorruptObjectException e ) { + // This should be already reported to the client. + getServletContext().log(MessageFormat.format( + HttpServerText.get().receivedCorruptObject, + e.getMessage(), + ServletUtils.identify(rp.getRepository()))); + consumeRequestBody(req); + out.close(); + + } catch (UnpackException | PackProtocolException e) { + // This should be already reported to the client. + log(rp.getRepository(), e.getCause()); + consumeRequestBody(req); + out.close(); + + } catch (Throwable e) { + log(rp.getRepository(), e); + if (!rsp.isCommitted()) { + rsp.reset(); + sendError(req, rsp, SC_INTERNAL_SERVER_ERROR); + } + return; } - return; } } diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/UploadPackServlet.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/UploadPackServlet.java index 54561e0cfc..6baab5ddd7 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/UploadPackServlet.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/UploadPackServlet.java @@ -70,7 +70,9 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.eclipse.jgit.annotations.Nullable; +import org.eclipse.jgit.errors.PackProtocolException; import org.eclipse.jgit.http.server.UploadPackErrorHandler.UploadPackRunnable; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.transport.InternalHttpServerGlue; @@ -212,7 +214,8 @@ class UploadPackServlet extends HttpServlet { rsp.setContentType(UPLOAD_PACK_RESULT_TYPE); try { - up.upload(getInputStream(req), out, null); + up.uploadWithExceptionPropagation(getInputStream(req), out, + null); out.close(); } catch (ServiceMayNotContinueException e) { if (e.isOutput()) { @@ -245,7 +248,9 @@ class UploadPackServlet extends HttpServlet { log(up.getRepository(), e); if (!rsp.isCommitted()) { rsp.reset(); - sendError(req, rsp, SC_INTERNAL_SERVER_ERROR); + String msg = e instanceof PackProtocolException ? e.getMessage() + : null; + sendError(req, rsp, SC_INTERNAL_SERVER_ERROR, msg); } } } diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 97f1105ad2..d4ea158864 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 5.6.0.qualifier +Bundle-Version: 5.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -28,25 +28,25 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)", org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)", - org.eclipse.jgit.errors;version="[5.6.0,5.7.0)", - org.eclipse.jgit.http.server;version="[5.6.0,5.7.0)", - org.eclipse.jgit.http.server.glue;version="[5.6.0,5.7.0)", - org.eclipse.jgit.http.server.resolver;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.storage.reftable;version="[5.6.0,5.7.0)", - org.eclipse.jgit.junit;version="[5.6.0,5.7.0)", - org.eclipse.jgit.junit.http;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lib;version="[5.6.0,5.7.0)", - org.eclipse.jgit.nls;version="[5.6.0,5.7.0)", - org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)", - org.eclipse.jgit.storage.file;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport.http;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport.http.apache;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport.resolver;version="[5.6.0,5.7.0)", - org.eclipse.jgit.util;version="[5.6.0,5.7.0)", + org.eclipse.jgit.errors;version="[5.7.0,5.8.0)", + org.eclipse.jgit.http.server;version="[5.7.0,5.8.0)", + org.eclipse.jgit.http.server.glue;version="[5.7.0,5.8.0)", + org.eclipse.jgit.http.server.resolver;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.storage.file;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.storage.reftable;version="[5.7.0,5.8.0)", + org.eclipse.jgit.junit;version="[5.7.0,5.8.0)", + org.eclipse.jgit.junit.http;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lib;version="[5.7.0,5.8.0)", + org.eclipse.jgit.nls;version="[5.7.0,5.8.0)", + org.eclipse.jgit.revwalk;version="[5.7.0,5.8.0)", + org.eclipse.jgit.storage.file;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport.http;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport.http.apache;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport.resolver;version="[5.7.0,5.8.0)", + org.eclipse.jgit.util;version="[5.7.0,5.8.0)", org.hamcrest;version="[1.1.0,2.0.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.12,5.0.0)", diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index e055c58a15..94c97427aa 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -51,7 +51,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.http.test</artifactId> diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java index 99aa06b17c..b23fd28547 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java @@ -1214,7 +1214,7 @@ public class SmartClientSmartServerTest extends AllFactoriesHttpTestCase { Collections.<ObjectId> emptySet()); fail("Successfully served ref with value " + c.getRef(master)); } catch (TransportException err) { - assertEquals("internal server error", err.getMessage()); + assertEquals("Internal server error", err.getMessage()); } } finally { noRefServer.tearDown(); diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 5806277710..5c889f6df8 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 5.6.0.qualifier +Bundle-Version: 5.7.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -22,16 +22,16 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)", org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.ssl;version="[9.4.5,10.0.0)", - org.eclipse.jgit.errors;version="[5.6.0,5.7.0)", - org.eclipse.jgit.http.server;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)", - org.eclipse.jgit.junit;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lib;version="[5.6.0,5.7.0)", - org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport.resolver;version="[5.6.0,5.7.0)", + org.eclipse.jgit.errors;version="[5.7.0,5.8.0)", + org.eclipse.jgit.http.server;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.storage.file;version="[5.7.0,5.8.0)", + org.eclipse.jgit.junit;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lib;version="[5.7.0,5.8.0)", + org.eclipse.jgit.revwalk;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport.resolver;version="[5.7.0,5.8.0)", org.junit;version="[4.12,5.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="5.6.0"; +Export-Package: org.eclipse.jgit.junit.http;version="5.7.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.junit, javax.servlet.http, diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index b454cd0fec..3d79cd9825 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.6.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.6.0.qualifier";roots="." +Bundle-Version: 5.7.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index c69f194b8a..dbaa2780af 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.junit.http</artifactId> diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 7ece7603f9..44a0fb6c43 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 5.6.0.qualifier +Bundle-Version: 5.7.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -30,8 +30,8 @@ Import-Package: org.apache.sshd.common;version="[2.2.0,2.3.0)", org.apache.sshd.server.shell;version="[2.2.0,2.3.0)", org.apache.sshd.server.subsystem;version="[2.2.0,2.3.0)", org.apache.sshd.server.subsystem.sftp;version="[2.2.0,2.3.0)", - org.eclipse.jgit.annotations;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lib;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport;version="[5.6.0,5.7.0)", + org.eclipse.jgit.annotations;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lib;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport;version="[5.7.0,5.8.0)", org.slf4j;version="[1.7.0,2.0.0)" -Export-Package: org.eclipse.jgit.junit.ssh;version="5.6.0" +Export-Package: org.eclipse.jgit.junit.ssh;version="5.7.0" diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 2438c0085e..98c2db52ed 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.6.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.6.0.qualifier";roots="." +Bundle-Version: 5.7.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index d4591d7338..e81c02db8b 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.junit.ssh</artifactId> diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index aedfaa99f2..871e329155 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,35 +3,35 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 5.6.0.qualifier +Bundle-Version: 5.7.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.annotations;version="[5.6.0,5.7.0)", - org.eclipse.jgit.api;version="[5.6.0,5.7.0)", - org.eclipse.jgit.api.errors;version="[5.6.0,5.7.0)", - org.eclipse.jgit.dircache;version="[5.6.0,5.7.0)", - org.eclipse.jgit.errors;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.storage.pack;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lib;version="[5.6.0,5.7.0)", - org.eclipse.jgit.merge;version="[5.6.0,5.7.0)", - org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)", - org.eclipse.jgit.storage.file;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport;version="5.6.0", - org.eclipse.jgit.treewalk;version="[5.6.0,5.7.0)", - org.eclipse.jgit.treewalk.filter;version="[5.6.0,5.7.0)", - org.eclipse.jgit.util;version="[5.6.0,5.7.0)", - org.eclipse.jgit.util.io;version="[5.6.0,5.7.0)", - org.eclipse.jgit.util.time;version="[5.6.0,5.7.0)", +Import-Package: org.eclipse.jgit.annotations;version="[5.7.0,5.8.0)", + org.eclipse.jgit.api;version="[5.7.0,5.8.0)", + org.eclipse.jgit.api.errors;version="[5.7.0,5.8.0)", + org.eclipse.jgit.dircache;version="[5.7.0,5.8.0)", + org.eclipse.jgit.errors;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.storage.file;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.storage.pack;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lib;version="[5.7.0,5.8.0)", + org.eclipse.jgit.merge;version="[5.7.0,5.8.0)", + org.eclipse.jgit.revwalk;version="[5.7.0,5.8.0)", + org.eclipse.jgit.storage.file;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport;version="5.7.0", + org.eclipse.jgit.treewalk;version="[5.7.0,5.8.0)", + org.eclipse.jgit.treewalk.filter;version="[5.7.0,5.8.0)", + org.eclipse.jgit.util;version="[5.7.0,5.8.0)", + org.eclipse.jgit.util.io;version="[5.7.0,5.8.0)", + org.eclipse.jgit.util.time;version="[5.7.0,5.8.0)", org.junit;version="[4.12,5.0.0)", org.junit.rules;version="[4.12,5.0.0)", org.junit.runner;version="[4.12,5.0.0)", org.junit.runners;version="[4.12,5.0.0)", org.junit.runners.model;version="[4.12,5.0.0)", org.slf4j;version="[1.7.0,2.0.0)" -Export-Package: org.eclipse.jgit.junit;version="5.6.0"; +Export-Package: org.eclipse.jgit.junit;version="5.7.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -44,4 +44,4 @@ Export-Package: org.eclipse.jgit.junit;version="5.6.0"; org.junit.runners.model, org.junit.runner, org.eclipse.jgit.util.time", - org.eclipse.jgit.junit.time;version="5.6.0";uses:="org.eclipse.jgit.util.time" + org.eclipse.jgit.junit.time;version="5.7.0";uses:="org.eclipse.jgit.util.time" diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index d9a24d8dea..5fa88cb2a5 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.6.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.6.0.qualifier";roots="." +Bundle-Version: 5.7.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index af0a7f1c7a..1385f30dcd 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -52,7 +52,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.junit</artifactId> diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 4279a4aeb9..c4d3c90f00 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 5.6.0.qualifier +Bundle-Version: 5.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -28,24 +28,24 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)", org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)", - org.eclipse.jgit.api;version="[5.6.0,5.7.0)", - org.eclipse.jgit.api.errors;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)", - org.eclipse.jgit.junit;version="[5.6.0,5.7.0)", - org.eclipse.jgit.junit.http;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lfs;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lfs.errors;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lfs.lib;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lfs.server;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lfs.server.fs;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lfs.test;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lib;version="[5.6.0,5.7.0)", - org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)", - org.eclipse.jgit.storage.file;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport;version="[5.6.0,5.7.0)", - org.eclipse.jgit.treewalk;version="[5.6.0,5.7.0)", - org.eclipse.jgit.treewalk.filter;version="[5.6.0,5.7.0)", - org.eclipse.jgit.util;version="[5.6.0,5.7.0)", + org.eclipse.jgit.api;version="[5.7.0,5.8.0)", + org.eclipse.jgit.api.errors;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.storage.file;version="[5.7.0,5.8.0)", + org.eclipse.jgit.junit;version="[5.7.0,5.8.0)", + org.eclipse.jgit.junit.http;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lfs;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lfs.errors;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lfs.lib;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lfs.server;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lfs.server.fs;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lfs.test;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lib;version="[5.7.0,5.8.0)", + org.eclipse.jgit.revwalk;version="[5.7.0,5.8.0)", + org.eclipse.jgit.storage.file;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport;version="[5.7.0,5.8.0)", + org.eclipse.jgit.treewalk;version="[5.7.0,5.8.0)", + org.eclipse.jgit.treewalk.filter;version="[5.7.0,5.8.0)", + org.eclipse.jgit.util;version="[5.7.0,5.8.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.12,5.0.0)", org.junit.rules;version="[4.12,5.0.0)", diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 6fb9b78c93..a291e0f7bb 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.lfs.server.test</artifactId> diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index fb0ee06d6e..90ebd90c0c 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 5.6.0.qualifier +Bundle-Version: 5.7.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs.server;version="5.6.0"; +Export-Package: org.eclipse.jgit.lfs.server;version="5.7.0"; uses:="javax.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="5.6.0"; + org.eclipse.jgit.lfs.server.fs;version="5.7.0"; uses:="javax.servlet, javax.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="5.6.0";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="5.6.0"; + org.eclipse.jgit.lfs.server.internal;version="5.7.0";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="5.7.0"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -25,15 +25,15 @@ Import-Package: com.google.gson;version="[2.8.0,3.0.0)", javax.servlet.http;version="[3.1.0,4.0.0)", org.apache.http;version="[4.3.0,5.0.0)", org.apache.http.client;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lfs.errors;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lfs.internal;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lfs.lib;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lib;version="[5.6.0,5.7.0)", - org.eclipse.jgit.nls;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport.http;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport.http.apache;version="[5.6.0,5.7.0)", - org.eclipse.jgit.util;version="[5.6.0,5.7.0)", + org.eclipse.jgit.annotations;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.storage.file;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lfs.errors;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lfs.internal;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lfs.lib;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lib;version="[5.7.0,5.8.0)", + org.eclipse.jgit.nls;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport.http;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport.http.apache;version="[5.7.0,5.8.0)", + org.eclipse.jgit.util;version="[5.7.0,5.8.0)", org.slf4j;version="[1.7.0,2.0.0)" diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 6f1c3a4731..bac5ee298f 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.6.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.6.0.qualifier";roots="." +Bundle-Version: 5.7.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index b95806b17d..a8c577a09d 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.lfs.server</artifactId> diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 549a0ff8f7..e3fcf70ce2 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,22 +3,22 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 5.6.0.qualifier +Bundle-Version: 5.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.internal.storage.dfs;version="[5.6.0,5.7.0)", - org.eclipse.jgit.junit;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lfs;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lfs.errors;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lfs.lib;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lib;version="[5.6.0,5.7.0)", - org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)", - org.eclipse.jgit.treewalk;version="[5.6.0,5.7.0)", - org.eclipse.jgit.treewalk.filter;version="[5.6.0,5.7.0)", - org.eclipse.jgit.util;version="[5.6.0,5.7.0)", +Import-Package: org.eclipse.jgit.internal.storage.dfs;version="[5.7.0,5.8.0)", + org.eclipse.jgit.junit;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lfs;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lfs.errors;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lfs.lib;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lib;version="[5.7.0,5.8.0)", + org.eclipse.jgit.revwalk;version="[5.7.0,5.8.0)", + org.eclipse.jgit.treewalk;version="[5.7.0,5.8.0)", + org.eclipse.jgit.treewalk.filter;version="[5.7.0,5.8.0)", + org.eclipse.jgit.util;version="[5.7.0,5.8.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.12,5.0.0)", org.junit.runner;version="[4.12,5.0.0)", org.junit.runners;version="[4.12,5.0.0)" -Export-Package: org.eclipse.jgit.lfs.test;version="5.6.0";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="5.7.0";x-friends:="org.eclipse.jgit.lfs.server.test" diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index d1691c3183..778f7a8b6e 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.lfs.test</artifactId> diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 1fd1957afe..a1404f0a47 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,33 +3,33 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 5.6.0.qualifier +Bundle-Version: 5.7.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs;version="5.6.0", - org.eclipse.jgit.lfs.errors;version="5.6.0", - org.eclipse.jgit.lfs.internal;version="5.6.0";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", - org.eclipse.jgit.lfs.lib;version="5.6.0" +Export-Package: org.eclipse.jgit.lfs;version="5.7.0", + org.eclipse.jgit.lfs.errors;version="5.7.0", + org.eclipse.jgit.lfs.internal;version="5.7.0";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", + org.eclipse.jgit.lfs.lib;version="5.7.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.google.gson;version="[2.8.2,3.0.0)", com.google.gson.stream;version="[2.8.2,3.0.0)", org.apache.http.impl.client;version="[4.2.6,5.0.0)", org.apache.http.impl.conn;version="[4.2.6,5.0.0)", - org.eclipse.jgit.annotations;version="[5.6.0,5.7.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[5.6.0,5.7.0)", - org.eclipse.jgit.attributes;version="[5.6.0,5.7.0)", - org.eclipse.jgit.diff;version="[5.6.0,5.7.0)", - org.eclipse.jgit.errors;version="[5.6.0,5.7.0)", - org.eclipse.jgit.hooks;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lib;version="[5.6.0,5.7.0)", - org.eclipse.jgit.nls;version="[5.6.0,5.7.0)", - org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)", - org.eclipse.jgit.storage.file;version="[5.6.0,5.7.0)", - org.eclipse.jgit.storage.pack;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport.http;version="[5.6.0,5.7.0)", - org.eclipse.jgit.treewalk;version="[5.6.0,5.7.0)", - org.eclipse.jgit.treewalk.filter;version="[5.6.0,5.7.0)", - org.eclipse.jgit.util;version="[5.6.0,5.7.0)", - org.eclipse.jgit.util.io;version="[5.6.0,5.7.0)" + org.eclipse.jgit.annotations;version="[5.7.0,5.8.0)";resolution:=optional, + org.eclipse.jgit.api.errors;version="[5.7.0,5.8.0)", + org.eclipse.jgit.attributes;version="[5.7.0,5.8.0)", + org.eclipse.jgit.diff;version="[5.7.0,5.8.0)", + org.eclipse.jgit.errors;version="[5.7.0,5.8.0)", + org.eclipse.jgit.hooks;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.storage.file;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lib;version="[5.7.0,5.8.0)", + org.eclipse.jgit.nls;version="[5.7.0,5.8.0)", + org.eclipse.jgit.revwalk;version="[5.7.0,5.8.0)", + org.eclipse.jgit.storage.file;version="[5.7.0,5.8.0)", + org.eclipse.jgit.storage.pack;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport.http;version="[5.7.0,5.8.0)", + org.eclipse.jgit.treewalk;version="[5.7.0,5.8.0)", + org.eclipse.jgit.treewalk.filter;version="[5.7.0,5.8.0)", + org.eclipse.jgit.util;version="[5.7.0,5.8.0)", + org.eclipse.jgit.util.io;version="[5.7.0,5.8.0)" diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 382d1561e1..4dacb48474 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.6.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.6.0.qualifier";roots="." +Bundle-Version: 5.7.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index f1df7a0833..49daf4238c 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.lfs</artifactId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index fb36ac0abc..7c5106380a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit" label="%featureName" - version="5.6.0.qualifier" + version="5.7.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 0cbe270867..cc5f5aeb83 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index de604cd6e0..17a732b4aa 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit.http.apache" label="%featureName" - version="5.6.0.qualifier" + version="5.7.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -23,7 +23,7 @@ </url> <requires> - <import plugin="org.eclipse.jgit" version="5.6.0" match="equivalent"/> + <import plugin="org.eclipse.jgit" version="5.7.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 81e69d24f0..66d7b300df 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 4604b4f8a0..2b46472561 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit.junit" label="%featureName" - version="5.6.0.qualifier" + version="5.7.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -24,7 +24,7 @@ <requires> <import plugin="com.jcraft.jsch"/> - <import plugin="org.eclipse.jgit" version="5.6.0" match="equivalent"/> + <import plugin="org.eclipse.jgit" version="5.7.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 5d07fa479b..479dcc0d6f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 1b2897d04c..bc8ff0bd53 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit.lfs" label="%featureName" - version="5.6.0.qualifier" + version="5.7.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -23,7 +23,7 @@ </url> <requires> - <import feature="org.eclipse.jgit" version="5.6.0" match="equivalent"/> + <import feature="org.eclipse.jgit" version="5.7.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 0a828971bd..8805bba37f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index dd662c9f28..62df45ef80 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit.pgm" label="%featureName" - version="5.6.0.qualifier" + version="5.7.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -35,9 +35,9 @@ version="0.0.0"/> <requires> - <import feature="org.eclipse.jgit" version="5.6.0" match="equivalent"/> - <import feature="org.eclipse.jgit.lfs" version="5.6.0" match="equivalent"/> - <import feature="org.eclipse.jgit.ssh.apache" version="5.6.0" match="equivalent"/> + <import feature="org.eclipse.jgit" version="5.7.0" match="equivalent"/> + <import feature="org.eclipse.jgit.lfs" version="5.7.0" match="equivalent"/> + <import feature="org.eclipse.jgit.ssh.apache" version="5.7.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 504c1a8c90..a0906c5004 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 8f21d1d92f..77a6d1a690 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.repository</artifactId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index d4828e47c3..caa0dcb09c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit.source" label="%featureName" - version="5.6.0.qualifier" + version="5.7.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -23,7 +23,7 @@ </url> <requires> - <import feature="org.eclipse.jgit" version="5.6.0" match="equivalent"/> + <import feature="org.eclipse.jgit" version="5.7.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 933cc8f495..5ab60597e5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> @@ -63,7 +63,7 @@ <dependency> <groupId>org.eclipse.jgit.feature</groupId> <artifactId>org.eclipse.jgit</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 2582a77e77..41d251baf3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit.ssh.apache" label="%featureName" - version="5.6.0.qualifier" + version="5.7.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -23,7 +23,7 @@ </url> <requires> - <import feature="org.eclipse.jgit" version="5.6.0" match="equivalent"/> + <import feature="org.eclipse.jgit" version="5.7.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index 6fa69eae07..d7e8c61623 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF index 068c15dd98..ff1d81c113 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF @@ -2,4 +2,4 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JGit Target Platform Bundle Bundle-SymbolicName: org.eclipse.jgit.target -Bundle-Version: 5.6.0.qualifier +Bundle-Version: 5.7.0.qualifier diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml index e8d9df0467..6f0a99450f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -49,7 +49,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.target</artifactId> diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 47a8030183..6eeb61745d 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -49,7 +49,7 @@ <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> <packaging>pom</packaging> <name>JGit Tycho Parent</name> diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index fc36051db5..b48c1e5ff2 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,28 +3,28 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 5.6.0.qualifier +Bundle-Version: 5.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.api;version="[5.6.0,5.7.0)", - org.eclipse.jgit.api.errors;version="[5.6.0,5.7.0)", - org.eclipse.jgit.diff;version="[5.6.0,5.7.0)", - org.eclipse.jgit.dircache;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.storage.file;version="5.6.0", - org.eclipse.jgit.junit;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lib;version="[5.6.0,5.7.0)", - org.eclipse.jgit.merge;version="[5.6.0,5.7.0)", - org.eclipse.jgit.pgm;version="[5.6.0,5.7.0)", - org.eclipse.jgit.pgm.internal;version="[5.6.0,5.7.0)", - org.eclipse.jgit.pgm.opt;version="[5.6.0,5.7.0)", - org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)", - org.eclipse.jgit.storage.file;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport;version="[5.6.0,5.7.0)", - org.eclipse.jgit.treewalk;version="[5.6.0,5.7.0)", - org.eclipse.jgit.util;version="[5.6.0,5.7.0)", - org.eclipse.jgit.util.io;version="[5.6.0,5.7.0)", +Import-Package: org.eclipse.jgit.api;version="[5.7.0,5.8.0)", + org.eclipse.jgit.api.errors;version="[5.7.0,5.8.0)", + org.eclipse.jgit.diff;version="[5.7.0,5.8.0)", + org.eclipse.jgit.dircache;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.storage.file;version="5.7.0", + org.eclipse.jgit.junit;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lib;version="[5.7.0,5.8.0)", + org.eclipse.jgit.merge;version="[5.7.0,5.8.0)", + org.eclipse.jgit.pgm;version="[5.7.0,5.8.0)", + org.eclipse.jgit.pgm.internal;version="[5.7.0,5.8.0)", + org.eclipse.jgit.pgm.opt;version="[5.7.0,5.8.0)", + org.eclipse.jgit.revwalk;version="[5.7.0,5.8.0)", + org.eclipse.jgit.storage.file;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport;version="[5.7.0,5.8.0)", + org.eclipse.jgit.treewalk;version="[5.7.0,5.8.0)", + org.eclipse.jgit.util;version="[5.7.0,5.8.0)", + org.eclipse.jgit.util.io;version="[5.7.0,5.8.0)", org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", org.junit;version="[4.12,5.0.0)", org.junit.rules;version="[4.12,5.0.0)", diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 1ba893c7f7..b1473ab919 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.pgm.test</artifactId> diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 48dc730011..b280658a23 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 5.6.0.qualifier +Bundle-Version: 5.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Localization: plugin @@ -28,50 +28,50 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)", org.eclipse.jetty.util.log;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.security;version="[9.4.5,10.0.0)", org.eclipse.jetty.util.thread;version="[9.4.5,10.0.0)", - org.eclipse.jgit.api;version="[5.6.0,5.7.0)", - org.eclipse.jgit.api.errors;version="[5.6.0,5.7.0)", - org.eclipse.jgit.archive;version="[5.6.0,5.7.0)", - org.eclipse.jgit.awtui;version="[5.6.0,5.7.0)", - org.eclipse.jgit.blame;version="[5.6.0,5.7.0)", - org.eclipse.jgit.diff;version="[5.6.0,5.7.0)", - org.eclipse.jgit.dircache;version="[5.6.0,5.7.0)", - org.eclipse.jgit.errors;version="[5.6.0,5.7.0)", - org.eclipse.jgit.gitrepo;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.ketch;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.storage.io;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.storage.pack;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.storage.reftable;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.storage.reftree;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lfs;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lfs.lib;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lfs.server;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lfs.server.fs;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lfs.server.s3;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lib;version="[5.6.0,5.7.0)", - org.eclipse.jgit.merge;version="[5.6.0,5.7.0)", - org.eclipse.jgit.nls;version="[5.6.0,5.7.0)", - org.eclipse.jgit.notes;version="[5.6.0,5.7.0)", - org.eclipse.jgit.revplot;version="[5.6.0,5.7.0)", - org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)", - org.eclipse.jgit.revwalk.filter;version="[5.6.0,5.7.0)", - org.eclipse.jgit.storage.file;version="[5.6.0,5.7.0)", - org.eclipse.jgit.storage.pack;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport.http.apache;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport.resolver;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport.sshd;version="[5.6.0,5.7.0)", - org.eclipse.jgit.treewalk;version="[5.6.0,5.7.0)", - org.eclipse.jgit.treewalk.filter;version="[5.6.0,5.7.0)", - org.eclipse.jgit.util;version="[5.6.0,5.7.0)", - org.eclipse.jgit.util.io;version="[5.6.0,5.7.0)", + org.eclipse.jgit.api;version="[5.7.0,5.8.0)", + org.eclipse.jgit.api.errors;version="[5.7.0,5.8.0)", + org.eclipse.jgit.archive;version="[5.7.0,5.8.0)", + org.eclipse.jgit.awtui;version="[5.7.0,5.8.0)", + org.eclipse.jgit.blame;version="[5.7.0,5.8.0)", + org.eclipse.jgit.diff;version="[5.7.0,5.8.0)", + org.eclipse.jgit.dircache;version="[5.7.0,5.8.0)", + org.eclipse.jgit.errors;version="[5.7.0,5.8.0)", + org.eclipse.jgit.gitrepo;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.ketch;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.storage.file;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.storage.io;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.storage.pack;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.storage.reftable;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.storage.reftree;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lfs;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lfs.lib;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lfs.server;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lfs.server.fs;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lfs.server.s3;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lib;version="[5.7.0,5.8.0)", + org.eclipse.jgit.merge;version="[5.7.0,5.8.0)", + org.eclipse.jgit.nls;version="[5.7.0,5.8.0)", + org.eclipse.jgit.notes;version="[5.7.0,5.8.0)", + org.eclipse.jgit.revplot;version="[5.7.0,5.8.0)", + org.eclipse.jgit.revwalk;version="[5.7.0,5.8.0)", + org.eclipse.jgit.revwalk.filter;version="[5.7.0,5.8.0)", + org.eclipse.jgit.storage.file;version="[5.7.0,5.8.0)", + org.eclipse.jgit.storage.pack;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport.http.apache;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport.resolver;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport.sshd;version="[5.7.0,5.8.0)", + org.eclipse.jgit.treewalk;version="[5.7.0,5.8.0)", + org.eclipse.jgit.treewalk.filter;version="[5.7.0,5.8.0)", + org.eclipse.jgit.util;version="[5.7.0,5.8.0)", + org.eclipse.jgit.util.io;version="[5.7.0,5.8.0)", org.kohsuke.args4j;version="[2.33.0,3.0.0)", org.kohsuke.args4j.spi;version="[2.33.0,3.0.0)" -Export-Package: org.eclipse.jgit.console;version="5.6.0"; +Export-Package: org.eclipse.jgit.console;version="5.7.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="5.6.0"; + org.eclipse.jgit.pgm;version="5.7.0"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.pgm.opt, @@ -82,11 +82,11 @@ Export-Package: org.eclipse.jgit.console;version="5.6.0"; org.eclipse.jgit.treewalk, javax.swing, org.eclipse.jgit.transport", - org.eclipse.jgit.pgm.debug;version="5.6.0"; + org.eclipse.jgit.pgm.debug;version="5.7.0"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm", - org.eclipse.jgit.pgm.internal;version="5.6.0";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="5.6.0"; + org.eclipse.jgit.pgm.internal;version="5.7.0";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", + org.eclipse.jgit.pgm.opt;version="5.7.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.kohsuke.args4j.spi, diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 70aa5003dd..95f81a3b4f 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.6.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.6.0.qualifier";roots="." +Bundle-Version: 5.7.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 003076fd98..c460713159 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.pgm</artifactId> diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 4bae3d9b6e..8fd1756440 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 5.6.0.qualifier +Bundle-Version: 5.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -15,15 +15,15 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.2.0,2.3.0)", org.apache.sshd.common.session;version="[2.2.0,2.3.0)", org.apache.sshd.common.util.net;version="[2.2.0,2.3.0)", org.apache.sshd.common.util.security;version="[2.2.0,2.3.0)", - org.eclipse.jgit.api.errors;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.6.0,5.7.0)", - org.eclipse.jgit.junit;version="[5.6.0,5.7.0)", - org.eclipse.jgit.junit.ssh;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lib;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport.ssh;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport.sshd;version="[5.6.0,5.7.0)", - org.eclipse.jgit.util;version="[5.6.0,5.7.0)", + org.eclipse.jgit.api.errors;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.transport.sshd.proxy;version="[5.7.0,5.8.0)", + org.eclipse.jgit.junit;version="[5.7.0,5.8.0)", + org.eclipse.jgit.junit.ssh;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lib;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport.ssh;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport.sshd;version="[5.7.0,5.8.0)", + org.eclipse.jgit.util;version="[5.7.0,5.8.0)", org.junit;version="[4.12,5.0.0)", org.junit.experimental.theories;version="[4.12,5.0.0)", org.junit.runner;version="[4.12,5.0.0)" diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 838fd83f6d..413daae4dc 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ssh.apache.test</artifactId> diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 209a10f491..2ca1175635 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,9 +6,9 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 5.6.0.qualifier +Bundle-Version: 5.7.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.6.0";x-internal:=true; +Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.7.0";x-internal:=true; uses:="org.apache.sshd.client, org.apache.sshd.client.auth, org.apache.sshd.client.auth.keyboard, @@ -23,9 +23,9 @@ Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.6.0";x-inter org.apache.sshd.common.signature, org.apache.sshd.common.util.buffer, org.eclipse.jgit.transport", - org.eclipse.jgit.internal.transport.sshd.auth;version="5.6.0";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.proxy;version="5.6.0";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.transport.sshd;version="5.6.0"; + org.eclipse.jgit.internal.transport.sshd.auth;version="5.7.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.proxy;version="5.7.0";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.transport.sshd;version="5.7.0"; uses:="org.eclipse.jgit.transport, org.apache.sshd.client.config.hosts, org.apache.sshd.common.keyprovider, @@ -75,12 +75,12 @@ Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", org.apache.sshd.common.util.net;version="[2.2.0,2.3.0)", org.apache.sshd.common.util.security;version="[2.2.0,2.3.0)", org.apache.sshd.server.auth;version="[2.2.0,2.3.0)", - org.eclipse.jgit.annotations;version="[5.6.0,5.7.0)", - org.eclipse.jgit.errors;version="[5.6.0,5.7.0)", - org.eclipse.jgit.fnmatch;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.transport.ssh;version="[5.6.0,5.7.0)", - org.eclipse.jgit.nls;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport;version="[5.6.0,5.7.0)", - org.eclipse.jgit.util;version="[5.6.0,5.7.0)", + org.eclipse.jgit.annotations;version="[5.7.0,5.8.0)", + org.eclipse.jgit.errors;version="[5.7.0,5.8.0)", + org.eclipse.jgit.fnmatch;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.storage.file;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.transport.ssh;version="[5.7.0,5.8.0)", + org.eclipse.jgit.nls;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport;version="[5.7.0,5.8.0)", + org.eclipse.jgit.util;version="[5.7.0,5.8.0)", org.slf4j;version="[1.7.0,2.0.0)" diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index c1d8d9a29a..56d4bcdb2a 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.6.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.6.0.qualifier";roots="." +Bundle-Version: 5.7.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 26e44b085d..af0f0fd022 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ssh.apache</artifactId> diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 8043065389..d8f6bcfe28 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 5.6.0.qualifier +Bundle-Version: 5.7.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -18,58 +18,58 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.apache.commons.compress.compressors.gzip;version="[1.15.0,2.0)", org.apache.commons.compress.compressors.xz;version="[1.15.0,2.0)", org.bouncycastle.util.encoders;version="[1.61.0,2.0.0)", - org.eclipse.jgit.annotations;version="[5.6.0,5.7.0)", - org.eclipse.jgit.api;version="[5.6.0,5.7.0)", - org.eclipse.jgit.api.errors;version="[5.6.0,5.7.0)", - org.eclipse.jgit.archive;version="[5.6.0,5.7.0)", - org.eclipse.jgit.attributes;version="[5.6.0,5.7.0)", - org.eclipse.jgit.awtui;version="[5.6.0,5.7.0)", - org.eclipse.jgit.blame;version="[5.6.0,5.7.0)", - org.eclipse.jgit.diff;version="[5.6.0,5.7.0)", - org.eclipse.jgit.dircache;version="[5.6.0,5.7.0)", - org.eclipse.jgit.errors;version="[5.6.0,5.7.0)", - org.eclipse.jgit.events;version="[5.6.0,5.7.0)", - org.eclipse.jgit.fnmatch;version="[5.6.0,5.7.0)", - org.eclipse.jgit.gitrepo;version="[5.6.0,5.7.0)", - org.eclipse.jgit.hooks;version="[5.6.0,5.7.0)", - org.eclipse.jgit.ignore;version="[5.6.0,5.7.0)", - org.eclipse.jgit.ignore.internal;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.fsck;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.storage.dfs;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.storage.file;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.storage.io;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.storage.pack;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.storage.reftable;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.storage.reftree;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.transport.http;version="[5.6.0,5.7.0)", - org.eclipse.jgit.internal.transport.parser;version="[5.6.0,5.7.0)", - org.eclipse.jgit.junit;version="[5.6.0,5.7.0)", - org.eclipse.jgit.junit.ssh;version="[5.6.0,5.7.0)", - org.eclipse.jgit.junit.time;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lfs;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lib;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lib.internal;version="[5.6.0,5.7.0)", - org.eclipse.jgit.merge;version="[5.6.0,5.7.0)", - org.eclipse.jgit.nls;version="[5.6.0,5.7.0)", - org.eclipse.jgit.notes;version="[5.6.0,5.7.0)", - org.eclipse.jgit.patch;version="[5.6.0,5.7.0)", - org.eclipse.jgit.pgm;version="[5.6.0,5.7.0)", - org.eclipse.jgit.pgm.internal;version="[5.6.0,5.7.0)", - org.eclipse.jgit.revplot;version="[5.6.0,5.7.0)", - org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)", - org.eclipse.jgit.revwalk.filter;version="[5.6.0,5.7.0)", - org.eclipse.jgit.storage.file;version="[5.6.0,5.7.0)", - org.eclipse.jgit.storage.pack;version="[5.6.0,5.7.0)", - org.eclipse.jgit.submodule;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport.http;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport.resolver;version="[5.6.0,5.7.0)", - org.eclipse.jgit.treewalk;version="[5.6.0,5.7.0)", - org.eclipse.jgit.treewalk.filter;version="[5.6.0,5.7.0)", - org.eclipse.jgit.util;version="[5.6.0,5.7.0)", - org.eclipse.jgit.util.io;version="[5.6.0,5.7.0)", - org.eclipse.jgit.util.sha1;version="[5.6.0,5.7.0)", + org.eclipse.jgit.annotations;version="[5.7.0,5.8.0)", + org.eclipse.jgit.api;version="[5.7.0,5.8.0)", + org.eclipse.jgit.api.errors;version="[5.7.0,5.8.0)", + org.eclipse.jgit.archive;version="[5.7.0,5.8.0)", + org.eclipse.jgit.attributes;version="[5.7.0,5.8.0)", + org.eclipse.jgit.awtui;version="[5.7.0,5.8.0)", + org.eclipse.jgit.blame;version="[5.7.0,5.8.0)", + org.eclipse.jgit.diff;version="[5.7.0,5.8.0)", + org.eclipse.jgit.dircache;version="[5.7.0,5.8.0)", + org.eclipse.jgit.errors;version="[5.7.0,5.8.0)", + org.eclipse.jgit.events;version="[5.7.0,5.8.0)", + org.eclipse.jgit.fnmatch;version="[5.7.0,5.8.0)", + org.eclipse.jgit.gitrepo;version="[5.7.0,5.8.0)", + org.eclipse.jgit.hooks;version="[5.7.0,5.8.0)", + org.eclipse.jgit.ignore;version="[5.7.0,5.8.0)", + org.eclipse.jgit.ignore.internal;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.fsck;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.storage.dfs;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.storage.file;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.storage.io;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.storage.pack;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.storage.reftable;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.storage.reftree;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.transport.http;version="[5.7.0,5.8.0)", + org.eclipse.jgit.internal.transport.parser;version="[5.7.0,5.8.0)", + org.eclipse.jgit.junit;version="[5.7.0,5.8.0)", + org.eclipse.jgit.junit.ssh;version="[5.7.0,5.8.0)", + org.eclipse.jgit.junit.time;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lfs;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lib;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lib.internal;version="[5.7.0,5.8.0)", + org.eclipse.jgit.merge;version="[5.7.0,5.8.0)", + org.eclipse.jgit.nls;version="[5.7.0,5.8.0)", + org.eclipse.jgit.notes;version="[5.7.0,5.8.0)", + org.eclipse.jgit.patch;version="[5.7.0,5.8.0)", + org.eclipse.jgit.pgm;version="[5.7.0,5.8.0)", + org.eclipse.jgit.pgm.internal;version="[5.7.0,5.8.0)", + org.eclipse.jgit.revplot;version="[5.7.0,5.8.0)", + org.eclipse.jgit.revwalk;version="[5.7.0,5.8.0)", + org.eclipse.jgit.revwalk.filter;version="[5.7.0,5.8.0)", + org.eclipse.jgit.storage.file;version="[5.7.0,5.8.0)", + org.eclipse.jgit.storage.pack;version="[5.7.0,5.8.0)", + org.eclipse.jgit.submodule;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport.http;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport.resolver;version="[5.7.0,5.8.0)", + org.eclipse.jgit.treewalk;version="[5.7.0,5.8.0)", + org.eclipse.jgit.treewalk.filter;version="[5.7.0,5.8.0)", + org.eclipse.jgit.util;version="[5.7.0,5.8.0)", + org.eclipse.jgit.util.io;version="[5.7.0,5.8.0)", + org.eclipse.jgit.util.sha1;version="[5.7.0,5.8.0)", org.junit;version="[4.12,5.0.0)", org.junit.experimental.theories;version="[4.12,5.0.0)", org.junit.rules;version="[4.12,5.0.0)", @@ -84,4 +84,4 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.tukaani.xz;version="[1.6.0,2.0)" Require-Bundle: org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", org.hamcrest.library;bundle-version="[1.1.0,2.0.0)" -Export-Package: org.eclipse.jgit.transport.ssh;version="5.6.0";x-friends:="org.eclipse.jgit.ssh.apache.test" +Export-Package: org.eclipse.jgit.transport.ssh;version="5.7.0";x-friends:="org.eclipse.jgit.ssh.apache.test" diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index d8af7dc524..1bd4b27f5e 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -52,7 +52,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.test</artifactId> diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/ReceivePackAdvertiseRefsHookTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/ReceivePackAdvertiseRefsHookTest.java index 89ac2fe96d..daf7b9fb7a 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/ReceivePackAdvertiseRefsHookTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/ReceivePackAdvertiseRefsHookTest.java @@ -495,8 +495,7 @@ public class ReceivePackAdvertiseRefsHookTest extends LocalDiskRepositoryTestCas receive(rp, inBuf, outBuf); fail("Expected UnpackException"); } catch (UnpackException failed) { - Throwable err = failed.getCause(); - assertTrue(err instanceof IOException); + // Expected } final PacketLineIn r = asPacketLineIn(outBuf); diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 38f63f99b6..d382c9ab00 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,14 +4,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 5.6.0.qualifier +Bundle-Version: 5.7.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.jgit.awtui;version="5.6.0" -Import-Package: org.eclipse.jgit.errors;version="[5.6.0,5.7.0)", - org.eclipse.jgit.lib;version="[5.6.0,5.7.0)", - org.eclipse.jgit.nls;version="[5.6.0,5.7.0)", - org.eclipse.jgit.revplot;version="[5.6.0,5.7.0)", - org.eclipse.jgit.revwalk;version="[5.6.0,5.7.0)", - org.eclipse.jgit.transport;version="[5.6.0,5.7.0)", - org.eclipse.jgit.util;version="[5.6.0,5.7.0)" +Export-Package: org.eclipse.jgit.awtui;version="5.7.0" +Import-Package: org.eclipse.jgit.errors;version="[5.7.0,5.8.0)", + org.eclipse.jgit.lib;version="[5.7.0,5.8.0)", + org.eclipse.jgit.nls;version="[5.7.0,5.8.0)", + org.eclipse.jgit.revplot;version="[5.7.0,5.8.0)", + org.eclipse.jgit.revwalk;version="[5.7.0,5.8.0)", + org.eclipse.jgit.transport;version="[5.7.0,5.8.0)", + org.eclipse.jgit.util;version="[5.7.0,5.8.0)" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index c19a634419..782f24d898 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.6.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.6.0.qualifier";roots="." +Bundle-Version: 5.7.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 7d6c77d491..c4687aa55f 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -52,7 +52,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ui</artifactId> diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 3242322d8c..b7f6db0274 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -1,133 +1,19 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <component id="org.eclipse.jgit" version="2"> - <resource path="META-INF/MANIFEST.MF" type="org.eclipse.jgit.transport.BaseReceivePack"> - <filter comment="Merged BaseReceivePack into ReceivePack, replace BaseReceivePack with ReceivePack" id="305324134"> + <resource path="src/org/eclipse/jgit/lib/RefDatabase.java" type="org.eclipse.jgit.lib.RefDatabase"> + <filter id="1141899266"> <message_arguments> - <message_argument value="org.eclipse.jgit.transport.BaseReceivePack"/> - <message_argument value="org.eclipse.jgit_5.6.0"/> - </message_arguments> - </filter> - </resource> - <resource path="src/org/eclipse/jgit/lib/Config.java" type="org.eclipse.jgit.lib.Config"> - <filter id="1142947843"> - <message_arguments> - <message_argument value="5.5.2"/> - <message_argument value="getBaseConfig()"/> - </message_arguments> - </filter> - </resource> - <resource path="src/org/eclipse/jgit/lib/Constants.java" type="org.eclipse.jgit.lib.Constants"> - <filter id="1142947843"> - <message_arguments> - <message_argument value="5.5.2"/> - <message_argument value="XDG_CONFIG_HOME"/> - </message_arguments> - </filter> - </resource> - <resource path="src/org/eclipse/jgit/revwalk/ReachabilityChecker.java" type="org.eclipse.jgit.revwalk.ReachabilityChecker"> - <filter id="403804204"> - <message_arguments> - <message_argument value="org.eclipse.jgit.revwalk.ReachabilityChecker"/> - <message_argument value="areAllReachable(Collection<RevCommit>, Stream<RevCommit>)"/> - </message_arguments> - </filter> - </resource> - <resource path="src/org/eclipse/jgit/storage/pack/PackStatistics.java" type="org.eclipse.jgit.storage.pack.PackStatistics$Accumulator"> - <filter id="336658481"> - <message_arguments> - <message_argument value="org.eclipse.jgit.storage.pack.PackStatistics.Accumulator"/> - <message_argument value="offloadedPackfileSize"/> - </message_arguments> - </filter> - <filter id="336658481"> - <message_arguments> - <message_argument value="org.eclipse.jgit.storage.pack.PackStatistics.Accumulator"/> - <message_argument value="offloadedPackfiles"/> - </message_arguments> - </filter> - </resource> - <resource path="src/org/eclipse/jgit/transport/AbstractAdvertiseRefsHook.java" type="org.eclipse.jgit.transport.AbstractAdvertiseRefsHook"> - <filter comment="Merged BaseReceivePack into ReceivePack, replace BaseReceivePack with ReceivePack" id="338792546"> - <message_arguments> - <message_argument value="org.eclipse.jgit.transport.AbstractAdvertiseRefsHook"/> - <message_argument value="advertiseRefs(BaseReceivePack)"/> - </message_arguments> - </filter> - </resource> - <resource path="src/org/eclipse/jgit/transport/AdvertiseRefsHook.java" type="org.eclipse.jgit.transport.AdvertiseRefsHook"> - <filter comment="Merged BaseReceivePack into ReceivePack, replace BaseReceivePack with ReceivePack" id="403804204"> - <message_arguments> - <message_argument value="org.eclipse.jgit.transport.AdvertiseRefsHook"/> - <message_argument value="advertiseRefs(ReceivePack)"/> - </message_arguments> - </filter> - <filter comment="Merged BaseReceivePack into ReceivePack, replace BaseReceivePack with ReceivePack" id="405901410"> - <message_arguments> - <message_argument value="org.eclipse.jgit.transport.AdvertiseRefsHook"/> - <message_argument value="advertiseRefs(BaseReceivePack)"/> - </message_arguments> - </filter> - </resource> - <resource path="src/org/eclipse/jgit/transport/AdvertiseRefsHookChain.java" type="org.eclipse.jgit.transport.AdvertiseRefsHookChain"> - <filter comment="Merged BaseReceivePack into ReceivePack, replace BaseReceivePack with ReceivePack" id="338792546"> - <message_arguments> - <message_argument value="org.eclipse.jgit.transport.AdvertiseRefsHookChain"/> - <message_argument value="advertiseRefs(BaseReceivePack)"/> - </message_arguments> - </filter> - </resource> - <resource path="src/org/eclipse/jgit/transport/ReceiveCommand.java" type="org.eclipse.jgit.transport.ReceiveCommand"> - <filter comment="Merged BaseReceivePack into ReceivePack, replace BaseReceivePack with ReceivePack" id="338792546"> - <message_arguments> - <message_argument value="org.eclipse.jgit.transport.ReceiveCommand"/> - <message_argument value="execute(BaseReceivePack)"/> + <message_argument value="5.6"/> + <message_argument value="5.7"/> + <message_argument value="hasFastTipsWithSha1()"/> </message_arguments> </filter> </resource> <resource path="src/org/eclipse/jgit/transport/ReceivePack.java" type="org.eclipse.jgit.transport.ReceivePack"> - <filter comment="Merged BaseReceivePack into ReceivePack, replace BaseReceivePack with ReceivePack" id="338792546"> - <message_arguments> - <message_argument value="org.eclipse.jgit.transport.ReceivePack"/> - <message_argument value="getLockMessageProcessName()"/> - </message_arguments> - </filter> - <filter comment="Merged BaseReceivePack into ReceivePack, replace BaseReceivePack with ReceivePack" id="338849923"> - <message_arguments> - <message_argument value="org.eclipse.jgit.transport.ReceivePack"/> - </message_arguments> - </filter> - <filter id="421572723"> - <message_arguments> - <message_argument value="org.eclipse.jgit.transport.ReceivePack"/> - <message_argument value="enableCapabilities()"/> - </message_arguments> - </filter> - </resource> - <resource path="src/org/eclipse/jgit/util/QuotedString.java" type="org.eclipse.jgit.util.QuotedString"> <filter id="336658481"> <message_arguments> - <message_argument value="org.eclipse.jgit.util.QuotedString"/> - <message_argument value="GIT_PATH_MINIMAL"/> - </message_arguments> - </filter> - </resource> - <resource path="src/org/eclipse/jgit/util/SystemReader.java" type="org.eclipse.jgit.util.SystemReader"> - <filter id="336695337"> - <message_arguments> - <message_argument value="org.eclipse.jgit.util.SystemReader"/> - <message_argument value="openJGitConfig(Config, FS)"/> - </message_arguments> - </filter> - <filter id="1142947843"> - <message_arguments> - <message_argument value="5.5.2"/> - <message_argument value="getJGitConfig()"/> - </message_arguments> - </filter> - <filter id="1142947843"> - <message_arguments> - <message_argument value="5.5.2"/> - <message_argument value="openJGitConfig(Config, FS)"/> + <message_argument value="org.eclipse.jgit.transport.ReceivePack"/> + <message_argument value="connectivityChecker"/> </message_arguments> </filter> </resource> diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 899d2b6e61..1fd25780d5 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,12 +3,12 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 5.6.0.qualifier +Bundle-Version: 5.7.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.jgit.annotations;version="5.6.0", - org.eclipse.jgit.api;version="5.6.0"; +Export-Package: org.eclipse.jgit.annotations;version="5.7.0", + org.eclipse.jgit.api;version="5.7.0"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff, @@ -22,53 +22,53 @@ Export-Package: org.eclipse.jgit.annotations;version="5.6.0", org.eclipse.jgit.submodule, org.eclipse.jgit.transport, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="5.6.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="5.6.0", - org.eclipse.jgit.blame;version="5.6.0"; + org.eclipse.jgit.api.errors;version="5.7.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors", + org.eclipse.jgit.attributes;version="5.7.0", + org.eclipse.jgit.blame;version="5.7.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff", - org.eclipse.jgit.diff;version="5.6.0"; + org.eclipse.jgit.diff;version="5.7.0"; uses:="org.eclipse.jgit.patch, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="5.6.0"; + org.eclipse.jgit.dircache;version="5.7.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.util, org.eclipse.jgit.events, org.eclipse.jgit.attributes", - org.eclipse.jgit.errors;version="5.6.0"; + org.eclipse.jgit.errors;version="5.7.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.internal.storage.pack, org.eclipse.jgit.transport, org.eclipse.jgit.dircache", - org.eclipse.jgit.events;version="5.6.0";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="5.6.0", - org.eclipse.jgit.gitrepo;version="5.6.0"; + org.eclipse.jgit.events;version="5.7.0";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.fnmatch;version="5.7.0", + org.eclipse.jgit.gitrepo;version="5.7.0"; uses:="org.eclipse.jgit.api, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax.helpers, org.xml.sax", - org.eclipse.jgit.gitrepo.internal;version="5.6.0";x-internal:=true, - org.eclipse.jgit.hooks;version="5.6.0";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.ignore;version="5.6.0", - org.eclipse.jgit.ignore.internal;version="5.6.0";x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="5.6.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.fsck;version="5.6.0";x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.ketch;version="5.6.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.revwalk;version="5.6.0";x-internal:=true, - org.eclipse.jgit.internal.storage.dfs;version="5.6.0"; + org.eclipse.jgit.gitrepo.internal;version="5.7.0";x-internal:=true, + org.eclipse.jgit.hooks;version="5.7.0";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.ignore;version="5.7.0", + org.eclipse.jgit.ignore.internal;version="5.7.0";x-friends:="org.eclipse.jgit.test", + org.eclipse.jgit.internal;version="5.7.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", + org.eclipse.jgit.internal.fsck;version="5.7.0";x-friends:="org.eclipse.jgit.test", + org.eclipse.jgit.internal.ketch;version="5.7.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.internal.revwalk;version="5.7.0";x-internal:=true, + org.eclipse.jgit.internal.storage.dfs;version="5.7.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.server, org.eclipse.jgit.http.test, org.eclipse.jgit.lfs.test", - org.eclipse.jgit.internal.storage.file;version="5.6.0"; + org.eclipse.jgit.internal.storage.file;version="5.7.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, @@ -77,19 +77,19 @@ Export-Package: org.eclipse.jgit.annotations;version="5.6.0", org.eclipse.jgit.pgm, org.eclipse.jgit.pgm.test, org.eclipse.jgit.ssh.apache", - org.eclipse.jgit.internal.storage.io;version="5.6.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.pack;version="5.6.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftable;version="5.6.0"; + org.eclipse.jgit.internal.storage.io;version="5.7.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.internal.storage.pack;version="5.7.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.internal.storage.reftable;version="5.7.0"; x-friends:="org.eclipse.jgit.http.test, org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftree;version="5.6.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.submodule;version="5.6.0";x-internal:=true, - org.eclipse.jgit.internal.transport.http;version="5.6.0";x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.parser;version="5.6.0";x-friends:="org.eclipse.jgit.http.server,org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.ssh;version="5.6.0";x-friends:="org.eclipse.jgit.ssh.apache", - org.eclipse.jgit.lib;version="5.6.0"; + org.eclipse.jgit.internal.storage.reftree;version="5.7.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.internal.submodule;version="5.7.0";x-internal:=true, + org.eclipse.jgit.internal.transport.http;version="5.7.0";x-friends:="org.eclipse.jgit.test", + org.eclipse.jgit.internal.transport.parser;version="5.7.0";x-friends:="org.eclipse.jgit.http.server,org.eclipse.jgit.test", + org.eclipse.jgit.internal.transport.ssh;version="5.7.0";x-friends:="org.eclipse.jgit.ssh.apache", + org.eclipse.jgit.lib;version="5.7.0"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util, @@ -99,33 +99,33 @@ Export-Package: org.eclipse.jgit.annotations;version="5.6.0", org.eclipse.jgit.treewalk, org.eclipse.jgit.transport, org.eclipse.jgit.submodule", - org.eclipse.jgit.lib.internal;version="5.6.0";x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.merge;version="5.6.0"; + org.eclipse.jgit.lib.internal;version="5.7.0";x-friends:="org.eclipse.jgit.test", + org.eclipse.jgit.merge;version="5.7.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.diff, org.eclipse.jgit.dircache, org.eclipse.jgit.api", - org.eclipse.jgit.nls;version="5.6.0", - org.eclipse.jgit.notes;version="5.6.0"; + org.eclipse.jgit.nls;version="5.7.0", + org.eclipse.jgit.notes;version="5.7.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="5.6.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="5.6.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="5.6.0"; + org.eclipse.jgit.patch;version="5.7.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff", + org.eclipse.jgit.revplot;version="5.7.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk", + org.eclipse.jgit.revwalk;version="5.7.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff, org.eclipse.jgit.revwalk.filter", - org.eclipse.jgit.revwalk.filter;version="5.6.0";uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.lib,org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="5.6.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="5.6.0";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="5.6.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk.filter,org.eclipse.jgit.treewalk", - org.eclipse.jgit.transport;version="5.6.0"; + org.eclipse.jgit.revwalk.filter;version="5.7.0";uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.lib,org.eclipse.jgit.util", + org.eclipse.jgit.storage.file;version="5.7.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util", + org.eclipse.jgit.storage.pack;version="5.7.0";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.submodule;version="5.7.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk.filter,org.eclipse.jgit.treewalk", + org.eclipse.jgit.transport;version="5.7.0"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.revwalk, org.eclipse.jgit.internal.storage.pack, @@ -138,24 +138,24 @@ Export-Package: org.eclipse.jgit.annotations;version="5.6.0", org.eclipse.jgit.transport.http, org.eclipse.jgit.errors, org.eclipse.jgit.storage.pack", - org.eclipse.jgit.transport.http;version="5.6.0";uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="5.6.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport", - org.eclipse.jgit.treewalk;version="5.6.0"; + org.eclipse.jgit.transport.http;version="5.7.0";uses:="javax.net.ssl", + org.eclipse.jgit.transport.resolver;version="5.7.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport", + org.eclipse.jgit.treewalk;version="5.7.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.attributes, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util, org.eclipse.jgit.dircache", - org.eclipse.jgit.treewalk.filter;version="5.6.0";uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="5.6.0"; + org.eclipse.jgit.treewalk.filter;version="5.7.0";uses:="org.eclipse.jgit.treewalk", + org.eclipse.jgit.util;version="5.7.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.transport.http, org.eclipse.jgit.storage.file, org.ietf.jgss", - org.eclipse.jgit.util.io;version="5.6.0", - org.eclipse.jgit.util.sha1;version="5.6.0", - org.eclipse.jgit.util.time;version="5.6.0" + org.eclipse.jgit.util.io;version="5.7.0", + org.eclipse.jgit.util.sha1;version="5.7.0", + org.eclipse.jgit.util.time;version="5.7.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 01c9aa0564..a926b8fd82 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.6.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="5.6.0.qualifier";roots="." +Bundle-Version: 5.7.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="5.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 6b8cdaab1a..3b37cee59c 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -53,7 +53,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit</artifactId> diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceiveCommandErrorHandler.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceiveCommandErrorHandler.java new file mode 100644 index 0000000000..d9a148622b --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceiveCommandErrorHandler.java @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2019, Google LLC and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.transport; + +import java.io.IOException; +import java.util.List; + +import org.eclipse.jgit.errors.MissingObjectException; +import org.eclipse.jgit.transport.ReceiveCommand.Result; + +/** + * Exception handler for processing {@link ReceiveCommand}. + * + * @since 5.7 + */ +public interface ReceiveCommandErrorHandler { + /** + * Handle an exception thrown while validating the new commit ID. + * + * @param cmd + * offending command + * @param e + * exception thrown + */ + default void handleNewIdValidationException(ReceiveCommand cmd, + IOException e) { + cmd.setResult(Result.REJECTED_MISSING_OBJECT, cmd.getNewId().name()); + } + + /** + * Handle an exception thrown while validating the old commit ID. + * + * @param cmd + * offending command + * @param e + * exception thrown + */ + default void handleOldIdValidationException(ReceiveCommand cmd, + IOException e) { + cmd.setResult(Result.REJECTED_MISSING_OBJECT, cmd.getOldId().name()); + } + + /** + * Handle an exception thrown while checking if the update is fast-forward. + * + * @param cmd + * offending command + * @param e + * exception thrown + */ + default void handleFastForwardCheckException(ReceiveCommand cmd, + IOException e) { + if (e instanceof MissingObjectException) { + cmd.setResult(Result.REJECTED_MISSING_OBJECT, e.getMessage()); + } else { + cmd.setResult(Result.REJECTED_OTHER_REASON); + } + } + + /** + * Handle an exception thrown while checking if the update is fast-forward. + * + * @param cmds + * commands being processed + * @param e + * exception thrown + */ + default void handleBatchRefUpdateException(List<ReceiveCommand> cmds, + IOException e) { + for (ReceiveCommand cmd : cmds) { + if (cmd.getResult() == Result.NOT_ATTEMPTED) { + cmd.reject(e); + } + } + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java index 16fbbd42f3..69e647150f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java @@ -74,7 +74,6 @@ import java.util.concurrent.TimeUnit; import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.errors.InvalidObjectIdException; import org.eclipse.jgit.errors.LargeObjectException; -import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.errors.PackProtocolException; import org.eclipse.jgit.errors.TooLargePackException; import org.eclipse.jgit.errors.UnpackException; @@ -93,24 +92,21 @@ import org.eclipse.jgit.lib.NullProgressMonitor; import org.eclipse.jgit.lib.ObjectChecker; import org.eclipse.jgit.lib.ObjectDatabase; import org.eclipse.jgit.lib.ObjectId; -import org.eclipse.jgit.lib.ObjectIdSubclassMap; import org.eclipse.jgit.lib.ObjectInserter; import org.eclipse.jgit.lib.ObjectLoader; import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.lib.ProgressMonitor; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; -import org.eclipse.jgit.revwalk.ObjectWalk; -import org.eclipse.jgit.revwalk.RevBlob; import org.eclipse.jgit.revwalk.RevCommit; -import org.eclipse.jgit.revwalk.RevFlag; import org.eclipse.jgit.revwalk.RevObject; -import org.eclipse.jgit.revwalk.RevSort; -import org.eclipse.jgit.revwalk.RevTree; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.transport.PacketLineIn.InputOverLimitIOException; import org.eclipse.jgit.transport.ReceiveCommand.Result; import org.eclipse.jgit.transport.RefAdvertiser.PacketLineOutRefAdvertiser; +import org.eclipse.jgit.transport.internal.ConnectivityChecker.ConnectivityCheckInfo; +import org.eclipse.jgit.transport.internal.ConnectivityChecker; +import org.eclipse.jgit.transport.internal.FullConnectivityChecker; import org.eclipse.jgit.util.io.InterruptTimer; import org.eclipse.jgit.util.io.LimitedInputStream; import org.eclipse.jgit.util.io.TimeoutInputStream; @@ -273,7 +269,7 @@ public class ReceivePack { /** Lock around the received pack file, while updating refs. */ private PackLock packLock; - private boolean checkReferencedIsReachable; + private boolean checkReferencedAreReachable; /** Git object size limit */ private long maxObjectSizeLimit; @@ -292,9 +288,21 @@ public class ReceivePack { private ReceivedPackStatistics stats; + /** + * Connectivity checker to use. + * @since 5.7 + */ + protected ConnectivityChecker connectivityChecker = new FullConnectivityChecker(); + /** Hook to validate the update commands before execution. */ private PreReceiveHook preReceive; + private ReceiveCommandErrorHandler receiveCommandErrorHandler = new ReceiveCommandErrorHandler() { + // Use the default implementation. + }; + + private UnpackErrorHandler unpackErrorHandler = new DefaultUnpackErrorHandler(); + /** Hook to report on the commands after execution. */ private PostReceiveHook postReceive; @@ -508,7 +516,7 @@ public class ReceivePack { * reference. */ public boolean isCheckReferencedObjectsAreReachable() { - return checkReferencedIsReachable; + return checkReferencedAreReachable; } /** @@ -533,7 +541,7 @@ public class ReceivePack { * {@code true} to enable the additional check. */ public void setCheckReferencedObjectsAreReachable(boolean b) { - this.checkReferencedIsReachable = b; + this.checkReferencedAreReachable = b; } /** @@ -1021,6 +1029,17 @@ public class ReceivePack { } /** + * Set an error handler for {@link ReceiveCommand}. + * + * @param receiveCommandErrorHandler + * @since 5.7 + */ + public void setReceiveCommandErrorHandler( + ReceiveCommandErrorHandler receiveCommandErrorHandler) { + this.receiveCommandErrorHandler = receiveCommandErrorHandler; + } + + /** * Send an error message to the client. * <p> * If any error messages are sent before the references are advertised to @@ -1217,8 +1236,13 @@ public class ReceivePack { * * @throws java.io.IOException * an error occurred during unpacking or connectivity checking. + * @throws LargeObjectException + * an large object needs to be opened for the check. + * @throws SubmoduleValidationException + * fails to validate the submodule. */ - protected void receivePackAndCheckConnectivity() throws IOException { + protected void receivePackAndCheckConnectivity() throws IOException, + LargeObjectException, SubmoduleValidationException { receivePack(); if (needCheckConnectivity()) { checkSubmodules(); @@ -1368,15 +1392,9 @@ public class ReceivePack { if (hasCommands()) { readPostCommands(pck); } - } catch (PackProtocolException e) { - discardCommands(); - fatalError(e.getMessage()); - throw e; - } catch (InputOverLimitIOException e) { - String msg = JGitText.get().tooManyCommands; + } catch (Throwable t) { discardCommands(); - fatalError(msg); - throw new PackProtocolException(msg); + throw t; } } @@ -1498,10 +1516,10 @@ public class ReceivePack { parser = ins.newPackParser(packInputStream()); parser.setAllowThin(true); - parser.setNeedNewObjectIds(checkReferencedIsReachable); - parser.setNeedBaseObjectIds(checkReferencedIsReachable); - parser.setCheckEofAfterPackFooter( - !biDirectionalPipe && !isExpectDataAfterPackFooter()); + parser.setNeedNewObjectIds(checkReferencedAreReachable); + parser.setNeedBaseObjectIds(checkReferencedAreReachable); + parser.setCheckEofAfterPackFooter(!biDirectionalPipe + && !isExpectDataAfterPackFooter()); parser.setExpectDataAfterPackFooter(isExpectDataAfterPackFooter()); parser.setObjectChecker(objectChecker); parser.setLockMessage(lockMsg); @@ -1535,7 +1553,8 @@ public class ReceivePack { || !getClientShallowCommits().isEmpty(); } - private void checkSubmodules() throws IOException { + private void checkSubmodules() throws IOException, LargeObjectException, + SubmoduleValidationException { ObjectDatabase odb = db.getObjectDatabase(); if (objectChecker == null) { return; @@ -1544,18 +1563,12 @@ public class ReceivePack { AnyObjectId blobId = entry.getBlobId(); ObjectLoader blob = odb.open(blobId, Constants.OBJ_BLOB); - try { - SubmoduleValidator.assertValidGitModulesFile( - new String(blob.getBytes(), UTF_8)); - } catch (LargeObjectException | SubmoduleValidationException e) { - throw new IOException(e); - } + SubmoduleValidator.assertValidGitModulesFile( + new String(blob.getBytes(), UTF_8)); } } private void checkConnectivity() throws IOException { - ObjectIdSubclassMap<ObjectId> baseObjects = null; - ObjectIdSubclassMap<ObjectId> providedObjects = null; ProgressMonitor checking = NullProgressMonitor.INSTANCE; if (sideBand && !quiet) { SideBandProgressMonitor m = new SideBandProgressMonitor(msgOut); @@ -1563,76 +1576,18 @@ public class ReceivePack { checking = m; } - if (checkReferencedIsReachable) { - baseObjects = parser.getBaseObjectIds(); - providedObjects = parser.getNewObjectIds(); - } - parser = null; - - try (ObjectWalk ow = new ObjectWalk(db)) { - if (baseObjects != null) { - ow.sort(RevSort.TOPO); - if (!baseObjects.isEmpty()) - ow.sort(RevSort.BOUNDARY, true); - } - - for (ReceiveCommand cmd : commands) { - if (cmd.getResult() != Result.NOT_ATTEMPTED) - continue; - if (cmd.getType() == ReceiveCommand.Type.DELETE) - continue; - ow.markStart(ow.parseAny(cmd.getNewId())); - } - for (ObjectId have : advertisedHaves) { - RevObject o = ow.parseAny(have); - ow.markUninteresting(o); - - if (baseObjects != null && !baseObjects.isEmpty()) { - o = ow.peel(o); - if (o instanceof RevCommit) - o = ((RevCommit) o).getTree(); - if (o instanceof RevTree) - ow.markUninteresting(o); - } - } - - checking.beginTask(JGitText.get().countingObjects, - ProgressMonitor.UNKNOWN); - RevCommit c; - while ((c = ow.next()) != null) { - checking.update(1); - if (providedObjects != null // - && !c.has(RevFlag.UNINTERESTING) // - && !providedObjects.contains(c)) - throw new MissingObjectException(c, Constants.TYPE_COMMIT); - } - - RevObject o; - while ((o = ow.nextObject()) != null) { - checking.update(1); - if (o.has(RevFlag.UNINTERESTING)) - continue; - - if (providedObjects != null) { - if (providedObjects.contains(o)) { - continue; - } - throw new MissingObjectException(o, o.getType()); - } - - if (o instanceof RevBlob && !db.getObjectDatabase().has(o)) - throw new MissingObjectException(o, Constants.TYPE_BLOB); - } - checking.endTask(); + connectivityChecker.checkConnectivity(createConnectivityCheckInfo(), + advertisedHaves, checking); + } - if (baseObjects != null) { - for (ObjectId id : baseObjects) { - o = ow.parseAny(id); - if (!o.has(RevFlag.UNINTERESTING)) - throw new MissingObjectException(o, o.getType()); - } - } - } + private ConnectivityCheckInfo createConnectivityCheckInfo() { + ConnectivityCheckInfo info = new ConnectivityCheckInfo(); + info.setCheckObjects(checkReferencedAreReachable); + info.setCommands(getAllCommands()); + info.setRepository(db); + info.setParser(parser); + info.setWalk(walk); + return info; } /** @@ -1730,16 +1685,16 @@ public class ReceivePack { try { oldObj = walk.parseAny(cmd.getOldId()); } catch (IOException e) { - cmd.setResult(Result.REJECTED_MISSING_OBJECT, - cmd.getOldId().name()); + receiveCommandErrorHandler + .handleOldIdValidationException(cmd, e); continue; } try { newObj = walk.parseAny(cmd.getNewId()); } catch (IOException e) { - cmd.setResult(Result.REJECTED_MISSING_OBJECT, - cmd.getNewId().name()); + receiveCommandErrorHandler + .handleNewIdValidationException(cmd, e); continue; } @@ -1747,16 +1702,14 @@ public class ReceivePack { && newObj instanceof RevCommit) { try { if (walk.isMergedInto((RevCommit) oldObj, - (RevCommit) newObj)) + (RevCommit) newObj)) { cmd.setTypeFastForwardUpdate(); - else - cmd.setType( - ReceiveCommand.Type.UPDATE_NONFASTFORWARD); - } catch (MissingObjectException e) { - cmd.setResult(Result.REJECTED_MISSING_OBJECT, - e.getMessage()); + } else { + cmd.setType(ReceiveCommand.Type.UPDATE_NONFASTFORWARD); + } } catch (IOException e) { - cmd.setResult(Result.REJECTED_OTHER_REASON); + receiveCommandErrorHandler + .handleFastForwardCheckException(cmd, e); } } else { cmd.setType(ReceiveCommand.Type.UPDATE_NONFASTFORWARD); @@ -1835,109 +1788,122 @@ public class ReceivePack { try { batch.setPushCertificate(getPushCertificate()); batch.execute(walk, updating); - } catch (IOException err) { - for (ReceiveCommand cmd : toApply) { - if (cmd.getResult() == Result.NOT_ATTEMPTED) - cmd.reject(err); - } + } catch (IOException e) { + receiveCommandErrorHandler.handleBatchRefUpdateException(toApply, + e); } } /** * Send a status report. * - * @param forClient - * true if this report is for a Git client, false if it is for an - * end-user. * @param unpackError * an error that occurred during unpacking, or {@code null} - * @param out - * the reporter for sending the status strings. * @throws java.io.IOException * an error occurred writing the status report. * @since 5.6 */ - private void sendStatusReport(final boolean forClient, - final Throwable unpackError, final Reporter out) - throws IOException { - if (unpackError != null) { - out.sendString("unpack error " + unpackError.getMessage()); //$NON-NLS-1$ - if (forClient) { - for (ReceiveCommand cmd : commands) { - out.sendString("ng " + cmd.getRefName() //$NON-NLS-1$ - + " n/a (unpacker error)"); //$NON-NLS-1$ + private void sendStatusReport(Throwable unpackError) throws IOException { + Reporter out = new Reporter() { + @Override + void sendString(String s) throws IOException { + if (reportStatus) { + pckOut.writeString(s + "\n"); //$NON-NLS-1$ + } else if (msgOut != null) { + msgOut.write(Constants.encode(s + "\n")); //$NON-NLS-1$ } } - return; - } + }; - if (forClient) - out.sendString("unpack ok"); //$NON-NLS-1$ - for (ReceiveCommand cmd : commands) { - if (cmd.getResult() == Result.OK) { - if (forClient) - out.sendString("ok " + cmd.getRefName()); //$NON-NLS-1$ - continue; + try { + if (unpackError != null) { + out.sendString("unpack error " + unpackError.getMessage()); //$NON-NLS-1$ + if (reportStatus) { + for (ReceiveCommand cmd : commands) { + out.sendString("ng " + cmd.getRefName() //$NON-NLS-1$ + + " n/a (unpacker error)"); //$NON-NLS-1$ + } + } + return; } - final StringBuilder r = new StringBuilder(); - if (forClient) - r.append("ng ").append(cmd.getRefName()).append(" "); //$NON-NLS-1$ //$NON-NLS-2$ - else - r.append(" ! [rejected] ").append(cmd.getRefName()) //$NON-NLS-1$ - .append(" ("); //$NON-NLS-1$ - - switch (cmd.getResult()) { - case NOT_ATTEMPTED: - r.append("server bug; ref not processed"); //$NON-NLS-1$ - break; - - case REJECTED_NOCREATE: - r.append("creation prohibited"); //$NON-NLS-1$ - break; - - case REJECTED_NODELETE: - r.append("deletion prohibited"); //$NON-NLS-1$ - break; - - case REJECTED_NONFASTFORWARD: - r.append("non-fast forward"); //$NON-NLS-1$ - break; - - case REJECTED_CURRENT_BRANCH: - r.append("branch is currently checked out"); //$NON-NLS-1$ - break; - - case REJECTED_MISSING_OBJECT: - if (cmd.getMessage() == null) - r.append("missing object(s)"); //$NON-NLS-1$ - else if (cmd.getMessage() - .length() == Constants.OBJECT_ID_STRING_LENGTH) { - r.append("object "); //$NON-NLS-1$ - r.append(cmd.getMessage()); - r.append(" missing"); //$NON-NLS-1$ - } else - r.append(cmd.getMessage()); - break; - - case REJECTED_OTHER_REASON: - if (cmd.getMessage() == null) - r.append("unspecified reason"); //$NON-NLS-1$ - else - r.append(cmd.getMessage()); - break; - - case LOCK_FAILURE: - r.append("failed to lock"); //$NON-NLS-1$ - break; - - case OK: - // We shouldn't have reached this case (see 'ok' case above). - continue; + if (reportStatus) { + out.sendString("unpack ok"); //$NON-NLS-1$ + } + for (ReceiveCommand cmd : commands) { + if (cmd.getResult() == Result.OK) { + if (reportStatus) { + out.sendString("ok " + cmd.getRefName()); //$NON-NLS-1$ + } + continue; + } + + final StringBuilder r = new StringBuilder(); + if (reportStatus) { + r.append("ng ").append(cmd.getRefName()).append(" "); //$NON-NLS-1$ //$NON-NLS-2$ + } else { + r.append(" ! [rejected] ").append(cmd.getRefName()) //$NON-NLS-1$ + .append(" ("); //$NON-NLS-1$ + } + + switch (cmd.getResult()) { + case NOT_ATTEMPTED: + r.append("server bug; ref not processed"); //$NON-NLS-1$ + break; + + case REJECTED_NOCREATE: + r.append("creation prohibited"); //$NON-NLS-1$ + break; + + case REJECTED_NODELETE: + r.append("deletion prohibited"); //$NON-NLS-1$ + break; + + case REJECTED_NONFASTFORWARD: + r.append("non-fast forward"); //$NON-NLS-1$ + break; + + case REJECTED_CURRENT_BRANCH: + r.append("branch is currently checked out"); //$NON-NLS-1$ + break; + + case REJECTED_MISSING_OBJECT: + if (cmd.getMessage() == null) + r.append("missing object(s)"); //$NON-NLS-1$ + else if (cmd.getMessage() + .length() == Constants.OBJECT_ID_STRING_LENGTH) { + r.append("object "); //$NON-NLS-1$ + r.append(cmd.getMessage()); + r.append(" missing"); //$NON-NLS-1$ + } else + r.append(cmd.getMessage()); + break; + + case REJECTED_OTHER_REASON: + if (cmd.getMessage() == null) + r.append("unspecified reason"); //$NON-NLS-1$ + else + r.append(cmd.getMessage()); + break; + + case LOCK_FAILURE: + r.append("failed to lock"); //$NON-NLS-1$ + break; + + case OK: + // We shouldn't have reached this case (see 'ok' case + // above). + continue; + } + if (!reportStatus) { + r.append(")"); //$NON-NLS-1$ + } + out.sendString(r.toString()); + } + } finally { + if (reportStatus) { + pckOut.end(); } - if (!forClient) - r.append(")"); //$NON-NLS-1$ - out.sendString(r.toString()); } } @@ -2123,6 +2089,15 @@ public class ReceivePack { } /** + * @param unpackErrorHandler + * the unpackErrorHandler to set + * @since 5.7 + */ + public void setUnpackErrorHandler(UnpackErrorHandler unpackErrorHandler) { + this.unpackErrorHandler = unpackErrorHandler; + } + + /** * Set whether this class will report command failures as warning messages * before sending the command results. * @@ -2161,6 +2136,50 @@ public class ReceivePack { init(input, output, messages); try { service(); + } catch (PackProtocolException e) { + fatalError(e.getMessage()); + throw e; + } catch (InputOverLimitIOException e) { + String msg = JGitText.get().tooManyCommands; + fatalError(msg); + throw new PackProtocolException(msg); + } finally { + try { + close(); + } finally { + release(); + } + } + } + + /** + * Execute the receive task on the socket. + * + * <p> + * Same as {@link #receive}, but the exceptions are not reported to the + * client yet. + * + * @param input + * raw input to read client commands and pack data from. Caller + * must ensure the input is buffered, otherwise read performance + * may suffer. + * @param output + * response back to the Git network client. Caller must ensure + * the output is buffered, otherwise write performance may + * suffer. + * @param messages + * secondary "notice" channel to send additional messages out + * through. When run over SSH this should be tied back to the + * standard error channel of the command execution. For most + * other network connections this should be null. + * @throws java.io.IOException + * @since 5.7 + */ + public void receiveWithExceptionPropagation(InputStream input, + OutputStream output, OutputStream messages) throws IOException { + init(input, output, messages); + try { + service(); } finally { try { close(); @@ -2178,19 +2197,23 @@ public class ReceivePack { getAdvertisedOrDefaultRefs(); if (hasError()) return; + recvCommands(); + if (hasCommands()) { - Throwable unpackError = null; - if (needPack()) { - try { - receivePackAndCheckConnectivity(); - } catch (IOException | RuntimeException | Error err) { - unpackError = err; + try (PostReceiveExecutor e = new PostReceiveExecutor()) { + if (needPack()) { + try { + receivePackAndCheckConnectivity(); + } catch (IOException | RuntimeException + | SubmoduleValidationException | Error err) { + unlockPack(); + unpackErrorHandler.handleUnpackException(err); + throw new UnpackException(err); + } } - } - try { - if (unpackError == null) { + try { setAtomic(isCapabilityEnabled(CAPABILITY_ATOMIC)); validateCommands(); @@ -2204,39 +2227,12 @@ public class ReceivePack { failPendingCommands(); } executeCommands(); + } finally { + unlockPack(); } - } finally { - unlockPack(); - } - if (reportStatus) { - sendStatusReport(true, unpackError, new Reporter() { - @Override - void sendString(String s) throws IOException { - pckOut.writeString(s + "\n"); //$NON-NLS-1$ - } - }); - pckOut.end(); - } else if (msgOut != null) { - sendStatusReport(false, unpackError, new Reporter() { - @Override - void sendString(String s) throws IOException { - msgOut.write(Constants.encode(s + "\n")); //$NON-NLS-1$ - } - }); + sendStatusReport(null); } - - if (unpackError != null) { - // we already know which exception to throw. Ignore - // potential additional exceptions raised in postReceiveHooks - try { - postReceive.onPostReceive(this, filterCommands(Result.OK)); - } catch (Throwable e) { - // empty - } - throw new UnpackException(unpackError); - } - postReceive.onPostReceive(this, filterCommands(Result.OK)); autoGc(); } } @@ -2273,4 +2269,19 @@ public class ReceivePack { } return new ReceiveCommand(oldId, newId, name); } + + private class PostReceiveExecutor implements AutoCloseable { + @Override + public void close() { + postReceive.onPostReceive(ReceivePack.this, + filterCommands(Result.OK)); + } + } + + private class DefaultUnpackErrorHandler implements UnpackErrorHandler { + @Override + public void handleUnpackException(Throwable t) throws IOException { + sendStatusReport(t); + } + } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UnpackErrorHandler.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UnpackErrorHandler.java new file mode 100644 index 0000000000..12c9a76214 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UnpackErrorHandler.java @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2019, Google LLC and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.transport; + +import java.io.IOException; + +/** + * Exception handler for processing an incoming pack file. + * + * @since 5.7 + */ +public interface UnpackErrorHandler { + /** + * Handle an exception thrown while unpacking the pack file. + * + * @param t + * exception thrown + * @throws IOException + * thrown when failed to write an error back to the client. + */ + void handleUnpackException(Throwable t) throws IOException; +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/internal/ConnectivityChecker.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/internal/ConnectivityChecker.java new file mode 100644 index 0000000000..d6efada65b --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/internal/ConnectivityChecker.java @@ -0,0 +1,138 @@ +/* + * Copyright (c) 2019, Google LLC and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.transport.internal; + +import java.io.IOException; +import java.util.List; +import java.util.Set; + +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.ProgressMonitor; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.revwalk.RevWalk; +import org.eclipse.jgit.transport.PackParser; +import org.eclipse.jgit.transport.ReceiveCommand; + +/** + * Checks that a received pack only depends on objects which are reachable from + * a defined set of references. + */ +public interface ConnectivityChecker { + + /** + * Checks connectivity of the commit graph after pack uploading. + * + * @param connectivityCheckInfo + * Input for the connectivity check. + * @param haves + * Set of references known for client. + * @param pm + * Monitor to publish progress to. + * @throws IOException + * an error occurred during connectivity checking. + * + */ + void checkConnectivity(ConnectivityCheckInfo connectivityCheckInfo, + Set<ObjectId> haves, ProgressMonitor pm) + throws IOException; + + /** + * POJO which is used to pass all information which is needed to perform + * connectivity check. + */ + public static class ConnectivityCheckInfo { + private Repository repository; + + private PackParser parser; + + private boolean checkObjects; + + private List<ReceiveCommand> commands; + + private RevWalk walk; + + /** + * @return database we write the stored objects into. + */ + public Repository getRepository() { + return repository; + } + + /** + * @param repository + * set database we write the stored objects into. + */ + public void setRepository(Repository repository) { + this.repository = repository; + } + + /** + * @return the parser used to parse pack. + */ + public PackParser getParser() { + return parser; + } + + /** + * @param parser + * the parser to set + */ + public void setParser(PackParser parser) { + this.parser = parser; + } + + /** + * @return if checker should check objects. + */ + public boolean isCheckObjects() { + return checkObjects; + } + + /** + * @param checkObjects + * set if checker should check referenced objects outside of + * the received pack are reachable. + */ + public void setCheckObjects(boolean checkObjects) { + this.checkObjects = checkObjects; + } + + /** + * @return command received by the current request. + */ + public List<ReceiveCommand> getCommands() { + return commands; + } + + /** + * @param commands + * set command received by the current request. + */ + public void setCommands(List<ReceiveCommand> commands) { + this.commands = commands; + } + + /** + * @param walk + * the walk to parse commits + */ + public void setWalk(RevWalk walk) { + this.walk = walk; + } + + /** + * @return the walk to parse commits + */ + public RevWalk getWalk() { + return walk; + } + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/internal/FullConnectivityChecker.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/internal/FullConnectivityChecker.java new file mode 100644 index 0000000000..4adddf0879 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/internal/FullConnectivityChecker.java @@ -0,0 +1,200 @@ +/* + * Copyright (c) 2019, Google LLC and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.transport.internal; + +import java.io.IOException; +import java.util.Set; + +import org.eclipse.jgit.errors.MissingObjectException; +import org.eclipse.jgit.internal.JGitText; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.ObjectIdSubclassMap; +import org.eclipse.jgit.lib.ProgressMonitor; +import org.eclipse.jgit.revwalk.ObjectWalk; +import org.eclipse.jgit.revwalk.RevBlob; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.revwalk.RevFlag; +import org.eclipse.jgit.revwalk.RevObject; +import org.eclipse.jgit.revwalk.RevSort; +import org.eclipse.jgit.revwalk.RevTree; +import org.eclipse.jgit.transport.ReceiveCommand; +import org.eclipse.jgit.transport.ReceiveCommand.Result; + +/** + * A connectivity checker that uses the entire reference database to perform + * reachability checks when checking the connectivity of objects. If + * info.isCheckObjects() is set it will also check that objects referenced by + * deltas are either provided or reachable as well. + */ +public final class FullConnectivityChecker implements ConnectivityChecker { + @Override + public void checkConnectivity(ConnectivityCheckInfo connectivityCheckInfo, + Set<ObjectId> haves, ProgressMonitor pm) + throws MissingObjectException, IOException { + pm.beginTask(JGitText.get().countingObjects, + ProgressMonitor.UNKNOWN); + try (ObjectWalk ow = new ObjectWalk(connectivityCheckInfo.getRepository())) { + if (!markStartAndKnownNodes(connectivityCheckInfo, ow, haves, + pm)) { + return; + } + checkCommitTree(connectivityCheckInfo, ow, pm); + checkObjects(connectivityCheckInfo, ow, pm); + } finally { + pm.endTask(); + } + } + + /** + * @param connectivityCheckInfo + * Source for connectivity check. + * @param ow + * Walk which can also check blobs. + * @param haves + * Set of references known for client. + * @param pm + * Monitor to publish progress to. + * @return true if at least one new node was marked. + * @throws IOException + * an error occurred during connectivity checking. + */ + private boolean markStartAndKnownNodes( + ConnectivityCheckInfo connectivityCheckInfo, + ObjectWalk ow, + Set<ObjectId> haves, ProgressMonitor pm) + throws IOException { + boolean markTrees = connectivityCheckInfo + .isCheckObjects() + && !connectivityCheckInfo.getParser().getBaseObjectIds() + .isEmpty(); + if (connectivityCheckInfo.isCheckObjects()) { + ow.sort(RevSort.TOPO); + if (!connectivityCheckInfo.getParser().getBaseObjectIds() + .isEmpty()) { + ow.sort(RevSort.BOUNDARY, true); + } + } + boolean hasInteresting = false; + + for (ReceiveCommand cmd : connectivityCheckInfo.getCommands()) { + if (cmd.getResult() != Result.NOT_ATTEMPTED) { + continue; + } + if (cmd.getType() == ReceiveCommand.Type.DELETE) { + continue; + } + if (haves.contains(cmd.getNewId())) { + continue; + } + ow.markStart(ow.parseAny(cmd.getNewId())); + pm.update(1); + hasInteresting = true; + } + if (!hasInteresting) { + return false; + } + for (ObjectId have : haves) { + RevObject o = ow.parseAny(have); + ow.markUninteresting(o); + pm.update(1); + + if (markTrees) { + o = ow.peel(o); + if (o instanceof RevCommit) { + o = ((RevCommit) o).getTree(); + } + if (o instanceof RevTree) { + ow.markUninteresting(o); + } + } + } + return true; + } + + /** + * @param connectivityCheckInfo + * Source for connectivity check. + * @param ow + * Walk which can also check blobs. + * @param pm + * Monitor to publish progress to. + * @throws IOException + * an error occurred during connectivity checking. + */ + private void checkCommitTree(ConnectivityCheckInfo connectivityCheckInfo, + ObjectWalk ow, + ProgressMonitor pm) throws IOException { + RevCommit c; + ObjectIdSubclassMap<ObjectId> newObjectIds = connectivityCheckInfo + .getParser() + .getNewObjectIds(); + while ((c = ow.next()) != null) { + pm.update(1); + if (connectivityCheckInfo.isCheckObjects() + && !c.has(RevFlag.UNINTERESTING) + && !newObjectIds.contains(c)) { + throw new MissingObjectException(c, Constants.TYPE_COMMIT); + } + } + } + + /** + * @param connectivityCheckInfo + * Source for connectivity check. + * @param ow + * Walk which can also check blobs. + * @param pm + * Monitor to publish progress to. + * @throws IOException + * an error occurred during connectivity checking. + * + */ + private void checkObjects(ConnectivityCheckInfo connectivityCheckInfo, + ObjectWalk ow, + ProgressMonitor pm) throws IOException { + RevObject o; + ObjectIdSubclassMap<ObjectId> newObjectIds = connectivityCheckInfo + .getParser() + .getNewObjectIds(); + + while ((o = ow.nextObject()) != null) { + pm.update(1); + if (o.has(RevFlag.UNINTERESTING)) { + continue; + } + + if (connectivityCheckInfo.isCheckObjects()) { + if (newObjectIds.contains(o)) { + continue; + } + throw new MissingObjectException(o, o.getType()); + + } + + if (o instanceof RevBlob + && !connectivityCheckInfo.getRepository().getObjectDatabase() + .has(o)) { + throw new MissingObjectException(o, Constants.TYPE_BLOB); + } + } + + if (connectivityCheckInfo.isCheckObjects()) { + for (ObjectId id : connectivityCheckInfo.getParser() + .getBaseObjectIds()) { + o = ow.parseAny(id); + if (!o.has(RevFlag.UNINTERESTING)) { + throw new MissingObjectException(o, o.getType()); + } + } + } + } +} @@ -51,7 +51,7 @@ <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> <packaging>pom</packaging> - <version>5.6.0-SNAPSHOT</version> + <version>5.7.0-SNAPSHOT</version> <name>JGit - Parent</name> <url>${jgit-url}</url> @@ -890,7 +890,7 @@ <dependency> <groupId>com.google.errorprone</groupId> <artifactId>error_prone_core</artifactId> - <version>2.3.3</version> + <version>2.3.4</version> </dependency> </dependencies> </plugin> |