diff options
58 files changed, 304 insertions, 283 deletions
diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000000..8701b19192 --- /dev/null +++ b/.mailmap @@ -0,0 +1,5 @@ +Shawn Pearce <spearce@spearce.org> Shawn O. Pearce <sop@google.com> +Shawn Pearce <spearce@spearce.org> Shawn Pearce <sop@google.com> +Shawn Pearce <spearce@spearce.org> Shawn O. Pearce <spearce@spearce.org> +Saša Živkov <sasa.zivkov@sap.com> Sasa Zivkov <sasa.zivkov@sap.com> +Saša Živkov <sasa.zivkov@sap.com> Saša Živkov <zivkov@gmail.com> diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index fd0a5a36b9..84e64ab287 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: 3.6.2.qualifier +Bundle-Version: 3.7.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[3.6.2,3.7.0)", - org.eclipse.jgit.internal.storage.file;version="[3.6.2,3.7.0)", - org.eclipse.jgit.junit;version="[3.6.2,3.7.0)", - org.eclipse.jgit.lib;version="[3.6.2,3.7.0)", - org.eclipse.jgit.util;version="[3.6.2,3.7.0)", + org.eclipse.jgit.ant.tasks;version="[3.7.0,3.8.0)", + org.eclipse.jgit.internal.storage.file;version="[3.7.0,3.8.0)", + org.eclipse.jgit.junit;version="[3.7.0,3.8.0)", + org.eclipse.jgit.lib;version="[3.7.0,3.8.0)", + org.eclipse.jgit.util;version="[3.7.0,3.8.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 35d072166d..ecf8650282 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>3.6.2-SNAPSHOT</version> + <version>3.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 51fdf13572..ba5d1295d7 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: 3.6.2.qualifier +Bundle-Version: 3.7.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[3.6.2,3.7.0)" + org.eclipse.jgit.storage.file;version="[3.7.0,3.8.0)" Bundle-Localization: plugin Bundle-Vendor: %Provider-Name -Export-Package: org.eclipse.jgit.ant.tasks;version="3.6.2"; +Export-Package: org.eclipse.jgit.ant.tasks;version="3.7.0"; 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 0f982496b6..326c9720bd 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>3.6.2-SNAPSHOT</version> + <version>3.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 0889446bc0..a9dd94a871 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: 3.6.2.qualifier +Bundle-Version: 3.7.0.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 @@ -12,13 +12,13 @@ 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="[3.6.2,3.7.0)", - org.eclipse.jgit.lib;version="[3.6.2,3.7.0)", - org.eclipse.jgit.nls;version="[3.6.2,3.7.0)", + org.eclipse.jgit.api;version="[3.7.0,3.8.0)", + org.eclipse.jgit.lib;version="[3.7.0,3.8.0)", + org.eclipse.jgit.nls;version="[3.7.0,3.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="3.6.2"; +Export-Package: org.eclipse.jgit.archive;version="3.7.0"; 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 774a13c75c..8de8575187 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: 3.6.2.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="3.6.2.qualifier";roots="." +Bundle-Version: 3.7.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="3.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index c2ddd44689..4c1edba733 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>3.6.2-SNAPSHOT</version> + <version>3.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.archive</artifactId> diff --git a/org.eclipse.jgit.console/META-INF/MANIFEST.MF b/org.eclipse.jgit.console/META-INF/MANIFEST.MF index 89a9b85538..0ebd5c4f7e 100644 --- a/org.eclipse.jgit.console/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.console/META-INF/MANIFEST.MF @@ -3,11 +3,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.console -Bundle-Version: 3.6.2.qualifier +Bundle-Version: 3.7.0.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Export-Package: org.eclipse.jgit.console;version="3.6.2" -Import-Package: org.eclipse.jgit.errors;version="[3.6.2,3.7.0)", - org.eclipse.jgit.nls;version="[3.6.2,3.7.0)", - org.eclipse.jgit.transport;version="[3.6.2,3.7.0)", - org.eclipse.jgit.util;version="[3.6.2,3.7.0)" +Export-Package: org.eclipse.jgit.console;version="3.7.0" +Import-Package: org.eclipse.jgit.errors;version="[3.7.0,3.8.0)", + org.eclipse.jgit.nls;version="[3.7.0,3.8.0)", + org.eclipse.jgit.transport;version="[3.7.0,3.8.0)", + org.eclipse.jgit.util;version="[3.7.0,3.8.0)" diff --git a/org.eclipse.jgit.console/pom.xml b/org.eclipse.jgit.console/pom.xml index a7dad597f3..e262faa8ab 100644 --- a/org.eclipse.jgit.console/pom.xml +++ b/org.eclipse.jgit.console/pom.xml @@ -52,7 +52,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>3.6.2-SNAPSHOT</version> + <version>3.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.console</artifactId> diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index b1b176f2ea..d6e685741e 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: 3.6.2.qualifier +Bundle-Version: 3.7.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Localization: plugin Bundle-Vendor: %Provider-Name @@ -18,10 +18,10 @@ Import-Package: org.apache.http;version="[4.1.0,5.0.0)", org.apache.http.impl.client;version="[4.1.0,5.0.0)", org.apache.http.impl.client.cache;version="[4.1.0,5.0.0)", org.apache.http.params;version="[4.1.0,5.0.0)", - org.eclipse.jgit.nls;version="[3.6.2,3.7.0)", - org.eclipse.jgit.transport.http;version="[3.6.2,3.7.0)", - org.eclipse.jgit.util;version="[3.6.2,3.7.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="3.6.2"; + org.eclipse.jgit.nls;version="[3.7.0,3.8.0)", + org.eclipse.jgit.transport.http;version="[3.7.0,3.8.0)", + org.eclipse.jgit.util;version="[3.7.0,3.8.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="3.7.0"; uses:="org.eclipse.jgit.transport.http, javax.net.ssl, org.apache.http.client, diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 331d3384dc..28c8e842a2 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>3.6.2-SNAPSHOT</version> + <version>3.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 9a8a86ad8b..aeb5b6f4a9 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: 3.6.2.qualifier +Bundle-Version: 3.7.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.http.server;version="3.6.2", - org.eclipse.jgit.http.server.glue;version="3.6.2"; +Export-Package: org.eclipse.jgit.http.server;version="3.7.0", + org.eclipse.jgit.http.server.glue;version="3.7.0"; uses:="javax.servlet,javax.servlet.http", - org.eclipse.jgit.http.server.resolver;version="3.6.2"; + org.eclipse.jgit.http.server.resolver;version="3.7.0"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, @@ -17,11 +17,11 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: javax.servlet;version="[2.5.0,3.0.0)", javax.servlet.http;version="[2.5.0,3.0.0)", - org.eclipse.jgit.errors;version="[3.6.2,3.7.0)", - org.eclipse.jgit.internal.storage.file;version="[3.6.2,3.7.0)", - org.eclipse.jgit.lib;version="[3.6.2,3.7.0)", - org.eclipse.jgit.nls;version="[3.6.2,3.7.0)", - org.eclipse.jgit.revwalk;version="[3.6.2,3.7.0)", - org.eclipse.jgit.transport;version="[3.6.2,3.7.0)", - org.eclipse.jgit.transport.resolver;version="[3.6.2,3.7.0)", - org.eclipse.jgit.util;version="[3.6.2,3.7.0)" + org.eclipse.jgit.errors;version="[3.7.0,3.8.0)", + org.eclipse.jgit.internal.storage.file;version="[3.7.0,3.8.0)", + org.eclipse.jgit.lib;version="[3.7.0,3.8.0)", + org.eclipse.jgit.nls;version="[3.7.0,3.8.0)", + org.eclipse.jgit.revwalk;version="[3.7.0,3.8.0)", + org.eclipse.jgit.transport;version="[3.7.0,3.8.0)", + org.eclipse.jgit.transport.resolver;version="[3.7.0,3.8.0)", + org.eclipse.jgit.util;version="[3.7.0,3.8.0)" diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index ce88340922..dd11cd5735 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>3.6.2-SNAPSHOT</version> + <version>3.7.0-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 02ee661280..0588e54f68 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: 3.6.2.qualifier +Bundle-Version: 3.7.0.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 @@ -22,23 +22,23 @@ Import-Package: javax.servlet;version="[2.5.0,3.0.0)", org.eclipse.jetty.util.log;version="[7.6.0,8.0.0)", org.eclipse.jetty.util.security;version="[7.6.0,8.0.0)", org.eclipse.jetty.util.thread;version="[7.6.0,8.0.0)", - org.eclipse.jgit.errors;version="[3.6.2,3.7.0)", - org.eclipse.jgit.http.server;version="[3.6.2,3.7.0)", - org.eclipse.jgit.http.server.glue;version="[3.6.2,3.7.0)", - org.eclipse.jgit.http.server.resolver;version="[3.6.2,3.7.0)", - org.eclipse.jgit.internal;version="[3.6.2,3.7.0)", - org.eclipse.jgit.internal.storage.file;version="[3.6.2,3.7.0)", - org.eclipse.jgit.junit;version="[3.6.2,3.7.0)", - org.eclipse.jgit.junit.http;version="[3.6.2,3.7.0)", - org.eclipse.jgit.lib;version="[3.6.2,3.7.0)", - org.eclipse.jgit.nls;version="[3.6.2,3.7.0)", - org.eclipse.jgit.revwalk;version="[3.6.2,3.7.0)", - org.eclipse.jgit.storage.file;version="[3.6.2,3.7.0)", - org.eclipse.jgit.transport;version="[3.6.2,3.7.0)", - org.eclipse.jgit.transport.http;version="[3.6.2,3.7.0)", - org.eclipse.jgit.transport.http.apache;version="[3.6.2,3.7.0)", - org.eclipse.jgit.transport.resolver;version="[3.6.2,3.7.0)", - org.eclipse.jgit.util;version="[3.6.2,3.7.0)", + org.eclipse.jgit.errors;version="[3.7.0,3.8.0)", + org.eclipse.jgit.http.server;version="[3.7.0,3.8.0)", + org.eclipse.jgit.http.server.glue;version="[3.7.0,3.8.0)", + org.eclipse.jgit.http.server.resolver;version="[3.7.0,3.8.0)", + org.eclipse.jgit.internal;version="[3.7.0,3.8.0)", + org.eclipse.jgit.internal.storage.file;version="[3.7.0,3.8.0)", + org.eclipse.jgit.junit;version="[3.7.0,3.8.0)", + org.eclipse.jgit.junit.http;version="[3.7.0,3.8.0)", + org.eclipse.jgit.lib;version="[3.7.0,3.8.0)", + org.eclipse.jgit.nls;version="[3.7.0,3.8.0)", + org.eclipse.jgit.revwalk;version="[3.7.0,3.8.0)", + org.eclipse.jgit.storage.file;version="[3.7.0,3.8.0)", + org.eclipse.jgit.transport;version="[3.7.0,3.8.0)", + org.eclipse.jgit.transport.http;version="[3.7.0,3.8.0)", + org.eclipse.jgit.transport.http.apache;version="[3.7.0,3.8.0)", + org.eclipse.jgit.transport.resolver;version="[3.7.0,3.8.0)", + org.eclipse.jgit.util;version="[3.7.0,3.8.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 b2fd07c805..819c9fa0d4 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>3.6.2-SNAPSHOT</version> + <version>3.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.http.test</artifactId> diff --git a/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF index caffc113f4..a6e8f67dd5 100644 --- a/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF @@ -2,17 +2,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.java7.test -Bundle-Version: 3.6.2.qualifier +Bundle-Version: 3.7.0.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Import-Package: org.eclipse.jgit.api;version="[3.6.2,3.7.0)", - org.eclipse.jgit.diff;version="[3.6.2,3.7.0)", - org.eclipse.jgit.dircache;version="[3.6.2,3.7.0)", - org.eclipse.jgit.internal.storage.file;version="3.6.2", - org.eclipse.jgit.junit;version="[3.6.2,3.7.0)", - org.eclipse.jgit.lib;version="[3.6.2,3.7.0)", - org.eclipse.jgit.revwalk;version="[3.6.2,3.7.0)", - org.eclipse.jgit.storage.file;version="[3.6.2,3.7.0)", - org.eclipse.jgit.treewalk;version="[3.6.2,3.7.0)", - org.eclipse.jgit.util;version="[3.6.2,3.7.0)", +Import-Package: org.eclipse.jgit.api;version="[3.7.0,3.8.0)", + org.eclipse.jgit.diff;version="[3.7.0,3.8.0)", + org.eclipse.jgit.dircache;version="[3.7.0,3.8.0)", + org.eclipse.jgit.internal.storage.file;version="3.7.0", + org.eclipse.jgit.junit;version="[3.7.0,3.8.0)", + org.eclipse.jgit.lib;version="[3.7.0,3.8.0)", + org.eclipse.jgit.revwalk;version="[3.7.0,3.8.0)", + org.eclipse.jgit.storage.file;version="[3.7.0,3.8.0)", + org.eclipse.jgit.treewalk;version="[3.7.0,3.8.0)", + org.eclipse.jgit.util;version="[3.7.0,3.8.0)", org.junit;version="[4.11.0,5.0.0)" diff --git a/org.eclipse.jgit.java7.test/pom.xml b/org.eclipse.jgit.java7.test/pom.xml index 2ec5caa0ef..5fb70a3fd6 100644 --- a/org.eclipse.jgit.java7.test/pom.xml +++ b/org.eclipse.jgit.java7.test/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>3.6.2-SNAPSHOT</version> + <version>3.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.java7.test</artifactId> diff --git a/org.eclipse.jgit.java7/META-INF/MANIFEST.MF b/org.eclipse.jgit.java7/META-INF/MANIFEST.MF index fcd0454fea..938e060919 100644 --- a/org.eclipse.jgit.java7/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.java7/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Fragment-Host: org.eclipse.jgit;bundle-version="3.1.1" Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.java7 -Bundle-Version: 3.6.2.qualifier +Bundle-Version: 3.7.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Export-Package: org.eclipse.jgit.util;version="3.6.2" +Export-Package: org.eclipse.jgit.util;version="3.7.0" diff --git a/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF index 120cdd01fa..58d294b929 100644 --- a/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.java7 - Sources Bundle-SymbolicName: org.eclipse.jgit.java7.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 3.6.2.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.java7;version="3.6.2.qualifier";roots="." +Bundle-Version: 3.7.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.java7;version="3.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.java7/pom.xml b/org.eclipse.jgit.java7/pom.xml index 059179a494..93c9b5c0b4 100644 --- a/org.eclipse.jgit.java7/pom.xml +++ b/org.eclipse.jgit.java7/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>3.6.2-SNAPSHOT</version> + <version>3.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.java7</artifactId> @@ -106,12 +106,12 @@ <id>translate-source-qualifier</id> <phase>generate-resources</phase> <configuration> - <tasks> + <target> <copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/> <replace file="${source-bundle-manifest}"> <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/> </replace> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 382f60e28a..5ede10778d 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: 3.6.2.qualifier +Bundle-Version: 3.7.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy @@ -20,13 +20,13 @@ Import-Package: javax.servlet;version="[2.5.0,3.0.0)", org.eclipse.jetty.util.component;version="[7.6.0,8.0.0)", org.eclipse.jetty.util.log;version="[7.6.0,8.0.0)", org.eclipse.jetty.util.security;version="[7.6.0,8.0.0)", - org.eclipse.jgit.errors;version="[3.6.2,3.7.0)", - org.eclipse.jgit.http.server;version="[3.6.2,3.7.0)", - org.eclipse.jgit.internal.storage.file;version="[3.6.2,3.7.0)", - org.eclipse.jgit.junit;version="[3.6.2,3.7.0)", - org.eclipse.jgit.lib;version="[3.6.2,3.7.0)", - org.eclipse.jgit.revwalk;version="[3.6.2,3.7.0)", - org.eclipse.jgit.transport;version="[3.6.2,3.7.0)", - org.eclipse.jgit.transport.resolver;version="[3.6.2,3.7.0)", + org.eclipse.jgit.errors;version="[3.7.0,3.8.0)", + org.eclipse.jgit.http.server;version="[3.7.0,3.8.0)", + org.eclipse.jgit.internal.storage.file;version="[3.7.0,3.8.0)", + org.eclipse.jgit.junit;version="[3.7.0,3.8.0)", + org.eclipse.jgit.lib;version="[3.7.0,3.8.0)", + org.eclipse.jgit.revwalk;version="[3.7.0,3.8.0)", + org.eclipse.jgit.transport;version="[3.7.0,3.8.0)", + org.eclipse.jgit.transport.resolver;version="[3.7.0,3.8.0)", org.junit;version="[4.0.0,5.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="3.6.2" +Export-Package: org.eclipse.jgit.junit.http;version="3.7.0" diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 7177e40a3b..a082e50d53 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>3.6.2-SNAPSHOT</version> + <version>3.7.0-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 3fff2c3ffe..47e03420d0 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -2,23 +2,23 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 3.6.2.qualifier +Bundle-Version: 3.7.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.eclipse.jgit.api;version="[3.6.2,3.7.0)", - org.eclipse.jgit.api.errors;version="[3.6.2,3.7.0)", - org.eclipse.jgit.dircache;version="[3.6.2,3.7.0)", - org.eclipse.jgit.errors;version="[3.6.2,3.7.0)", - org.eclipse.jgit.internal.storage.file;version="[3.6.2,3.7.0)", - org.eclipse.jgit.internal.storage.pack;version="[3.6.2,3.7.0)", - org.eclipse.jgit.lib;version="[3.6.2,3.7.0)", - org.eclipse.jgit.revwalk;version="[3.6.2,3.7.0)", - org.eclipse.jgit.storage.file;version="[3.6.2,3.7.0)", - org.eclipse.jgit.treewalk;version="[3.6.2,3.7.0)", - org.eclipse.jgit.treewalk.filter;version="[3.6.2,3.7.0)", - org.eclipse.jgit.util;version="[3.6.2,3.7.0)", - org.eclipse.jgit.util.io;version="[3.6.2,3.7.0)", +Import-Package: org.eclipse.jgit.api;version="[3.7.0,3.8.0)", + org.eclipse.jgit.api.errors;version="[3.7.0,3.8.0)", + org.eclipse.jgit.dircache;version="[3.7.0,3.8.0)", + org.eclipse.jgit.errors;version="[3.7.0,3.8.0)", + org.eclipse.jgit.internal.storage.file;version="[3.7.0,3.8.0)", + org.eclipse.jgit.internal.storage.pack;version="[3.7.0,3.8.0)", + org.eclipse.jgit.lib;version="[3.7.0,3.8.0)", + org.eclipse.jgit.revwalk;version="[3.7.0,3.8.0)", + org.eclipse.jgit.storage.file;version="[3.7.0,3.8.0)", + org.eclipse.jgit.treewalk;version="[3.7.0,3.8.0)", + org.eclipse.jgit.treewalk.filter;version="[3.7.0,3.8.0)", + org.eclipse.jgit.util;version="[3.7.0,3.8.0)", + org.eclipse.jgit.util.io;version="[3.7.0,3.8.0)", org.junit;version="[4.0.0,5.0.0)" -Export-Package: org.eclipse.jgit.junit;version="3.6.2" +Export-Package: org.eclipse.jgit.junit;version="3.7.0" diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 5b1096faa8..39a9e60497 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>3.6.2-SNAPSHOT</version> + <version>3.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.junit</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 ab7f3a942e..10ea2c9e56 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="3.6.2.qualifier" + version="3.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 a4e2ad1378..253342255d 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>3.6.2-SNAPSHOT</version> + <version>3.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 45c51f2fbf..71ad4ffef1 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="3.6.2.qualifier" + version="3.7.0.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 54bc122e1a..e7dd844a2d 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>3.6.2-SNAPSHOT</version> + <version>3.7.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/feature.xml index 5c84a1e043..49ddae7652 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit.java7" label="%featureName" - version="3.6.2.qualifier" + version="3.7.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml index 0734ef7c09..ffbbb1427c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>3.6.2-SNAPSHOT</version> + <version>3.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 32a22286e6..6446a2c82b 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="3.6.2.qualifier" + version="3.7.0.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 98c12e545a..ce3355dbc5 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>3.6.2-SNAPSHOT</version> + <version>3.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 cd76895eb3..3296f502ac 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="3.6.2.qualifier" + version="3.7.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -27,7 +27,7 @@ version="0.0.0"/> <requires> - <import feature="org.eclipse.jgit" version="3.6.0" match="equivalent"/> + <import feature="org.eclipse.jgit" version="3.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 b78745c27a..b8ee9ac0d8 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>3.6.2-SNAPSHOT</version> + <version>3.7.0-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 45d058cbd8..3a52006ca9 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="3.6.2.qualifier" + version="3.7.0.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 dea2dfda5b..c3b8150f45 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>3.6.2-SNAPSHOT</version> + <version>3.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 466a538fdc..96d74e5b35 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>3.6.2-SNAPSHOT</version> + <version>3.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 b5cd124b9c..b1eb163dfd 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="3.6.2.qualifier" + version="3.7.0.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 2ada7e17e4..257495510c 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>3.6.2-SNAPSHOT</version> + <version>3.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 5441d6e54a..46dcb3ff9f 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: 3.6.2.qualifier +Bundle-Version: 3.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 466ff71124..f303f08bf9 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>3.6.2-SNAPSHOT</version> + <version>3.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 ca43c46618..66adffa9d2 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>3.6.2-SNAPSHOT</version> + <version>3.7.0-SNAPSHOT</version> <packaging>pom</packaging> <name>JGit Tycho Parent</name> <properties> - <tycho-version>0.21.0</tycho-version> + <tycho-version>0.22.0</tycho-version> <tycho-extras-version>${tycho-version}</tycho-extras-version> </properties> diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index f7a80d40e2..1289f98ae0 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -2,27 +2,27 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 3.6.2.qualifier +Bundle-Version: 3.7.0.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.eclipse.jgit.api;version="[3.6.2,3.7.0)", - org.eclipse.jgit.api.errors;version="[3.6.2,3.7.0)", - org.eclipse.jgit.diff;version="[3.6.2,3.7.0)", - org.eclipse.jgit.dircache;version="[3.6.2,3.7.0)", - org.eclipse.jgit.junit;version="[3.6.2,3.7.0)", - org.eclipse.jgit.lib;version="[3.6.2,3.7.0)", - org.eclipse.jgit.merge;version="[3.6.2,3.7.0)", - org.eclipse.jgit.pgm;version="[3.6.2,3.7.0)", - org.eclipse.jgit.pgm.internal;version="[3.6.2,3.7.0)", - org.eclipse.jgit.pgm.opt;version="[3.6.2,3.7.0)", - org.eclipse.jgit.revwalk;version="[3.6.2,3.7.0)", - org.eclipse.jgit.storage.file;version="[3.6.2,3.7.0)", - org.eclipse.jgit.transport;version="[3.6.2,3.7.0)", - org.eclipse.jgit.treewalk;version="[3.6.2,3.7.0)", - org.eclipse.jgit.util;version="[3.6.2,3.7.0)", - org.eclipse.jgit.util.io;version="[3.6.2,3.7.0)", +Import-Package: org.eclipse.jgit.api;version="[3.7.0,3.8.0)", + org.eclipse.jgit.api.errors;version="[3.7.0,3.8.0)", + org.eclipse.jgit.diff;version="[3.7.0,3.8.0)", + org.eclipse.jgit.dircache;version="[3.7.0,3.8.0)", + org.eclipse.jgit.junit;version="[3.7.0,3.8.0)", + org.eclipse.jgit.lib;version="[3.7.0,3.8.0)", + org.eclipse.jgit.merge;version="[3.7.0,3.8.0)", + org.eclipse.jgit.pgm;version="[3.7.0,3.8.0)", + org.eclipse.jgit.pgm.internal;version="[3.7.0,3.8.0)", + org.eclipse.jgit.pgm.opt;version="[3.7.0,3.8.0)", + org.eclipse.jgit.revwalk;version="[3.7.0,3.8.0)", + org.eclipse.jgit.storage.file;version="[3.7.0,3.8.0)", + org.eclipse.jgit.transport;version="[3.7.0,3.8.0)", + org.eclipse.jgit.treewalk;version="[3.7.0,3.8.0)", + org.eclipse.jgit.util;version="[3.7.0,3.8.0)", + org.eclipse.jgit.util.io;version="[3.7.0,3.8.0)", org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", org.junit;version="[4.4.0,5.0.0)", org.kohsuke.args4j;version="[2.0.12,2.1.0)" diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 8f7de46156..2a87690fb6 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>3.6.2-SNAPSHOT</version> + <version>3.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 d605f3c02c..a8ff1b8840 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -2,43 +2,43 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 3.6.2.qualifier +Bundle-Version: 3.7.0.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.apache.commons.compress.archivers;version="[1.3,2.0)", org.apache.commons.compress.archivers.tar;version="[1.3,2.0)", org.apache.commons.compress.archivers.zip;version="[1.3,2.0)", - org.eclipse.jgit.api;version="[3.6.2,3.7.0)", - org.eclipse.jgit.api.errors;version="[3.6.2,3.7.0)", - org.eclipse.jgit.archive;version="[3.6.2,3.7.0)", - org.eclipse.jgit.awtui;version="[3.6.2,3.7.0)", - org.eclipse.jgit.blame;version="[3.6.2,3.7.0)", - org.eclipse.jgit.diff;version="[3.6.2,3.7.0)", - org.eclipse.jgit.dircache;version="[3.6.2,3.7.0)", - org.eclipse.jgit.errors;version="[3.6.2,3.7.0)", - org.eclipse.jgit.gitrepo;version="[3.6.2,3.7.0)", - org.eclipse.jgit.internal.storage.file;version="[3.6.2,3.7.0)", - org.eclipse.jgit.internal.storage.pack;version="[3.6.2,3.7.0)", - org.eclipse.jgit.lib;version="[3.6.2,3.7.0)", - org.eclipse.jgit.merge;version="3.6.2", - org.eclipse.jgit.nls;version="[3.6.2,3.7.0)", - org.eclipse.jgit.notes;version="[3.6.2,3.7.0)", - org.eclipse.jgit.revplot;version="[3.6.2,3.7.0)", - org.eclipse.jgit.revwalk;version="[3.6.2,3.7.0)", - org.eclipse.jgit.revwalk.filter;version="[3.6.2,3.7.0)", - org.eclipse.jgit.storage.file;version="[3.6.2,3.7.0)", - org.eclipse.jgit.storage.pack;version="[3.6.2,3.7.0)", - org.eclipse.jgit.transport;version="[3.6.2,3.7.0)", - org.eclipse.jgit.transport.resolver;version="[3.6.2,3.7.0)", - org.eclipse.jgit.treewalk;version="[3.6.2,3.7.0)", - org.eclipse.jgit.treewalk.filter;version="[3.6.2,3.7.0)", - org.eclipse.jgit.util;version="[3.6.2,3.7.0)", - org.eclipse.jgit.util.io;version="[3.6.2,3.7.0)", + org.eclipse.jgit.api;version="[3.7.0,3.8.0)", + org.eclipse.jgit.api.errors;version="[3.7.0,3.8.0)", + org.eclipse.jgit.archive;version="[3.7.0,3.8.0)", + org.eclipse.jgit.awtui;version="[3.7.0,3.8.0)", + org.eclipse.jgit.blame;version="[3.7.0,3.8.0)", + org.eclipse.jgit.diff;version="[3.7.0,3.8.0)", + org.eclipse.jgit.dircache;version="[3.7.0,3.8.0)", + org.eclipse.jgit.errors;version="[3.7.0,3.8.0)", + org.eclipse.jgit.gitrepo;version="[3.7.0,3.8.0)", + org.eclipse.jgit.internal.storage.file;version="[3.7.0,3.8.0)", + org.eclipse.jgit.internal.storage.pack;version="[3.7.0,3.8.0)", + org.eclipse.jgit.lib;version="[3.7.0,3.8.0)", + org.eclipse.jgit.merge;version="3.7.0", + org.eclipse.jgit.nls;version="[3.7.0,3.8.0)", + org.eclipse.jgit.notes;version="[3.7.0,3.8.0)", + org.eclipse.jgit.revplot;version="[3.7.0,3.8.0)", + org.eclipse.jgit.revwalk;version="[3.7.0,3.8.0)", + org.eclipse.jgit.revwalk.filter;version="[3.7.0,3.8.0)", + org.eclipse.jgit.storage.file;version="[3.7.0,3.8.0)", + org.eclipse.jgit.storage.pack;version="[3.7.0,3.8.0)", + org.eclipse.jgit.transport;version="[3.7.0,3.8.0)", + org.eclipse.jgit.transport.resolver;version="[3.7.0,3.8.0)", + org.eclipse.jgit.treewalk;version="[3.7.0,3.8.0)", + org.eclipse.jgit.treewalk.filter;version="[3.7.0,3.8.0)", + org.eclipse.jgit.util;version="[3.7.0,3.8.0)", + org.eclipse.jgit.util.io;version="[3.7.0,3.8.0)", org.kohsuke.args4j;version="[2.0.12,2.1.0)", org.kohsuke.args4j.spi;version="[2.0.12,2.1.0)" Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.jgit.pgm;version="3.6.2"; +Export-Package: org.eclipse.jgit.pgm;version="3.7.0"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.pgm.opt, @@ -49,10 +49,10 @@ Export-Package: org.eclipse.jgit.pgm;version="3.6.2"; org.eclipse.jgit.treewalk, javax.swing, org.eclipse.jgit.transport", - org.eclipse.jgit.pgm.debug;version="3.6.2"; + org.eclipse.jgit.pgm.debug;version="3.7.0"; uses:="org.eclipse.jgit.pgm", - org.eclipse.jgit.pgm.internal;version="3.6.2";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="3.6.2"; + org.eclipse.jgit.pgm.internal;version="3.7.0";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", + org.eclipse.jgit.pgm.opt;version="3.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 609cc012f2..d1ba9ca4fb 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: 3.6.2.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="3.6.2.qualifier";roots="." +Bundle-Version: 3.7.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="3.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 19c1bae577..53dc7744aa 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>3.6.2-SNAPSHOT</version> + <version>3.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.pgm</artifactId> @@ -205,13 +205,13 @@ <id>create_jgit</id> <phase>package</phase> <configuration> - <tasks> + <target> <concat destfile="${basedir}/target/jgit" force="yes" binary="true"> <fileset file="${basedir}/jgit.sh" /> <fileset file="${basedir}/target/jgit-cli.jar" /> </concat> <chmod file="${basedir}/target/jgit" perm="a+x"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -221,12 +221,12 @@ <id>translate-source-qualifier</id> <phase>generate-resources</phase> <configuration> - <tasks> + <target> <copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/> <replace file="${source-bundle-manifest}"> <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/> </replace> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index e5e3b1be87..6ca3df17a3 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -2,49 +2,49 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 3.6.2.qualifier +Bundle-Version: 3.7.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: com.googlecode.javaewah;version="[0.7.9,0.8.0)", - org.eclipse.jgit.api;version="[3.6.2,3.7.0)", - org.eclipse.jgit.api.errors;version="[3.6.2,3.7.0)", - org.eclipse.jgit.awtui;version="[3.6.2,3.7.0)", - org.eclipse.jgit.blame;version="[3.6.2,3.7.0)", - org.eclipse.jgit.console;version="[3.6.2,3.7.0)", - org.eclipse.jgit.diff;version="[3.6.2,3.7.0)", - org.eclipse.jgit.dircache;version="[3.6.2,3.7.0)", - org.eclipse.jgit.errors;version="[3.6.2,3.7.0)", - org.eclipse.jgit.events;version="[3.6.2,3.7.0)", - org.eclipse.jgit.fnmatch;version="[3.6.2,3.7.0)", - org.eclipse.jgit.gitrepo;version="[3.6.2,3.7.0)", - org.eclipse.jgit.ignore;version="[3.6.2,3.7.0)", - org.eclipse.jgit.ignore.internal;version="[3.6.2,3.7.0)", - org.eclipse.jgit.internal;version="[3.6.2,3.7.0)", - org.eclipse.jgit.internal.storage.dfs;version="[3.6.2,3.7.0)", - org.eclipse.jgit.internal.storage.file;version="[3.6.2,3.7.0)", - org.eclipse.jgit.internal.storage.pack;version="[3.6.2,3.7.0)", - org.eclipse.jgit.junit;version="[3.6.2,3.7.0)", - org.eclipse.jgit.lib;version="[3.6.2,3.7.0)", - org.eclipse.jgit.merge;version="[3.6.2,3.7.0)", - org.eclipse.jgit.nls;version="[3.6.2,3.7.0)", - org.eclipse.jgit.notes;version="[3.6.2,3.7.0)", - org.eclipse.jgit.patch;version="[3.6.2,3.7.0)", - org.eclipse.jgit.pgm;version="[3.6.2,3.7.0)", - org.eclipse.jgit.pgm.internal;version="[3.6.2,3.7.0)", - org.eclipse.jgit.revplot;version="[3.6.2,3.7.0)", - org.eclipse.jgit.revwalk;version="[3.6.2,3.7.0)", - org.eclipse.jgit.revwalk.filter;version="[3.6.2,3.7.0)", - org.eclipse.jgit.storage.file;version="[3.6.2,3.7.0)", - org.eclipse.jgit.storage.pack;version="[3.6.2,3.7.0)", - org.eclipse.jgit.submodule;version="[3.6.2,3.7.0)", - org.eclipse.jgit.transport;version="[3.6.2,3.7.0)", - org.eclipse.jgit.transport.http;version="[3.6.2,3.7.0)", - org.eclipse.jgit.treewalk;version="[3.6.2,3.7.0)", - org.eclipse.jgit.treewalk.filter;version="[3.6.2,3.7.0)", - org.eclipse.jgit.util;version="[3.6.2,3.7.0)", - org.eclipse.jgit.util.io;version="[3.6.2,3.7.0)", + org.eclipse.jgit.api;version="[3.7.0,3.8.0)", + org.eclipse.jgit.api.errors;version="[3.7.0,3.8.0)", + org.eclipse.jgit.awtui;version="[3.7.0,3.8.0)", + org.eclipse.jgit.blame;version="[3.7.0,3.8.0)", + org.eclipse.jgit.console;version="[3.7.0,3.8.0)", + org.eclipse.jgit.diff;version="[3.7.0,3.8.0)", + org.eclipse.jgit.dircache;version="[3.7.0,3.8.0)", + org.eclipse.jgit.errors;version="[3.7.0,3.8.0)", + org.eclipse.jgit.events;version="[3.7.0,3.8.0)", + org.eclipse.jgit.fnmatch;version="[3.7.0,3.8.0)", + org.eclipse.jgit.gitrepo;version="[3.7.0,3.8.0)", + org.eclipse.jgit.ignore;version="[3.7.0,3.8.0)", + org.eclipse.jgit.ignore.internal;version="[3.7.0,3.8.0)", + org.eclipse.jgit.internal;version="[3.7.0,3.8.0)", + org.eclipse.jgit.internal.storage.dfs;version="[3.7.0,3.8.0)", + org.eclipse.jgit.internal.storage.file;version="[3.7.0,3.8.0)", + org.eclipse.jgit.internal.storage.pack;version="[3.7.0,3.8.0)", + org.eclipse.jgit.junit;version="[3.7.0,3.8.0)", + org.eclipse.jgit.lib;version="[3.7.0,3.8.0)", + org.eclipse.jgit.merge;version="[3.7.0,3.8.0)", + org.eclipse.jgit.nls;version="[3.7.0,3.8.0)", + org.eclipse.jgit.notes;version="[3.7.0,3.8.0)", + org.eclipse.jgit.patch;version="[3.7.0,3.8.0)", + org.eclipse.jgit.pgm;version="[3.7.0,3.8.0)", + org.eclipse.jgit.pgm.internal;version="[3.7.0,3.8.0)", + org.eclipse.jgit.revplot;version="[3.7.0,3.8.0)", + org.eclipse.jgit.revwalk;version="[3.7.0,3.8.0)", + org.eclipse.jgit.revwalk.filter;version="[3.7.0,3.8.0)", + org.eclipse.jgit.storage.file;version="[3.7.0,3.8.0)", + org.eclipse.jgit.storage.pack;version="[3.7.0,3.8.0)", + org.eclipse.jgit.submodule;version="[3.7.0,3.8.0)", + org.eclipse.jgit.transport;version="[3.7.0,3.8.0)", + org.eclipse.jgit.transport.http;version="[3.7.0,3.8.0)", + org.eclipse.jgit.treewalk;version="[3.7.0,3.8.0)", + org.eclipse.jgit.treewalk.filter;version="[3.7.0,3.8.0)", + org.eclipse.jgit.util;version="[3.7.0,3.8.0)", + org.eclipse.jgit.util.io;version="[3.7.0,3.8.0)", org.hamcrest;version="[1.1.0,2.0.0)", org.junit;version="[4.4.0,5.0.0)", org.junit.experimental.theories;version="[4.4.0,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 904e4104c1..1d33337939 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>3.6.2-SNAPSHOT</version> + <version>3.7.0-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 565dda59eb..ff33691ebc 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: 3.6.2.qualifier +Bundle-Version: 3.7.0.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.jgit.awtui;version="3.6.2" -Import-Package: org.eclipse.jgit.errors;version="[3.6.2,3.7.0)", - org.eclipse.jgit.lib;version="[3.6.2,3.7.0)", - org.eclipse.jgit.nls;version="[3.6.2,3.7.0)", - org.eclipse.jgit.revplot;version="[3.6.2,3.7.0)", - org.eclipse.jgit.revwalk;version="[3.6.2,3.7.0)", - org.eclipse.jgit.transport;version="[3.6.2,3.7.0)", - org.eclipse.jgit.util;version="[3.6.2,3.7.0)" +Export-Package: org.eclipse.jgit.awtui;version="3.7.0" +Import-Package: org.eclipse.jgit.errors;version="[3.7.0,3.8.0)", + org.eclipse.jgit.lib;version="[3.7.0,3.8.0)", + org.eclipse.jgit.nls;version="[3.7.0,3.8.0)", + org.eclipse.jgit.revplot;version="[3.7.0,3.8.0)", + org.eclipse.jgit.revwalk;version="[3.7.0,3.8.0)", + org.eclipse.jgit.transport;version="[3.7.0,3.8.0)", + org.eclipse.jgit.util;version="[3.7.0,3.8.0)" diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index e3b3b3998a..a808eb42b1 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>3.6.2-SNAPSHOT</version> + <version>3.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ui</artifactId> diff --git a/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/AWTPlotRenderer.java b/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/AWTPlotRenderer.java index c1168f17f3..632114faac 100644 --- a/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/AWTPlotRenderer.java +++ b/org.eclipse.jgit.ui/src/org/eclipse/jgit/awtui/AWTPlotRenderer.java @@ -170,9 +170,9 @@ final class AWTPlotRenderer extends AbstractPlotRenderer<SwingLane, Color> } if (ref.getPeeledObjectId() != null) { float[] colorComponents = g.getBackground().getRGBColorComponents(null); - colorComponents[0] *= 0.9; - colorComponents[1] *= 0.9; - colorComponents[2] *= 0.9; + colorComponents[0] *= 0.9f; + colorComponents[1] *= 0.9f; + colorComponents[2] *= 0.9f; g.setBackground(new Color(colorComponents[0],colorComponents[1],colorComponents[2])); } if (txt.length() > 12) diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 45f7b4d7cf..ae1136a361 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 3.6.2.qualifier +Bundle-Version: 3.7.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.api;version="3.6.2"; +Export-Package: org.eclipse.jgit.api;version="3.7.0"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff, @@ -18,50 +18,50 @@ Export-Package: org.eclipse.jgit.api;version="3.6.2"; org.eclipse.jgit.blame, org.eclipse.jgit.transport, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="3.6.2"; + org.eclipse.jgit.api.errors;version="3.7.0"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors", - org.eclipse.jgit.blame;version="3.6.2"; + org.eclipse.jgit.blame;version="3.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="3.6.2"; + org.eclipse.jgit.diff;version="3.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="3.6.2"; + org.eclipse.jgit.dircache;version="3.7.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.util, org.eclipse.jgit.events", - org.eclipse.jgit.errors;version="3.6.2"; + org.eclipse.jgit.errors;version="3.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="3.6.2"; + org.eclipse.jgit.events;version="3.7.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="3.6.2", - org.eclipse.jgit.gitrepo;version="3.6.2"; + org.eclipse.jgit.fnmatch;version="3.7.0", + org.eclipse.jgit.gitrepo;version="3.7.0"; uses:="org.eclipse.jgit.api, org.eclipse.jgit.lib", - org.eclipse.jgit.gitrepo.internal;version="3.6.2";x-internal:=true, - org.eclipse.jgit.ignore;version="3.6.2", - org.eclipse.jgit.ignore.internal;version="3.6.2";x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="3.6.2";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.storage.dfs;version="3.6.2";x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.file;version="3.6.2"; + org.eclipse.jgit.gitrepo.internal;version="3.7.0";x-internal:=true, + org.eclipse.jgit.ignore;version="3.7.0", + org.eclipse.jgit.ignore.internal;version="3.7.0";x-friends:="org.eclipse.jgit.test", + org.eclipse.jgit.internal;version="3.7.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", + org.eclipse.jgit.internal.storage.dfs;version="3.7.0";x-friends:="org.eclipse.jgit.test", + org.eclipse.jgit.internal.storage.file;version="3.7.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, org.eclipse.jgit.http.server, org.eclipse.jgit.java7.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.pack;version="3.6.2";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.lib;version="3.6.2"; + org.eclipse.jgit.internal.storage.pack;version="3.7.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.lib;version="3.7.0"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util, @@ -70,37 +70,37 @@ Export-Package: org.eclipse.jgit.api;version="3.6.2"; org.eclipse.jgit.internal.storage.file, org.eclipse.jgit.treewalk, org.eclipse.jgit.transport", - org.eclipse.jgit.merge;version="3.6.2"; + org.eclipse.jgit.merge;version="3.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.nls;version="3.6.2", - org.eclipse.jgit.notes;version="3.6.2"; + org.eclipse.jgit.nls;version="3.7.0", + org.eclipse.jgit.notes;version="3.7.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="3.6.2"; + org.eclipse.jgit.patch;version="3.7.0"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="3.6.2"; + org.eclipse.jgit.revplot;version="3.7.0"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="3.6.2"; + org.eclipse.jgit.revwalk;version="3.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="3.6.2"; + org.eclipse.jgit.revwalk.filter;version="3.7.0"; uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="3.6.2"; + org.eclipse.jgit.storage.file;version="3.7.0"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="3.6.2"; + org.eclipse.jgit.storage.pack;version="3.7.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="3.6.2"; + org.eclipse.jgit.submodule;version="3.7.0"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk,org.eclipse.jgit.treewalk.filter", - org.eclipse.jgit.transport;version="3.6.2"; + org.eclipse.jgit.transport;version="3.7.0"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.revwalk, org.eclipse.jgit.internal.storage.pack, @@ -112,21 +112,21 @@ Export-Package: org.eclipse.jgit.api;version="3.6.2"; org.eclipse.jgit.transport.http, org.eclipse.jgit.errors, org.eclipse.jgit.storage.pack", - org.eclipse.jgit.transport.http;version="3.6.2"; + org.eclipse.jgit.transport.http;version="3.7.0"; uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="3.6.2"; + org.eclipse.jgit.transport.resolver;version="3.7.0"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport", - org.eclipse.jgit.treewalk;version="3.6.2"; + org.eclipse.jgit.treewalk;version="3.7.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util, org.eclipse.jgit.dircache", - org.eclipse.jgit.treewalk.filter;version="3.6.2"; + org.eclipse.jgit.treewalk.filter;version="3.7.0"; uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="3.6.2"; + org.eclipse.jgit.util;version="3.7.0"; uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport.http,org.eclipse.jgit.storage.file", - org.eclipse.jgit.util.io;version="3.6.2" + org.eclipse.jgit.util.io;version="3.7.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: com.jcraft.jsch;bundle-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 9986f9a97b..ddb1e57d56 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: 3.6.2.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="3.6.2.qualifier";roots="." +Bundle-Version: 3.7.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="3.7.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index c77c24eaf1..36a579ec22 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>3.6.2-SNAPSHOT</version> + <version>3.7.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit</artifactId> @@ -111,12 +111,12 @@ <id>translate-source-qualifier</id> <phase>generate-resources</phase> <configuration> - <tasks> + <target> <copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/> <replace file="${source-bundle-manifest}"> <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/> </replace> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java index 02e2cb47d1..e3f1e53dc2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java @@ -44,6 +44,10 @@ package org.eclipse.jgit.internal.storage.file; import java.io.File; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Locale; import org.eclipse.jgit.util.FS; @@ -143,7 +147,7 @@ public class FileSnapshot { /** * Check if the path may have been modified since the snapshot was saved. - * + * * @param path * the path the snapshot describes. * @return true if the path needs to be read again. @@ -207,6 +211,18 @@ public class FileSnapshot { return (int) lastModified; } + @Override + public String toString() { + if (this == DIRTY) + return "DIRTY"; //$NON-NLS-1$ + if (this == MISSING_FILE) + return "MISSING_FILE"; //$NON-NLS-1$ + DateFormat f = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS", //$NON-NLS-1$ + Locale.US); + return "FileSnapshot[modified: " + f.format(new Date(lastModified)) //$NON-NLS-1$ + + ", read: " + f.format(new Date(lastRead)) + "]"; //$NON-NLS-1$ //$NON-NLS-2$ + } + private boolean notRacyClean(final long read) { // The last modified time granularity of FAT filesystems is 2 seconds. // Using 2.5 seconds here provides a reasonably high assurance that @@ -51,7 +51,7 @@ <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> <packaging>pom</packaging> - <version>3.6.2-SNAPSHOT</version> + <version>3.7.0-SNAPSHOT</version> <name>JGit - Parent</name> <url>${jgit-url}</url> @@ -176,7 +176,7 @@ <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format> <bundle-manifest>${project.build.directory}/META-INF/MANIFEST.MF</bundle-manifest> - <jgit-last-release-version>v3.5.0.201409260305-r</jgit-last-release-version> + <jgit-last-release-version>3.6.0.201412230720-r</jgit-last-release-version> <jsch-version>0.1.50</jsch-version> <javaewah-version>0.7.9</javaewah-version> <junit-version>4.11</junit-version> @@ -345,12 +345,12 @@ <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-pack200a-plugin</artifactId> - <version>0.21.0</version> + <version>0.22.0</version> </plugin> <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-pack200b-plugin</artifactId> - <version>0.21.0</version> + <version>0.22.0</version> </plugin> <plugin> <groupId>org.jacoco</groupId> |