diff options
56 files changed, 327 insertions, 325 deletions
diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 29526a8383..5262d9c370 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.ant.test -Bundle-Version: 4.6.0.qualifier +Bundle-Version: 4.6.1.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[4.6.0,4.7.0)", - org.eclipse.jgit.internal.storage.file;version="[4.6.0,4.7.0)", - org.eclipse.jgit.junit;version="[4.6.0,4.7.0)", - org.eclipse.jgit.lib;version="[4.6.0,4.7.0)", - org.eclipse.jgit.util;version="[4.6.0,4.7.0)", + org.eclipse.jgit.ant.tasks;version="[4.6.1,4.7.0)", + org.eclipse.jgit.internal.storage.file;version="[4.6.1,4.7.0)", + org.eclipse.jgit.junit;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lib;version="[4.6.1,4.7.0)", + org.eclipse.jgit.util;version="[4.6.1,4.7.0)", org.hamcrest;version="[1.1.0,2.0.0)", org.junit;version="[4.0.0,5.0.0)" diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 6afdfe9e61..31d7f9f6b4 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>4.6.0-SNAPSHOT</version> + <version>4.6.1-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 26e4cc3be9..1525b729ec 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 4.6.0.qualifier +Bundle-Version: 4.6.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[4.6.0,4.7.0)" + org.eclipse.jgit.storage.file;version="[4.6.1,4.7.0)" Bundle-Localization: plugin Bundle-Vendor: %Provider-Name -Export-Package: org.eclipse.jgit.ant.tasks;version="4.6.0"; +Export-Package: org.eclipse.jgit.ant.tasks;version="4.6.1"; uses:="org.apache.tools.ant.types,org.apache.tools.ant" diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 01f0d42a9f..78c0e1f077 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>4.6.0-SNAPSHOT</version> + <version>4.6.1-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 0ae961cc42..f3369dae0a 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 4.6.0.qualifier +Bundle-Version: 4.6.1.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -12,14 +12,14 @@ 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="[4.6.0,4.7.0)", - org.eclipse.jgit.lib;version="[4.6.0,4.7.0)", - org.eclipse.jgit.nls;version="[4.6.0,4.7.0)", - org.eclipse.jgit.util;version="[4.6.0,4.7.0)", + org.eclipse.jgit.api;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lib;version="[4.6.1,4.7.0)", + org.eclipse.jgit.nls;version="[4.6.1,4.7.0)", + org.eclipse.jgit.util;version="[4.6.1,4.7.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="4.6.0"; +Export-Package: org.eclipse.jgit.archive;version="4.6.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.api, org.apache.commons.compress.archivers, diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index a5a6005448..ae331c022f 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: 4.6.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.6.0.qualifier";roots="." +Bundle-Version: 4.6.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.6.1.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 1d5610fd53..ab64576861 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>4.6.0-SNAPSHOT</version> + <version>4.6.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.archive</artifactId> diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 1b4d4b1212..badb920076 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 4.6.0.qualifier +Bundle-Version: 4.6.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Localization: plugin Bundle-Vendor: %Provider-Name @@ -23,10 +23,10 @@ Import-Package: org.apache.http;version="[4.3.0,5.0.0)", org.apache.http.impl.client.cache;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.nls;version="[4.6.0,4.7.0)", - org.eclipse.jgit.transport.http;version="[4.6.0,4.7.0)", - org.eclipse.jgit.util;version="[4.6.0,4.7.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="4.6.0"; + org.eclipse.jgit.nls;version="[4.6.1,4.7.0)", + org.eclipse.jgit.transport.http;version="[4.6.1,4.7.0)", + org.eclipse.jgit.util;version="[4.6.1,4.7.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="4.6.1"; uses:="org.apache.http.client, org.eclipse.jgit.transport.http, org.apache.http.entity, diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index e5c9ab35da..6c4259916b 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>4.6.0-SNAPSHOT</version> + <version>4.6.1-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 83510153cc..a5accce426 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 4.6.0.qualifier +Bundle-Version: 4.6.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.http.server;version="4.6.0", - org.eclipse.jgit.http.server.glue;version="4.6.0"; +Export-Package: org.eclipse.jgit.http.server;version="4.6.1", + org.eclipse.jgit.http.server.glue;version="4.6.1"; uses:="javax.servlet,javax.servlet.http", - org.eclipse.jgit.http.server.resolver;version="4.6.0"; + org.eclipse.jgit.http.server.resolver;version="4.6.1"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, @@ -17,12 +17,12 @@ 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.errors;version="[4.6.0,4.7.0)", - org.eclipse.jgit.internal.storage.dfs;version="[4.6.0,4.7.0)", - org.eclipse.jgit.internal.storage.file;version="[4.6.0,4.7.0)", - org.eclipse.jgit.lib;version="[4.6.0,4.7.0)", - org.eclipse.jgit.nls;version="[4.6.0,4.7.0)", - org.eclipse.jgit.revwalk;version="[4.6.0,4.7.0)", - org.eclipse.jgit.transport;version="[4.6.0,4.7.0)", - org.eclipse.jgit.transport.resolver;version="[4.6.0,4.7.0)", - org.eclipse.jgit.util;version="[4.6.0,4.7.0)" + org.eclipse.jgit.errors;version="[4.6.1,4.7.0)", + org.eclipse.jgit.internal.storage.dfs;version="[4.6.1,4.7.0)", + org.eclipse.jgit.internal.storage.file;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lib;version="[4.6.1,4.7.0)", + org.eclipse.jgit.nls;version="[4.6.1,4.7.0)", + org.eclipse.jgit.revwalk;version="[4.6.1,4.7.0)", + org.eclipse.jgit.transport;version="[4.6.1,4.7.0)", + org.eclipse.jgit.transport.resolver;version="[4.6.1,4.7.0)", + org.eclipse.jgit.util;version="[4.6.1,4.7.0)" diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 4d08ee9caf..c80bc4ecad 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>4.6.0-SNAPSHOT</version> + <version>4.6.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.http.server</artifactId> diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index ad8539ffb6..f7bb4039e7 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 4.6.0.qualifier +Bundle-Version: 4.6.1.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -22,24 +22,24 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)", org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)", org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)", org.eclipse.jetty.util.thread;version="[9.0.0,10.0.0)", - org.eclipse.jgit.errors;version="[4.6.0,4.7.0)", - org.eclipse.jgit.http.server;version="[4.6.0,4.7.0)", - org.eclipse.jgit.http.server.glue;version="[4.6.0,4.7.0)", - org.eclipse.jgit.http.server.resolver;version="[4.6.0,4.7.0)", - org.eclipse.jgit.internal;version="[4.6.0,4.7.0)", - org.eclipse.jgit.internal.storage.dfs;version="[4.6.0,4.7.0)", - org.eclipse.jgit.internal.storage.file;version="[4.6.0,4.7.0)", - org.eclipse.jgit.junit;version="[4.6.0,4.7.0)", - org.eclipse.jgit.junit.http;version="[4.6.0,4.7.0)", - org.eclipse.jgit.lib;version="[4.6.0,4.7.0)", - org.eclipse.jgit.nls;version="[4.6.0,4.7.0)", - org.eclipse.jgit.revwalk;version="[4.6.0,4.7.0)", - org.eclipse.jgit.storage.file;version="[4.6.0,4.7.0)", - org.eclipse.jgit.transport;version="[4.6.0,4.7.0)", - org.eclipse.jgit.transport.http;version="[4.6.0,4.7.0)", - org.eclipse.jgit.transport.http.apache;version="[4.6.0,4.7.0)", - org.eclipse.jgit.transport.resolver;version="[4.6.0,4.7.0)", - org.eclipse.jgit.util;version="[4.6.0,4.7.0)", + org.eclipse.jgit.errors;version="[4.6.1,4.7.0)", + org.eclipse.jgit.http.server;version="[4.6.1,4.7.0)", + org.eclipse.jgit.http.server.glue;version="[4.6.1,4.7.0)", + org.eclipse.jgit.http.server.resolver;version="[4.6.1,4.7.0)", + org.eclipse.jgit.internal;version="[4.6.1,4.7.0)", + org.eclipse.jgit.internal.storage.dfs;version="[4.6.1,4.7.0)", + org.eclipse.jgit.internal.storage.file;version="[4.6.1,4.7.0)", + org.eclipse.jgit.junit;version="[4.6.1,4.7.0)", + org.eclipse.jgit.junit.http;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lib;version="[4.6.1,4.7.0)", + org.eclipse.jgit.nls;version="[4.6.1,4.7.0)", + org.eclipse.jgit.revwalk;version="[4.6.1,4.7.0)", + org.eclipse.jgit.storage.file;version="[4.6.1,4.7.0)", + org.eclipse.jgit.transport;version="[4.6.1,4.7.0)", + org.eclipse.jgit.transport.http;version="[4.6.1,4.7.0)", + org.eclipse.jgit.transport.http.apache;version="[4.6.1,4.7.0)", + org.eclipse.jgit.transport.resolver;version="[4.6.1,4.7.0)", + org.eclipse.jgit.util;version="[4.6.1,4.7.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.0.0,5.0.0)", org.junit.runner;version="[4.0.0,5.0.0)", diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 4c1be08eca..34509bda19 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>4.6.0-SNAPSHOT</version> + <version>4.6.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.http.test</artifactId> @@ -60,7 +60,9 @@ <description> Tests for the HTTP transport. </description> - + <properties> + <maven.javadoc.skip>true</maven.javadoc.skip> + </properties> <dependencies> <dependency> <groupId>junit</groupId> diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 2d6834493c..144466a390 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 4.6.0.qualifier +Bundle-Version: 4.6.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy @@ -20,16 +20,16 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)", org.eclipse.jetty.util.component;version="[9.0.0,10.0.0)", org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)", org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)", - org.eclipse.jgit.errors;version="[4.6.0,4.7.0)", - org.eclipse.jgit.http.server;version="[4.6.0,4.7.0)", - org.eclipse.jgit.internal.storage.file;version="[4.6.0,4.7.0)", - org.eclipse.jgit.junit;version="[4.6.0,4.7.0)", - org.eclipse.jgit.lib;version="[4.6.0,4.7.0)", - org.eclipse.jgit.revwalk;version="[4.6.0,4.7.0)", - org.eclipse.jgit.transport;version="[4.6.0,4.7.0)", - org.eclipse.jgit.transport.resolver;version="[4.6.0,4.7.0)", + org.eclipse.jgit.errors;version="[4.6.1,4.7.0)", + org.eclipse.jgit.http.server;version="[4.6.1,4.7.0)", + org.eclipse.jgit.internal.storage.file;version="[4.6.1,4.7.0)", + org.eclipse.jgit.junit;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lib;version="[4.6.1,4.7.0)", + org.eclipse.jgit.revwalk;version="[4.6.1,4.7.0)", + org.eclipse.jgit.transport;version="[4.6.1,4.7.0)", + org.eclipse.jgit.transport.resolver;version="[4.6.1,4.7.0)", org.junit;version="[4.0.0,5.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="4.6.0"; +Export-Package: org.eclipse.jgit.junit.http;version="4.6.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.junit, javax.servlet.http, diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 79172a18cf..d99e68c9aa 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>4.6.0-SNAPSHOT</version> + <version>4.6.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.junit.http</artifactId> diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 3597a508be..cde23b237b 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -2,31 +2,31 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 4.6.0.qualifier +Bundle-Version: 4.6.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.api;version="[4.6.0,4.7.0)", - org.eclipse.jgit.api.errors;version="[4.6.0,4.7.0)", - org.eclipse.jgit.dircache;version="[4.6.0,4.7.0)", - org.eclipse.jgit.errors;version="[4.6.0,4.7.0)", - org.eclipse.jgit.internal.storage.file;version="[4.6.0,4.7.0)", - org.eclipse.jgit.internal.storage.pack;version="[4.6.0,4.7.0)", - org.eclipse.jgit.lib;version="[4.6.0,4.7.0)", - org.eclipse.jgit.merge;version="[4.6.0,4.7.0)", - org.eclipse.jgit.revwalk;version="[4.6.0,4.7.0)", - org.eclipse.jgit.storage.file;version="[4.6.0,4.7.0)", - org.eclipse.jgit.treewalk;version="[4.6.0,4.7.0)", - org.eclipse.jgit.treewalk.filter;version="[4.6.0,4.7.0)", - org.eclipse.jgit.util;version="[4.6.0,4.7.0)", - org.eclipse.jgit.util.io;version="[4.6.0,4.7.0)", - org.eclipse.jgit.util.time;version="[4.6.0,4.7.0)", +Import-Package: org.eclipse.jgit.api;version="[4.6.1,4.7.0)", + org.eclipse.jgit.api.errors;version="[4.6.1,4.7.0)", + org.eclipse.jgit.dircache;version="[4.6.1,4.7.0)", + org.eclipse.jgit.errors;version="[4.6.1,4.7.0)", + org.eclipse.jgit.internal.storage.file;version="[4.6.1,4.7.0)", + org.eclipse.jgit.internal.storage.pack;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lib;version="[4.6.1,4.7.0)", + org.eclipse.jgit.merge;version="[4.6.1,4.7.0)", + org.eclipse.jgit.revwalk;version="[4.6.1,4.7.0)", + org.eclipse.jgit.storage.file;version="[4.6.1,4.7.0)", + org.eclipse.jgit.treewalk;version="[4.6.1,4.7.0)", + org.eclipse.jgit.treewalk.filter;version="[4.6.1,4.7.0)", + org.eclipse.jgit.util;version="[4.6.1,4.7.0)", + org.eclipse.jgit.util.io;version="[4.6.1,4.7.0)", + org.eclipse.jgit.util.time;version="[4.6.1,4.7.0)", org.junit;version="[4.0.0,5.0.0)", org.junit.rules;version="[4.9.0,5.0.0)", org.junit.runner;version="[4.0.0,5.0.0)", org.junit.runners.model;version="[4.5.0,5.0.0)" -Export-Package: org.eclipse.jgit.junit;version="4.6.0"; +Export-Package: org.eclipse.jgit.junit;version="4.6.1"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -35,4 +35,4 @@ Export-Package: org.eclipse.jgit.junit;version="4.6.0"; org.eclipse.jgit.util, org.eclipse.jgit.storage.file, org.eclipse.jgit.api", - org.eclipse.jgit.junit.time;version="4.6.0" + org.eclipse.jgit.junit.time;version="4.6.1" diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index fbe56fcfaa..199d2579b6 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>4.6.0-SNAPSHOT</version> + <version>4.6.1-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 49a1120d12..aae1e037a3 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 4.6.0.qualifier +Bundle-Version: 4.6.1.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -27,11 +27,11 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)", org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)", org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)", org.eclipse.jetty.util.thread;version="[9.0.0,10.0.0)", - org.eclipse.jgit.junit.http;version="[4.6.0,4.7.0)", - org.eclipse.jgit.lfs.lib;version="[4.6.0,4.7.0)", - org.eclipse.jgit.lfs.server.fs;version="[4.6.0,4.7.0)", - org.eclipse.jgit.lfs.test;version="[4.6.0,4.7.0)", - org.eclipse.jgit.util;version="[4.6.0,4.7.0)", + org.eclipse.jgit.junit.http;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lfs.lib;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lfs.server.fs;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lfs.test;version="[4.6.1,4.7.0)", + org.eclipse.jgit.util;version="[4.6.1,4.7.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.0.0,5.0.0)", org.junit.runner;version="[4.0.0,5.0.0)", diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 61e12396e1..24b0371c0f 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>4.6.0-SNAPSHOT</version> + <version>4.6.1-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 459118fd54..f6aae18aa4 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -2,19 +2,19 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 4.6.0.qualifier +Bundle-Version: 4.6.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.lfs.server;version="4.6.0"; +Export-Package: org.eclipse.jgit.lfs.server;version="4.6.1"; uses:="javax.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="4.6.0"; + org.eclipse.jgit.lfs.server.fs;version="4.6.1"; uses:="javax.servlet, javax.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="4.6.0";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="4.6.0"; + org.eclipse.jgit.lfs.server.internal;version="4.6.1";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="4.6.1"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -24,13 +24,13 @@ Import-Package: com.google.gson;version="[2.2.4,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="[4.6.0,4.7.0)", - org.eclipse.jgit.internal;version="[4.6.0,4.7.0)", - org.eclipse.jgit.internal.storage.file;version="[4.6.0,4.7.0)", - org.eclipse.jgit.lfs.errors;version="[4.6.0,4.7.0)", - org.eclipse.jgit.lfs.internal;version="[4.6.0,4.7.0)", - org.eclipse.jgit.lfs.lib;version="[4.6.0,4.7.0)", - org.eclipse.jgit.nls;version="[4.6.0,4.7.0)", - org.eclipse.jgit.transport.http;version="[4.6.0,4.7.0)", - org.eclipse.jgit.transport.http.apache;version="[4.6.0,4.7.0)", - org.eclipse.jgit.util;version="[4.6.0,4.7.0)" + org.eclipse.jgit.annotations;version="[4.6.1,4.7.0)", + org.eclipse.jgit.internal;version="[4.6.1,4.7.0)", + org.eclipse.jgit.internal.storage.file;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lfs.errors;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lfs.internal;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lfs.lib;version="[4.6.1,4.7.0)", + org.eclipse.jgit.nls;version="[4.6.1,4.7.0)", + org.eclipse.jgit.transport.http;version="[4.6.1,4.7.0)", + org.eclipse.jgit.transport.http.apache;version="[4.6.1,4.7.0)", + org.eclipse.jgit.util;version="[4.6.1,4.7.0)" diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 55b863b1e4..61281aab8d 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>4.6.0-SNAPSHOT</version> + <version>4.6.1-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 b988e13064..babae33aa5 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -2,19 +2,19 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 4.6.0.qualifier +Bundle-Version: 4.6.1.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.junit;version="[4.6.0,4.7.0)", - org.eclipse.jgit.lfs;version="[4.6.0,4.7.0)", - org.eclipse.jgit.lfs.errors;version="[4.6.0,4.7.0)", - org.eclipse.jgit.lfs.lib;version="[4.6.0,4.7.0)", - org.eclipse.jgit.lib;version="[4.6.0,4.7.0)", - org.eclipse.jgit.util;version="[4.6.0,4.7.0)", +Import-Package: org.eclipse.jgit.junit;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lfs;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lfs.errors;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lfs.lib;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lib;version="[4.6.1,4.7.0)", + org.eclipse.jgit.util;version="[4.6.1,4.7.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.0.0,5.0.0)", org.junit.runner;version="[4.0.0,5.0.0)", org.junit.runners;version="[4.0.0,5.0.0)" -Export-Package: org.eclipse.jgit.lfs.test;version="4.6.0";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="4.6.1";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 b3dc7d6cbc..30c621acd7 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>4.6.0-SNAPSHOT</version> + <version>4.6.1-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 8252603670..7516915f8e 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -2,17 +2,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 4.6.0.qualifier +Bundle-Version: 4.6.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.lfs;version="4.6.0", - org.eclipse.jgit.lfs.errors;version="4.6.0", - org.eclipse.jgit.lfs.internal;version="4.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="4.6.0" +Export-Package: org.eclipse.jgit.lfs;version="4.6.1", + org.eclipse.jgit.lfs.errors;version="4.6.1", + org.eclipse.jgit.lfs.internal;version="4.6.1";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", + org.eclipse.jgit.lfs.lib;version="4.6.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.annotations;version="[4.6.0,4.7.0)";resolution:=optional, - org.eclipse.jgit.attributes;version="[4.6.0,4.7.0)", - org.eclipse.jgit.internal.storage.file;version="[4.6.0,4.7.0)", - org.eclipse.jgit.lib;version="[4.6.0,4.7.0)", - org.eclipse.jgit.nls;version="[4.6.0,4.7.0)", - org.eclipse.jgit.util;version="[4.6.0,4.7.0)" +Import-Package: org.eclipse.jgit.annotations;version="[4.6.1,4.7.0)";resolution:=optional, + org.eclipse.jgit.attributes;version="[4.6.1,4.7.0)", + org.eclipse.jgit.internal.storage.file;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lib;version="[4.6.1,4.7.0)", + org.eclipse.jgit.nls;version="[4.6.1,4.7.0)", + org.eclipse.jgit.util;version="[4.6.1,4.7.0)" diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 6e0c461e98..79dff99203 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>4.6.0-SNAPSHOT</version> + <version>4.6.1-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 75573d7715..43a3900ba6 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="4.6.0.qualifier" + version="4.6.1.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 8a7d70a8bf..43db9fdec1 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>4.6.0-SNAPSHOT</version> + <version>4.6.1-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 0233f2a0f3..61f9b51a8a 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="4.6.0.qualifier" + version="4.6.1.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> 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 5ebee1251e..10b5d4a69b 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>4.6.0-SNAPSHOT</version> + <version>4.6.1-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 45c320e090..73a49aa5a9 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="4.6.0.qualifier" + version="4.6.1.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> 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 9db144cbc1..22aaac4974 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>4.6.0-SNAPSHOT</version> + <version>4.6.1-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 47a09d2c8d..21aac0e1d4 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="4.6.0.qualifier" + version="4.6.1.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> 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 b3379f8414..598402f638 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>4.6.0-SNAPSHOT</version> + <version>4.6.1-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 1f69a51458..de12a9a7e9 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="4.6.0.qualifier" + version="4.6.1.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> 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 d00064e154..a579f511cb 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>4.6.0-SNAPSHOT</version> + <version>4.6.1-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml index 8584ee1763..4491184237 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit.pgm.source" label="%featureName" - version="4.6.0.qualifier" + version="4.6.1.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml index d5e1168a16..5e928667f3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.6.1-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 e441fced97..2aba53007d 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>4.6.0-SNAPSHOT</version> + <version>4.6.1-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 c2fb82e278..cf8e2b58e0 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="4.6.0.qualifier" + version="4.6.1.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> 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 3e3add461a..beeab3bbd2 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>4.6.0-SNAPSHOT</version> + <version>4.6.1-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 6854007d39..7cf2cfe45f 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: 4.6.0.qualifier +Bundle-Version: 4.6.1.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 fc33622ddc..350541a48c 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>4.6.0-SNAPSHOT</version> + <version>4.6.1-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 cf4d7405fe..4d09dee1eb 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -53,13 +53,13 @@ <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>JGit Tycho Parent</name> <properties> - <tycho-version>0.25.0</tycho-version> + <tycho-version>0.26.0</tycho-version> <tycho-extras-version>${tycho-version}</tycho-extras-version> <target-platform>jgit-4.6</target-platform> </properties> @@ -149,7 +149,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.7</version> + <version>3.0.2</version> <configuration> <encoding>ISO-8859-1</encoding> </configuration> @@ -221,7 +221,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.10</version> + <version>1.12</version> </plugin> </plugins> </pluginManagement> diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 45e3692cf3..90d6f4c23d 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -2,28 +2,28 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 4.6.0.qualifier +Bundle-Version: 4.6.1.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.api;version="[4.6.0,4.7.0)", - org.eclipse.jgit.api.errors;version="[4.6.0,4.7.0)", - org.eclipse.jgit.diff;version="[4.6.0,4.7.0)", - org.eclipse.jgit.dircache;version="[4.6.0,4.7.0)", - org.eclipse.jgit.internal.storage.file;version="4.6.0", - org.eclipse.jgit.junit;version="[4.6.0,4.7.0)", - org.eclipse.jgit.lib;version="[4.6.0,4.7.0)", - org.eclipse.jgit.merge;version="[4.6.0,4.7.0)", - org.eclipse.jgit.pgm;version="[4.6.0,4.7.0)", - org.eclipse.jgit.pgm.internal;version="[4.6.0,4.7.0)", - org.eclipse.jgit.pgm.opt;version="[4.6.0,4.7.0)", - org.eclipse.jgit.revwalk;version="[4.6.0,4.7.0)", - org.eclipse.jgit.storage.file;version="[4.6.0,4.7.0)", - org.eclipse.jgit.transport;version="[4.6.0,4.7.0)", - org.eclipse.jgit.treewalk;version="[4.6.0,4.7.0)", - org.eclipse.jgit.util;version="[4.6.0,4.7.0)", - org.eclipse.jgit.util.io;version="[4.6.0,4.7.0)", +Import-Package: org.eclipse.jgit.api;version="[4.6.1,4.7.0)", + org.eclipse.jgit.api.errors;version="[4.6.1,4.7.0)", + org.eclipse.jgit.diff;version="[4.6.1,4.7.0)", + org.eclipse.jgit.dircache;version="[4.6.1,4.7.0)", + org.eclipse.jgit.internal.storage.file;version="4.6.1", + org.eclipse.jgit.junit;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lib;version="[4.6.1,4.7.0)", + org.eclipse.jgit.merge;version="[4.6.1,4.7.0)", + org.eclipse.jgit.pgm;version="[4.6.1,4.7.0)", + org.eclipse.jgit.pgm.internal;version="[4.6.1,4.7.0)", + org.eclipse.jgit.pgm.opt;version="[4.6.1,4.7.0)", + org.eclipse.jgit.revwalk;version="[4.6.1,4.7.0)", + org.eclipse.jgit.storage.file;version="[4.6.1,4.7.0)", + org.eclipse.jgit.transport;version="[4.6.1,4.7.0)", + org.eclipse.jgit.treewalk;version="[4.6.1,4.7.0)", + org.eclipse.jgit.util;version="[4.6.1,4.7.0)", + org.eclipse.jgit.util.io;version="[4.6.1,4.7.0)", org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", org.junit;version="[4.11.0,5.0.0)", org.junit.rules;version="[4.11.0,5.0.0)", diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index f5d0bd3aaa..57593cd945 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>4.6.0-SNAPSHOT</version> + <version>4.6.1-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 6edf5615b8..503f498772 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 4.6.0.qualifier +Bundle-Version: 4.6.1.qualifier Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-Localization: plugin @@ -27,46 +27,46 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)", org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)", org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)", org.eclipse.jetty.util.thread;version="[9.0.0,10.0.0)", - org.eclipse.jgit.api;version="[4.6.0,4.7.0)", - org.eclipse.jgit.api.errors;version="[4.6.0,4.7.0)", - org.eclipse.jgit.archive;version="[4.6.0,4.7.0)", - org.eclipse.jgit.awtui;version="[4.6.0,4.7.0)", - org.eclipse.jgit.blame;version="[4.6.0,4.7.0)", - org.eclipse.jgit.diff;version="[4.6.0,4.7.0)", - org.eclipse.jgit.dircache;version="[4.6.0,4.7.0)", - org.eclipse.jgit.errors;version="[4.6.0,4.7.0)", - org.eclipse.jgit.gitrepo;version="[4.6.0,4.7.0)", - org.eclipse.jgit.internal.ketch;version="[4.6.0,4.7.0)", - org.eclipse.jgit.internal.storage.file;version="[4.6.0,4.7.0)", - org.eclipse.jgit.internal.storage.pack;version="[4.6.0,4.7.0)", - org.eclipse.jgit.internal.storage.reftree;version="[4.6.0,4.7.0)", - org.eclipse.jgit.lfs;version="[4.6.0,4.7.0)", - org.eclipse.jgit.lfs.lib;version="[4.6.0,4.7.0)", - org.eclipse.jgit.lfs.server;version="[4.6.0,4.7.0)", - org.eclipse.jgit.lfs.server.fs;version="[4.6.0,4.7.0)", - org.eclipse.jgit.lfs.server.s3;version="[4.6.0,4.7.0)", - org.eclipse.jgit.lib;version="[4.6.0,4.7.0)", - org.eclipse.jgit.merge;version="[4.6.0,4.7.0)", - org.eclipse.jgit.nls;version="[4.6.0,4.7.0)", - org.eclipse.jgit.notes;version="[4.6.0,4.7.0)", - org.eclipse.jgit.revplot;version="[4.6.0,4.7.0)", - org.eclipse.jgit.revwalk;version="[4.6.0,4.7.0)", - org.eclipse.jgit.revwalk.filter;version="[4.6.0,4.7.0)", - org.eclipse.jgit.storage.file;version="[4.6.0,4.7.0)", - org.eclipse.jgit.storage.pack;version="[4.6.0,4.7.0)", - org.eclipse.jgit.transport;version="[4.6.0,4.7.0)", - org.eclipse.jgit.transport.http.apache;version="[4.6.0,4.7.0)", - org.eclipse.jgit.transport.resolver;version="[4.6.0,4.7.0)", - org.eclipse.jgit.treewalk;version="[4.6.0,4.7.0)", - org.eclipse.jgit.treewalk.filter;version="[4.6.0,4.7.0)", - org.eclipse.jgit.util;version="[4.6.0,4.7.0)", - org.eclipse.jgit.util.io;version="[4.6.0,4.7.0)", + org.eclipse.jgit.api;version="[4.6.1,4.7.0)", + org.eclipse.jgit.api.errors;version="[4.6.1,4.7.0)", + org.eclipse.jgit.archive;version="[4.6.1,4.7.0)", + org.eclipse.jgit.awtui;version="[4.6.1,4.7.0)", + org.eclipse.jgit.blame;version="[4.6.1,4.7.0)", + org.eclipse.jgit.diff;version="[4.6.1,4.7.0)", + org.eclipse.jgit.dircache;version="[4.6.1,4.7.0)", + org.eclipse.jgit.errors;version="[4.6.1,4.7.0)", + org.eclipse.jgit.gitrepo;version="[4.6.1,4.7.0)", + org.eclipse.jgit.internal.ketch;version="[4.6.1,4.7.0)", + org.eclipse.jgit.internal.storage.file;version="[4.6.1,4.7.0)", + org.eclipse.jgit.internal.storage.pack;version="[4.6.1,4.7.0)", + org.eclipse.jgit.internal.storage.reftree;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lfs;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lfs.lib;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lfs.server;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lfs.server.fs;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lfs.server.s3;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lib;version="[4.6.1,4.7.0)", + org.eclipse.jgit.merge;version="[4.6.1,4.7.0)", + org.eclipse.jgit.nls;version="[4.6.1,4.7.0)", + org.eclipse.jgit.notes;version="[4.6.1,4.7.0)", + org.eclipse.jgit.revplot;version="[4.6.1,4.7.0)", + org.eclipse.jgit.revwalk;version="[4.6.1,4.7.0)", + org.eclipse.jgit.revwalk.filter;version="[4.6.1,4.7.0)", + org.eclipse.jgit.storage.file;version="[4.6.1,4.7.0)", + org.eclipse.jgit.storage.pack;version="[4.6.1,4.7.0)", + org.eclipse.jgit.transport;version="[4.6.1,4.7.0)", + org.eclipse.jgit.transport.http.apache;version="[4.6.1,4.7.0)", + org.eclipse.jgit.transport.resolver;version="[4.6.1,4.7.0)", + org.eclipse.jgit.treewalk;version="[4.6.1,4.7.0)", + org.eclipse.jgit.treewalk.filter;version="[4.6.1,4.7.0)", + org.eclipse.jgit.util;version="[4.6.1,4.7.0)", + org.eclipse.jgit.util.io;version="[4.6.1,4.7.0)", org.kohsuke.args4j;version="[2.0.12,2.1.0)", org.kohsuke.args4j.spi;version="[2.0.15,2.1.0)" -Export-Package: org.eclipse.jgit.console;version="4.6.0"; +Export-Package: org.eclipse.jgit.console;version="4.6.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="4.6.0"; + org.eclipse.jgit.pgm;version="4.6.1"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.pgm.opt, @@ -77,11 +77,11 @@ Export-Package: org.eclipse.jgit.console;version="4.6.0"; org.eclipse.jgit.treewalk, javax.swing, org.eclipse.jgit.transport", - org.eclipse.jgit.pgm.debug;version="4.6.0"; + org.eclipse.jgit.pgm.debug;version="4.6.1"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm", - org.eclipse.jgit.pgm.internal;version="4.6.0";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="4.6.0"; + org.eclipse.jgit.pgm.internal;version="4.6.1";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", + org.eclipse.jgit.pgm.opt;version="4.6.1"; 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 3378a8ced6..904bd19ff8 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: 4.6.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="4.6.0.qualifier";roots="." +Bundle-Version: 4.6.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="4.6.1.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 61979c8c5b..19e09df672 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>4.6.0-SNAPSHOT</version> + <version>4.6.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.pgm</artifactId> diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 34bab8e44e..601ed0ff6c 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -2,53 +2,53 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 4.6.0.qualifier +Bundle-Version: 4.6.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", - org.eclipse.jgit.api;version="[4.6.0,4.7.0)", - org.eclipse.jgit.api.errors;version="[4.6.0,4.7.0)", - org.eclipse.jgit.attributes;version="[4.6.0,4.7.0)", - org.eclipse.jgit.awtui;version="[4.6.0,4.7.0)", - org.eclipse.jgit.blame;version="[4.6.0,4.7.0)", - org.eclipse.jgit.diff;version="[4.6.0,4.7.0)", - org.eclipse.jgit.dircache;version="[4.6.0,4.7.0)", - org.eclipse.jgit.errors;version="[4.6.0,4.7.0)", - org.eclipse.jgit.events;version="[4.6.0,4.7.0)", - org.eclipse.jgit.fnmatch;version="[4.6.0,4.7.0)", - org.eclipse.jgit.gitrepo;version="[4.6.0,4.7.0)", - org.eclipse.jgit.hooks;version="[4.6.0,4.7.0)", - org.eclipse.jgit.ignore;version="[4.6.0,4.7.0)", - org.eclipse.jgit.ignore.internal;version="[4.6.0,4.7.0)", - org.eclipse.jgit.internal;version="[4.6.0,4.7.0)", - org.eclipse.jgit.internal.storage.dfs;version="[4.6.0,4.7.0)", - org.eclipse.jgit.internal.storage.file;version="[4.6.0,4.7.0)", - org.eclipse.jgit.internal.storage.pack;version="[4.6.0,4.7.0)", - org.eclipse.jgit.internal.storage.reftree;version="[4.6.0,4.7.0)", - org.eclipse.jgit.junit;version="[4.6.0,4.7.0)", - org.eclipse.jgit.lfs;version="[4.6.0,4.7.0)", - org.eclipse.jgit.lib;version="[4.6.0,4.7.0)", - org.eclipse.jgit.merge;version="[4.6.0,4.7.0)", - org.eclipse.jgit.nls;version="[4.6.0,4.7.0)", - org.eclipse.jgit.notes;version="[4.6.0,4.7.0)", - org.eclipse.jgit.patch;version="[4.6.0,4.7.0)", - org.eclipse.jgit.pgm;version="[4.6.0,4.7.0)", - org.eclipse.jgit.pgm.internal;version="[4.6.0,4.7.0)", - org.eclipse.jgit.revplot;version="[4.6.0,4.7.0)", - org.eclipse.jgit.revwalk;version="[4.6.0,4.7.0)", - org.eclipse.jgit.revwalk.filter;version="[4.6.0,4.7.0)", - org.eclipse.jgit.storage.file;version="[4.6.0,4.7.0)", - org.eclipse.jgit.storage.pack;version="[4.6.0,4.7.0)", - org.eclipse.jgit.submodule;version="[4.6.0,4.7.0)", - org.eclipse.jgit.transport;version="[4.6.0,4.7.0)", - org.eclipse.jgit.transport.http;version="[4.6.0,4.7.0)", - org.eclipse.jgit.transport.resolver;version="[4.6.0,4.7.0)", - org.eclipse.jgit.treewalk;version="[4.6.0,4.7.0)", - org.eclipse.jgit.treewalk.filter;version="[4.6.0,4.7.0)", - org.eclipse.jgit.util;version="[4.6.0,4.7.0)", - org.eclipse.jgit.util.io;version="[4.6.0,4.7.0)", + org.eclipse.jgit.api;version="[4.6.1,4.7.0)", + org.eclipse.jgit.api.errors;version="[4.6.1,4.7.0)", + org.eclipse.jgit.attributes;version="[4.6.1,4.7.0)", + org.eclipse.jgit.awtui;version="[4.6.1,4.7.0)", + org.eclipse.jgit.blame;version="[4.6.1,4.7.0)", + org.eclipse.jgit.diff;version="[4.6.1,4.7.0)", + org.eclipse.jgit.dircache;version="[4.6.1,4.7.0)", + org.eclipse.jgit.errors;version="[4.6.1,4.7.0)", + org.eclipse.jgit.events;version="[4.6.1,4.7.0)", + org.eclipse.jgit.fnmatch;version="[4.6.1,4.7.0)", + org.eclipse.jgit.gitrepo;version="[4.6.1,4.7.0)", + org.eclipse.jgit.hooks;version="[4.6.1,4.7.0)", + org.eclipse.jgit.ignore;version="[4.6.1,4.7.0)", + org.eclipse.jgit.ignore.internal;version="[4.6.1,4.7.0)", + org.eclipse.jgit.internal;version="[4.6.1,4.7.0)", + org.eclipse.jgit.internal.storage.dfs;version="[4.6.1,4.7.0)", + org.eclipse.jgit.internal.storage.file;version="[4.6.1,4.7.0)", + org.eclipse.jgit.internal.storage.pack;version="[4.6.1,4.7.0)", + org.eclipse.jgit.internal.storage.reftree;version="[4.6.1,4.7.0)", + org.eclipse.jgit.junit;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lfs;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lib;version="[4.6.1,4.7.0)", + org.eclipse.jgit.merge;version="[4.6.1,4.7.0)", + org.eclipse.jgit.nls;version="[4.6.1,4.7.0)", + org.eclipse.jgit.notes;version="[4.6.1,4.7.0)", + org.eclipse.jgit.patch;version="[4.6.1,4.7.0)", + org.eclipse.jgit.pgm;version="[4.6.1,4.7.0)", + org.eclipse.jgit.pgm.internal;version="[4.6.1,4.7.0)", + org.eclipse.jgit.revplot;version="[4.6.1,4.7.0)", + org.eclipse.jgit.revwalk;version="[4.6.1,4.7.0)", + org.eclipse.jgit.revwalk.filter;version="[4.6.1,4.7.0)", + org.eclipse.jgit.storage.file;version="[4.6.1,4.7.0)", + org.eclipse.jgit.storage.pack;version="[4.6.1,4.7.0)", + org.eclipse.jgit.submodule;version="[4.6.1,4.7.0)", + org.eclipse.jgit.transport;version="[4.6.1,4.7.0)", + org.eclipse.jgit.transport.http;version="[4.6.1,4.7.0)", + org.eclipse.jgit.transport.resolver;version="[4.6.1,4.7.0)", + org.eclipse.jgit.treewalk;version="[4.6.1,4.7.0)", + org.eclipse.jgit.treewalk.filter;version="[4.6.1,4.7.0)", + org.eclipse.jgit.util;version="[4.6.1,4.7.0)", + org.eclipse.jgit.util.io;version="[4.6.1,4.7.0)", org.junit;version="[4.4.0,5.0.0)", org.junit.experimental.theories;version="[4.4.0,5.0.0)", org.junit.rules;version="[4.11.0,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 5c358b1493..bad592a4aa 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>4.6.0-SNAPSHOT</version> + <version>4.6.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.test</artifactId> diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index b2e07502e4..070de39b40 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 4.6.0.qualifier +Bundle-Version: 4.6.1.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.jgit.awtui;version="4.6.0" -Import-Package: org.eclipse.jgit.errors;version="[4.6.0,4.7.0)", - org.eclipse.jgit.lib;version="[4.6.0,4.7.0)", - org.eclipse.jgit.nls;version="[4.6.0,4.7.0)", - org.eclipse.jgit.revplot;version="[4.6.0,4.7.0)", - org.eclipse.jgit.revwalk;version="[4.6.0,4.7.0)", - org.eclipse.jgit.transport;version="[4.6.0,4.7.0)", - org.eclipse.jgit.util;version="[4.6.0,4.7.0)" +Export-Package: org.eclipse.jgit.awtui;version="4.6.1" +Import-Package: org.eclipse.jgit.errors;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lib;version="[4.6.1,4.7.0)", + org.eclipse.jgit.nls;version="[4.6.1,4.7.0)", + org.eclipse.jgit.revplot;version="[4.6.1,4.7.0)", + org.eclipse.jgit.revwalk;version="[4.6.1,4.7.0)", + org.eclipse.jgit.transport;version="[4.6.1,4.7.0)", + org.eclipse.jgit.util;version="[4.6.1,4.7.0)" diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index bf79af052c..4fc6485c4f 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>4.6.0-SNAPSHOT</version> + <version>4.6.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ui</artifactId> diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 20fd730738..22d42751b4 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 4.6.0.qualifier +Bundle-Version: 4.6.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.jgit.annotations;version="4.6.0", - org.eclipse.jgit.api;version="4.6.0"; +Export-Package: org.eclipse.jgit.annotations;version="4.6.1", + org.eclipse.jgit.api;version="4.6.1"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff, @@ -21,47 +21,47 @@ Export-Package: org.eclipse.jgit.annotations;version="4.6.0", org.eclipse.jgit.submodule, org.eclipse.jgit.transport, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="4.6.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="4.6.0", - org.eclipse.jgit.blame;version="4.6.0"; + org.eclipse.jgit.api.errors;version="4.6.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors", + org.eclipse.jgit.attributes;version="4.6.1", + org.eclipse.jgit.blame;version="4.6.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff", - org.eclipse.jgit.diff;version="4.6.0"; + org.eclipse.jgit.diff;version="4.6.1"; 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="4.6.0"; + org.eclipse.jgit.dircache;version="4.6.1"; 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="4.6.0"; + org.eclipse.jgit.errors;version="4.6.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.internal.storage.pack, org.eclipse.jgit.transport, org.eclipse.jgit.dircache", - org.eclipse.jgit.events;version="4.6.0";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="4.6.0", - org.eclipse.jgit.gitrepo;version="4.6.0"; + org.eclipse.jgit.events;version="4.6.1";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.fnmatch;version="4.6.1", + org.eclipse.jgit.gitrepo;version="4.6.1"; 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="4.6.0";x-internal:=true, - org.eclipse.jgit.hooks;version="4.6.0";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.ignore;version="4.6.0", - org.eclipse.jgit.ignore.internal;version="4.6.0";x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="4.6.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.ketch;version="4.6.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.dfs;version="4.6.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.server,org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.storage.file;version="4.6.0"; + org.eclipse.jgit.gitrepo.internal;version="4.6.1";x-internal:=true, + org.eclipse.jgit.hooks;version="4.6.1";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.ignore;version="4.6.1", + org.eclipse.jgit.ignore.internal;version="4.6.1";x-friends:="org.eclipse.jgit.test", + org.eclipse.jgit.internal;version="4.6.1";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", + org.eclipse.jgit.internal.ketch;version="4.6.1";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.internal.storage.dfs;version="4.6.1";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.server,org.eclipse.jgit.http.test", + org.eclipse.jgit.internal.storage.file;version="4.6.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, @@ -69,9 +69,9 @@ Export-Package: org.eclipse.jgit.annotations;version="4.6.0", org.eclipse.jgit.lfs, org.eclipse.jgit.pgm, org.eclipse.jgit.pgm.test", - org.eclipse.jgit.internal.storage.pack;version="4.6.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftree;version="4.6.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.lib;version="4.6.0"; + org.eclipse.jgit.internal.storage.pack;version="4.6.1";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.internal.storage.reftree;version="4.6.1";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.lib;version="4.6.1"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util, @@ -81,32 +81,32 @@ Export-Package: org.eclipse.jgit.annotations;version="4.6.0", org.eclipse.jgit.treewalk, org.eclipse.jgit.transport, org.eclipse.jgit.submodule", - org.eclipse.jgit.merge;version="4.6.0"; + org.eclipse.jgit.merge;version="4.6.1"; 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="4.6.0", - org.eclipse.jgit.notes;version="4.6.0"; + org.eclipse.jgit.nls;version="4.6.1", + org.eclipse.jgit.notes;version="4.6.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="4.6.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="4.6.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="4.6.0"; + org.eclipse.jgit.patch;version="4.6.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff", + org.eclipse.jgit.revplot;version="4.6.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk", + org.eclipse.jgit.revwalk;version="4.6.1"; 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="4.6.0";uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.lib,org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="4.6.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="4.6.0";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="4.6.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk.filter,org.eclipse.jgit.treewalk", - org.eclipse.jgit.transport;version="4.6.0"; + org.eclipse.jgit.revwalk.filter;version="4.6.1";uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.lib,org.eclipse.jgit.util", + org.eclipse.jgit.storage.file;version="4.6.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util", + org.eclipse.jgit.storage.pack;version="4.6.1";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.submodule;version="4.6.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk.filter,org.eclipse.jgit.treewalk", + org.eclipse.jgit.transport;version="4.6.1"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.revwalk, org.eclipse.jgit.internal.storage.pack, @@ -118,23 +118,23 @@ Export-Package: org.eclipse.jgit.annotations;version="4.6.0", org.eclipse.jgit.transport.http, org.eclipse.jgit.errors, org.eclipse.jgit.storage.pack", - org.eclipse.jgit.transport.http;version="4.6.0";uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="4.6.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport", - org.eclipse.jgit.treewalk;version="4.6.0"; + org.eclipse.jgit.transport.http;version="4.6.1";uses:="javax.net.ssl", + org.eclipse.jgit.transport.resolver;version="4.6.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport", + org.eclipse.jgit.treewalk;version="4.6.1"; 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="4.6.0";uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="4.6.0"; + org.eclipse.jgit.treewalk.filter;version="4.6.1";uses:="org.eclipse.jgit.treewalk", + org.eclipse.jgit.util;version="4.6.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.transport.http, org.eclipse.jgit.storage.file, org.ietf.jgss", - org.eclipse.jgit.util.io;version="4.6.0", - org.eclipse.jgit.util.time;version="4.6.0" + org.eclipse.jgit.util.io;version="4.6.1", + org.eclipse.jgit.util.time;version="4.6.1" 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 6ff4c5f758..e310d9b280 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: 4.6.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="4.6.0.qualifier";roots="." +Bundle-Version: 4.6.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="4.6.1.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 86f3e1f533..1aee726dd3 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>4.6.0-SNAPSHOT</version> + <version>4.6.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit</artifactId> @@ -51,7 +51,7 @@ <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> <packaging>pom</packaging> - <version>4.6.0-SNAPSHOT</version> + <version>4.6.1-SNAPSHOT</version> <name>JGit - Parent</name> <url>${jgit-url}</url> @@ -205,8 +205,8 @@ <httpclient-version>4.3.6</httpclient-version> <slf4j-version>1.7.2</slf4j-version> <log4j-version>1.2.15</log4j-version> - <maven-javadoc-plugin-version>2.10.3</maven-javadoc-plugin-version> - <tycho-extras-version>0.25.0</tycho-extras-version> + <maven-javadoc-plugin-version>2.10.4</maven-javadoc-plugin-version> + <tycho-extras-version>0.26.0</tycho-extras-version> <gson-version>2.2.4</gson-version> <!-- Properties to enable jacoco code coverage analysis --> @@ -239,7 +239,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.6</version> + <version>3.0.2</version> <configuration> <archive> <manifestEntries> @@ -333,7 +333,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> + <version>3.0.0</version> </plugin> <plugin> @@ -361,13 +361,13 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.10</version> + <version>1.12</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> - <version>3.0.3</version> + <version>3.0.4</version> <configuration> <findbugsXmlOutput>true</findbugsXmlOutput> <failOnError>false</failOnError> @@ -384,7 +384,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> - <version>3.6</version> + <version>3.7</version> <configuration> <sourceEncoding>utf-8</sourceEncoding> <minimumTokens>100</minimumTokens> @@ -419,12 +419,12 @@ <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.6.201602180812</version> + <version>0.7.8</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.5.1</version> + <version>3.6</version> <dependencies> <dependency><!-- add support for ssh/scp --> <groupId>org.apache.maven.wagon</groupId> |