diff options
55 files changed, 311 insertions, 260 deletions
diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 1377335d27..75ae5be237 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.1.0.qualifier +Bundle-Version: 3.1.1.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[3.1.0,3.2.0)", - org.eclipse.jgit.internal.storage.file;version="[3.1.0,3.2.0)", - org.eclipse.jgit.junit;version="[3.1.0,3.2.0)", - org.eclipse.jgit.lib;version="[3.1.0,3.2.0)", - org.eclipse.jgit.util;version="[3.1.0,3.2.0)", + org.eclipse.jgit.ant.tasks;version="[3.1.1,3.2.0)", + org.eclipse.jgit.internal.storage.file;version="[3.1.1,3.2.0)", + org.eclipse.jgit.junit;version="[3.1.1,3.2.0)", + org.eclipse.jgit.lib;version="[3.1.1,3.2.0)", + org.eclipse.jgit.util;version="[3.1.1,3.2.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 359d477156..192d2122f0 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.1.0-SNAPSHOT</version> + <version>3.1.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 30d98d3920..9f82424e5a 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 3.1.1.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[3.1.0,3.2.0)" + org.eclipse.jgit.storage.file;version="[3.1.1,3.2.0)" Bundle-Localization: plugin Bundle-Vendor: %Provider-Name -Export-Package: org.eclipse.jgit.ant.tasks;version="3.1.0" +Export-Package: org.eclipse.jgit.ant.tasks;version="3.1.1" diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index e6d0e8a0d8..875a9caf83 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.1.0-SNAPSHOT</version> + <version>3.1.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 d8626e8a05..941d50b774 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.1.0.qualifier +Bundle-Version: 3.1.1.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 @@ -12,9 +12,9 @@ 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.1.0,3.2.0)", - org.eclipse.jgit.lib;version="[3.1.0,3.2.0)", + org.eclipse.jgit.api;version="[3.1.1,3.2.0)", + org.eclipse.jgit.lib;version="[3.1.1,3.2.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.1.0" +Export-Package: org.eclipse.jgit.archive;version="3.1.1" diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index c41c426fb9..79404209b2 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;singleton:=true Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 3.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="3.1.0";roots="." +Bundle-Version: 3.1.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="3.1.1";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 797c785ece..5bb6c68cc2 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.1.0-SNAPSHOT</version> + <version>3.1.1-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 d1751751bd..7e15459f26 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.1.0.qualifier +Bundle-Version: 3.1.1.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Export-Package: org.eclipse.jgit.console;version="3.1.0" -Import-Package: org.eclipse.jgit.errors;version="[3.1.0,3.2.0)", - org.eclipse.jgit.nls;version="[3.1.0,3.2.0)", - org.eclipse.jgit.transport;version="[3.1.0,3.2.0)", - org.eclipse.jgit.util;version="[3.1.0,3.2.0)" +Export-Package: org.eclipse.jgit.console;version="3.1.1" +Import-Package: org.eclipse.jgit.errors;version="[3.1.1,3.2.0)", + org.eclipse.jgit.nls;version="[3.1.1,3.2.0)", + org.eclipse.jgit.transport;version="[3.1.1,3.2.0)", + org.eclipse.jgit.util;version="[3.1.1,3.2.0)" diff --git a/org.eclipse.jgit.console/pom.xml b/org.eclipse.jgit.console/pom.xml index 009ee5c8f9..c78ef992b5 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.1.0-SNAPSHOT</version> + <version>3.1.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.console</artifactId> diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index e397549287..0e50451a7a 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -2,22 +2,22 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 3.1.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Export-Package: - org.eclipse.jgit.http.server;version="3.1.0", - org.eclipse.jgit.http.server.glue;version="3.1.0", - org.eclipse.jgit.http.server.resolver;version="3.1.0" + org.eclipse.jgit.http.server;version="3.1.1", + org.eclipse.jgit.http.server.glue;version="3.1.1", + org.eclipse.jgit.http.server.resolver;version="3.1.1" 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.1.0,3.2.0)", - org.eclipse.jgit.internal.storage.file;version="[3.1.0,3.2.0)", - org.eclipse.jgit.lib;version="[3.1.0,3.2.0)", - org.eclipse.jgit.nls;version="[3.1.0,3.2.0)", - org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)", - org.eclipse.jgit.transport;version="[3.1.0,3.2.0)", - org.eclipse.jgit.transport.resolver;version="[3.1.0,3.2.0)", - org.eclipse.jgit.util;version="[3.1.0,3.2.0)" + org.eclipse.jgit.errors;version="[3.1.1,3.2.0)", + org.eclipse.jgit.internal.storage.file;version="[3.1.1,3.2.0)", + org.eclipse.jgit.lib;version="[3.1.1,3.2.0)", + org.eclipse.jgit.nls;version="[3.1.1,3.2.0)", + org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)", + org.eclipse.jgit.transport;version="[3.1.1,3.2.0)", + org.eclipse.jgit.transport.resolver;version="[3.1.1,3.2.0)", + org.eclipse.jgit.util;version="[3.1.1,3.2.0)" diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 9f47c1a10c..f71b2f8d27 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.1.0-SNAPSHOT</version> + <version>3.1.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 d9b86a11f3..e54114add7 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.1.0.qualifier +Bundle-Version: 3.1.1.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 @@ -22,20 +22,20 @@ 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.1.0,3.2.0)", - org.eclipse.jgit.http.server;version="[3.1.0,3.2.0)", - org.eclipse.jgit.http.server.glue;version="[3.1.0,3.2.0)", - org.eclipse.jgit.http.server.resolver;version="[3.1.0,3.2.0)", - org.eclipse.jgit.internal;version="[3.1.0,3.2.0)", - org.eclipse.jgit.internal.storage.file;version="[3.1.0,3.2.0)", - org.eclipse.jgit.junit;version="[3.1.0,3.2.0)", - org.eclipse.jgit.junit.http;version="[3.1.0,3.2.0)", - org.eclipse.jgit.lib;version="[3.1.0,3.2.0)", - org.eclipse.jgit.nls;version="[3.1.0,3.2.0)", - org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)", - org.eclipse.jgit.storage.file;version="[3.1.0,3.2.0)", - org.eclipse.jgit.transport;version="[3.1.0,3.2.0)", - org.eclipse.jgit.transport.resolver;version="[3.1.0,3.2.0)", - org.eclipse.jgit.util;version="[3.1.0,3.2.0)", + org.eclipse.jgit.errors;version="[3.1.1,3.2.0)", + org.eclipse.jgit.http.server;version="[3.1.1,3.2.0)", + org.eclipse.jgit.http.server.glue;version="[3.1.1,3.2.0)", + org.eclipse.jgit.http.server.resolver;version="[3.1.1,3.2.0)", + org.eclipse.jgit.internal;version="[3.1.1,3.2.0)", + org.eclipse.jgit.internal.storage.file;version="[3.1.1,3.2.0)", + org.eclipse.jgit.junit;version="[3.1.1,3.2.0)", + org.eclipse.jgit.junit.http;version="[3.1.1,3.2.0)", + org.eclipse.jgit.lib;version="[3.1.1,3.2.0)", + org.eclipse.jgit.nls;version="[3.1.1,3.2.0)", + org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)", + org.eclipse.jgit.storage.file;version="[3.1.1,3.2.0)", + org.eclipse.jgit.transport;version="[3.1.1,3.2.0)", + org.eclipse.jgit.transport.resolver;version="[3.1.1,3.2.0)", + org.eclipse.jgit.util;version="[3.1.1,3.2.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;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 c24ef1c87f..f5aa03cbda 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.1.0-SNAPSHOT</version> + <version>3.1.1-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 78764801c9..b3c9bde9cb 100644 --- a/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.java7.test -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 3.1.1.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Import-Package: org.eclipse.jgit.api;version="[3.1.0,3.2.0)", - org.eclipse.jgit.internal.storage.file;version="3.1.0", - org.eclipse.jgit.junit;version="[3.1.0,3.2.0)", - org.eclipse.jgit.lib;version="[3.1.0,3.2.0)", - org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)", - org.eclipse.jgit.storage.file;version="[3.1.0,3.2.0)", - org.eclipse.jgit.util;version="[3.1.0,3.2.0)" +Import-Package: org.eclipse.jgit.api;version="[3.1.1,3.2.0)", + org.eclipse.jgit.internal.storage.file;version="3.1.1", + org.eclipse.jgit.junit;version="[3.1.1,3.2.0)", + org.eclipse.jgit.lib;version="[3.1.1,3.2.0)", + org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)", + org.eclipse.jgit.storage.file;version="[3.1.1,3.2.0)", + org.eclipse.jgit.util;version="[3.1.1,3.2.0)" diff --git a/org.eclipse.jgit.java7.test/pom.xml b/org.eclipse.jgit.java7.test/pom.xml index 1762e4450f..b6cbf8451b 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.1.0-SNAPSHOT</version> + <version>3.1.1-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 7a0c21282a..553d004e1c 100644 --- a/org.eclipse.jgit.java7/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.java7/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Fragment-Host: org.eclipse.jgit;bundle-version="3.1.0" +Fragment-Host: org.eclipse.jgit;bundle-version="3.1.1" Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.java7 -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 3.1.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Export-Package: org.eclipse.jgit.util;version="3.1.0" +Export-Package: org.eclipse.jgit.util;version="3.1.1" diff --git a/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF index 8db0b33c8f..125a9dcab2 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;singleton:=true Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 3.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.java7;version="3.1.0";roots="." +Bundle-Version: 3.1.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.java7;version="3.1.1";roots="." diff --git a/org.eclipse.jgit.java7/pom.xml b/org.eclipse.jgit.java7/pom.xml index 235861e42e..bf501b5c02 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.1.0-SNAPSHOT</version> + <version>3.1.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.java7</artifactId> diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 723b7934d7..26cfd76d14 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.1.0.qualifier +Bundle-Version: 3.1.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy @@ -19,13 +19,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.1.0,3.2.0)", - org.eclipse.jgit.http.server;version="[3.1.0,3.2.0)", - org.eclipse.jgit.internal.storage.file;version="[3.1.0,3.2.0)", - org.eclipse.jgit.junit;version="[3.1.0,3.2.0)", - org.eclipse.jgit.lib;version="[3.1.0,3.2.0)", - org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)", - org.eclipse.jgit.transport;version="[3.1.0,3.2.0)", - org.eclipse.jgit.transport.resolver;version="[3.1.0,3.2.0)", + org.eclipse.jgit.errors;version="[3.1.1,3.2.0)", + org.eclipse.jgit.http.server;version="[3.1.1,3.2.0)", + org.eclipse.jgit.internal.storage.file;version="[3.1.1,3.2.0)", + org.eclipse.jgit.junit;version="[3.1.1,3.2.0)", + org.eclipse.jgit.lib;version="[3.1.1,3.2.0)", + org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)", + org.eclipse.jgit.transport;version="[3.1.1,3.2.0)", + org.eclipse.jgit.transport.resolver;version="[3.1.1,3.2.0)", org.junit;version="[4.0.0,5.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="3.1.0" +Export-Package: org.eclipse.jgit.junit.http;version="3.1.1" diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index d9bfb831af..c8734bdb26 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.1.0-SNAPSHOT</version> + <version>3.1.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 bc4e4f83ad..f3b53493fc 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.1.0.qualifier +Bundle-Version: 3.1.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.eclipse.jgit.api;version="[3.1.0,3.2.0)", - org.eclipse.jgit.api.errors;version="[3.1.0,3.2.0)", - org.eclipse.jgit.dircache;version="[3.1.0,3.2.0)", - org.eclipse.jgit.errors;version="[3.1.0,3.2.0)", - org.eclipse.jgit.internal.storage.file;version="[3.1.0,3.2.0)", - org.eclipse.jgit.internal.storage.pack;version="[3.1.0,3.2.0)", - org.eclipse.jgit.lib;version="[3.1.0,3.2.0)", - org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)", - org.eclipse.jgit.storage.file;version="[3.1.0,3.2.0)", - org.eclipse.jgit.treewalk;version="[3.1.0,3.2.0)", - org.eclipse.jgit.treewalk.filter;version="[3.1.0,3.2.0)", - org.eclipse.jgit.util;version="[3.1.0,3.2.0)", - org.eclipse.jgit.util.io;version="[3.1.0,3.2.0)", +Import-Package: org.eclipse.jgit.api;version="[3.1.1,3.2.0)", + org.eclipse.jgit.api.errors;version="[3.1.1,3.2.0)", + org.eclipse.jgit.dircache;version="[3.1.1,3.2.0)", + org.eclipse.jgit.errors;version="[3.1.1,3.2.0)", + org.eclipse.jgit.internal.storage.file;version="[3.1.1,3.2.0)", + org.eclipse.jgit.internal.storage.pack;version="[3.1.1,3.2.0)", + org.eclipse.jgit.lib;version="[3.1.1,3.2.0)", + org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)", + org.eclipse.jgit.storage.file;version="[3.1.1,3.2.0)", + org.eclipse.jgit.treewalk;version="[3.1.1,3.2.0)", + org.eclipse.jgit.treewalk.filter;version="[3.1.1,3.2.0)", + org.eclipse.jgit.util;version="[3.1.1,3.2.0)", + org.eclipse.jgit.util.io;version="[3.1.1,3.2.0)", org.junit;version="[4.0.0,5.0.0)" -Export-Package: org.eclipse.jgit.junit;version="3.1.0" +Export-Package: org.eclipse.jgit.junit;version="3.1.1" diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 76a330b049..82da022ddd 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.1.0-SNAPSHOT</version> + <version>3.1.1-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 9f67192612..ef427fdd75 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.1.0.qualifier" + version="3.1.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 f7d83f6d4f..e516be84c6 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.1.0-SNAPSHOT</version> + <version>3.1.1-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 0460f5d7a5..cdf88e3a9e 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.1.0.qualifier" + version="3.1.1.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 9e0c1c74a9..2fe4c8d98f 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.1.0-SNAPSHOT</version> + <version>3.1.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 dcd67e3e8c..b589b85c5a 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.1.0.qualifier" + version="3.1.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 3fefc0bf8e..a229f288da 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.1.0-SNAPSHOT</version> + <version>3.1.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 a97ec57194..ab77e7a4a2 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.1.0.qualifier" + version="3.1.1.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.1.0" match="equivalent"/> + <import feature="org.eclipse.jgit" version="3.1.1" 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 0618dc2bb4..67c8957f20 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.1.0-SNAPSHOT</version> + <version>3.1.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 f7b7866249..eebb322049 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.1.0.qualifier" + version="3.1.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 9c665c3d71..1e86f82987 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.1.0-SNAPSHOT</version> + <version>3.1.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 22d4d57598..1e52130a3d 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.1.0-SNAPSHOT</version> + <version>3.1.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 b072103db2..48070d2336 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.1.0.qualifier" + version="3.1.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 0b53fb988e..803d1d569a 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.1.0-SNAPSHOT</version> + <version>3.1.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 72b4df8795..f2448ff52c 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.1.0.qualifier +Bundle-Version: 3.1.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 df8bacc031..118d1e2ecc 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.1.0-SNAPSHOT</version> + <version>3.1.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 b5bb59df83..6b1a6547d2 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -53,7 +53,7 @@ <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>3.1.0-SNAPSHOT</version> + <version>3.1.1-SNAPSHOT</version> <packaging>pom</packaging> <name>JGit Tycho Parent</name> diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index bfad292447..5ba2186bfb 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -2,24 +2,24 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 3.1.1.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.eclipse.jgit.api;version="[3.1.0,3.2.0)", - org.eclipse.jgit.dircache;version="[3.1.0,3.2.0)", - org.eclipse.jgit.java7;version="[3.1.0,3.2.0)";resolution:=optional, - org.eclipse.jgit.junit;version="[3.1.0,3.2.0)", - org.eclipse.jgit.lib;version="[3.1.0,3.2.0)", - org.eclipse.jgit.merge;version="[3.1.0,3.2.0)", - org.eclipse.jgit.pgm;version="[3.1.0,3.2.0)", - org.eclipse.jgit.pgm.internal;version="[3.1.0,3.2.0)", - org.eclipse.jgit.pgm.opt;version="[3.1.0,3.2.0)", - org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)", - org.eclipse.jgit.storage.file;version="[3.1.0,3.2.0)", - org.eclipse.jgit.util;version="[3.1.0,3.2.0)", - org.eclipse.jgit.util.io;version="[3.1.0,3.2.0)", +Import-Package: org.eclipse.jgit.api;version="[3.1.1,3.2.0)", + org.eclipse.jgit.dircache;version="[3.1.1,3.2.0)", + org.eclipse.jgit.java7;version="[3.1.1,3.2.0)";resolution:=optional, + org.eclipse.jgit.junit;version="[3.1.1,3.2.0)", + org.eclipse.jgit.lib;version="[3.1.1,3.2.0)", + org.eclipse.jgit.merge;version="[3.1.1,3.2.0)", + org.eclipse.jgit.pgm;version="[3.1.1,3.2.0)", + org.eclipse.jgit.pgm.internal;version="[3.1.1,3.2.0)", + org.eclipse.jgit.pgm.opt;version="[3.1.1,3.2.0)", + org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)", + org.eclipse.jgit.storage.file;version="[3.1.1,3.2.0)", + org.eclipse.jgit.util;version="[3.1.1,3.2.0)", + org.eclipse.jgit.util.io;version="[3.1.1,3.2.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 bf08d7cd82..28e0d09861 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.1.0-SNAPSHOT</version> + <version>3.1.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 a6cf0f892f..f04011e68a 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -2,42 +2,42 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 3.1.1.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.1.0,3.2.0)", - org.eclipse.jgit.api.errors;version="[3.1.0,3.2.0)", - org.eclipse.jgit.archive;version="[3.1.0,3.2.0)", - org.eclipse.jgit.awtui;version="[3.1.0,3.2.0)", - org.eclipse.jgit.blame;version="[3.1.0,3.2.0)", - org.eclipse.jgit.diff;version="[3.1.0,3.2.0)", - org.eclipse.jgit.dircache;version="[3.1.0,3.2.0)", - org.eclipse.jgit.errors;version="[3.1.0,3.2.0)", - org.eclipse.jgit.internal.storage.file;version="[3.1.0,3.2.0)", - org.eclipse.jgit.internal.storage.pack;version="[3.1.0,3.2.0)", - org.eclipse.jgit.lib;version="[3.1.0,3.2.0)", - org.eclipse.jgit.merge;version="3.1.0", - org.eclipse.jgit.nls;version="[3.1.0,3.2.0)", - org.eclipse.jgit.notes;version="[3.1.0,3.2.0)", - org.eclipse.jgit.revplot;version="[3.1.0,3.2.0)", - org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)", - org.eclipse.jgit.revwalk.filter;version="[3.1.0,3.2.0)", - org.eclipse.jgit.storage.file;version="[3.1.0,3.2.0)", - org.eclipse.jgit.storage.pack;version="[3.1.0,3.2.0)", - org.eclipse.jgit.transport;version="[3.1.0,3.2.0)", - org.eclipse.jgit.transport.resolver;version="[3.1.0,3.2.0)", - org.eclipse.jgit.treewalk;version="[3.1.0,3.2.0)", - org.eclipse.jgit.treewalk.filter;version="[3.1.0,3.2.0)", - org.eclipse.jgit.util;version="[3.1.0,3.2.0)", - org.eclipse.jgit.util.io;version="[3.1.0,3.2.0)", + org.eclipse.jgit.api;version="[3.1.1,3.2.0)", + org.eclipse.jgit.api.errors;version="[3.1.1,3.2.0)", + org.eclipse.jgit.archive;version="[3.1.1,3.2.0)", + org.eclipse.jgit.awtui;version="[3.1.1,3.2.0)", + org.eclipse.jgit.blame;version="[3.1.1,3.2.0)", + org.eclipse.jgit.diff;version="[3.1.1,3.2.0)", + org.eclipse.jgit.dircache;version="[3.1.1,3.2.0)", + org.eclipse.jgit.errors;version="[3.1.1,3.2.0)", + org.eclipse.jgit.internal.storage.file;version="[3.1.1,3.2.0)", + org.eclipse.jgit.internal.storage.pack;version="[3.1.1,3.2.0)", + org.eclipse.jgit.lib;version="[3.1.1,3.2.0)", + org.eclipse.jgit.merge;version="3.1.1", + org.eclipse.jgit.nls;version="[3.1.1,3.2.0)", + org.eclipse.jgit.notes;version="[3.1.1,3.2.0)", + org.eclipse.jgit.revplot;version="[3.1.1,3.2.0)", + org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)", + org.eclipse.jgit.revwalk.filter;version="[3.1.1,3.2.0)", + org.eclipse.jgit.storage.file;version="[3.1.1,3.2.0)", + org.eclipse.jgit.storage.pack;version="[3.1.1,3.2.0)", + org.eclipse.jgit.transport;version="[3.1.1,3.2.0)", + org.eclipse.jgit.transport.resolver;version="[3.1.1,3.2.0)", + org.eclipse.jgit.treewalk;version="[3.1.1,3.2.0)", + org.eclipse.jgit.treewalk.filter;version="[3.1.1,3.2.0)", + org.eclipse.jgit.util;version="[3.1.1,3.2.0)", + org.eclipse.jgit.util.io;version="[3.1.1,3.2.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.1.0"; +Export-Package: org.eclipse.jgit.pgm;version="3.1.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.nls, org.eclipse.jgit.treewalk, @@ -46,8 +46,8 @@ Export-Package: org.eclipse.jgit.pgm;version="3.1.0"; org.eclipse.jgit.pgm.opt, org.eclipse.jgit.awtui, org.eclipse.jgit.transport", - org.eclipse.jgit.pgm.debug;version="3.1.0", - org.eclipse.jgit.pgm.internal;version="3.1.0";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="3.1.0" + org.eclipse.jgit.pgm.debug;version="3.1.1", + org.eclipse.jgit.pgm.internal;version="3.1.1";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", + org.eclipse.jgit.pgm.opt;version="3.1.1" Main-Class: org.eclipse.jgit.pgm.Main Implementation-Title: JGit Command Line Interface diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 905f5c4847..44666edbd4 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;singleton:=true Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 3.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="3.1.0";roots="." +Bundle-Version: 3.1.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="3.1.1";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index ff80bebf0d..19d73c08c7 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.1.0-SNAPSHOT</version> + <version>3.1.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.pgm</artifactId> @@ -178,6 +178,20 @@ </manifestEntries> </transformer> </transformers> + <filters> + <!-- exclude the signing data for individual jars, ueberjar will be signed again --> + <filter> + <artifact>*:*</artifact> + <excludes> + <exclude>META-INF/*.SF</exclude> + <exclude>META-INF/*.DSA</exclude> + <exclude>META-INF/*.RSA</exclude> + <exclude>OSGI-OPT/**</exclude> + </excludes> + </filter> + </filters> + <shadedArtifactAttached>true</shadedArtifactAttached> + <shadedClassifierName>shaded</shadedClassifierName> <!-- Any name that makes sense --> </configuration> </execution> </executions> diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index aff1abb6bc..f0764b5479 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -2,47 +2,47 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 3.1.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: javaewah;version="[0.5.6,1.0.0)", - org.eclipse.jgit.api;version="[3.1.0,3.2.0)", - org.eclipse.jgit.api.errors;version="[3.1.0,3.2.0)", - org.eclipse.jgit.awtui;version="[3.1.0,3.2.0)", - org.eclipse.jgit.blame;version="[3.1.0,3.2.0)", - org.eclipse.jgit.console;version="[3.1.0,3.2.0)", - org.eclipse.jgit.diff;version="[3.1.0,3.2.0)", - org.eclipse.jgit.dircache;version="[3.1.0,3.2.0)", - org.eclipse.jgit.errors;version="[3.1.0,3.2.0)", - org.eclipse.jgit.events;version="[3.1.0,3.2.0)", - org.eclipse.jgit.fnmatch;version="[3.1.0,3.2.0)", - org.eclipse.jgit.ignore;version="[3.1.0,3.2.0)", - org.eclipse.jgit.internal;version="[3.1.0,3.2.0)", - org.eclipse.jgit.internal.storage.dfs;version="[3.1.0,3.2.0)", - org.eclipse.jgit.internal.storage.file;version="[3.1.0,3.2.0)", - org.eclipse.jgit.internal.storage.pack;version="[3.1.0,3.2.0)", - org.eclipse.jgit.java7;version="[3.1.0,3.2.0)";resolution:=optional, - org.eclipse.jgit.junit;version="[3.1.0,3.2.0)", - org.eclipse.jgit.lib;version="[3.1.0,3.2.0)", - org.eclipse.jgit.merge;version="[3.1.0,3.2.0)", - org.eclipse.jgit.nls;version="[3.1.0,3.2.0)", - org.eclipse.jgit.notes;version="[3.1.0,3.2.0)", - org.eclipse.jgit.patch;version="[3.1.0,3.2.0)", - org.eclipse.jgit.pgm;version="[3.1.0,3.2.0)", - org.eclipse.jgit.pgm.internal;version="[3.1.0,3.2.0)", - org.eclipse.jgit.revplot;version="[3.1.0,3.2.0)", - org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)", - org.eclipse.jgit.revwalk.filter;version="[3.1.0,3.2.0)", - org.eclipse.jgit.storage.file;version="[3.1.0,3.2.0)", - org.eclipse.jgit.storage.pack;version="[3.1.0,3.2.0)", - org.eclipse.jgit.submodule;version="[3.1.0,3.2.0)", - org.eclipse.jgit.transport;version="[3.1.0,3.2.0)", - org.eclipse.jgit.treewalk;version="[3.1.0,3.2.0)", - org.eclipse.jgit.treewalk.filter;version="[3.1.0,3.2.0)", - org.eclipse.jgit.util;version="[3.1.0,3.2.0)", - org.eclipse.jgit.util.io;version="[3.1.0,3.2.0)", + org.eclipse.jgit.api;version="[3.1.1,3.2.0)", + org.eclipse.jgit.api.errors;version="[3.1.1,3.2.0)", + org.eclipse.jgit.awtui;version="[3.1.1,3.2.0)", + org.eclipse.jgit.blame;version="[3.1.1,3.2.0)", + org.eclipse.jgit.console;version="[3.1.1,3.2.0)", + org.eclipse.jgit.diff;version="[3.1.1,3.2.0)", + org.eclipse.jgit.dircache;version="[3.1.1,3.2.0)", + org.eclipse.jgit.errors;version="[3.1.1,3.2.0)", + org.eclipse.jgit.events;version="[3.1.1,3.2.0)", + org.eclipse.jgit.fnmatch;version="[3.1.1,3.2.0)", + org.eclipse.jgit.ignore;version="[3.1.1,3.2.0)", + org.eclipse.jgit.internal;version="[3.1.1,3.2.0)", + org.eclipse.jgit.internal.storage.dfs;version="[3.1.1,3.2.0)", + org.eclipse.jgit.internal.storage.file;version="[3.1.1,3.2.0)", + org.eclipse.jgit.internal.storage.pack;version="[3.1.1,3.2.0)", + org.eclipse.jgit.java7;version="[3.1.1,3.2.0)";resolution:=optional, + org.eclipse.jgit.junit;version="[3.1.1,3.2.0)", + org.eclipse.jgit.lib;version="[3.1.1,3.2.0)", + org.eclipse.jgit.merge;version="[3.1.1,3.2.0)", + org.eclipse.jgit.nls;version="[3.1.1,3.2.0)", + org.eclipse.jgit.notes;version="[3.1.1,3.2.0)", + org.eclipse.jgit.patch;version="[3.1.1,3.2.0)", + org.eclipse.jgit.pgm;version="[3.1.1,3.2.0)", + org.eclipse.jgit.pgm.internal;version="[3.1.1,3.2.0)", + org.eclipse.jgit.revplot;version="[3.1.1,3.2.0)", + org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)", + org.eclipse.jgit.revwalk.filter;version="[3.1.1,3.2.0)", + org.eclipse.jgit.storage.file;version="[3.1.1,3.2.0)", + org.eclipse.jgit.storage.pack;version="[3.1.1,3.2.0)", + org.eclipse.jgit.submodule;version="[3.1.1,3.2.0)", + org.eclipse.jgit.transport;version="[3.1.1,3.2.0)", + org.eclipse.jgit.treewalk;version="[3.1.1,3.2.0)", + org.eclipse.jgit.treewalk.filter;version="[3.1.1,3.2.0)", + org.eclipse.jgit.util;version="[3.1.1,3.2.0)", + org.eclipse.jgit.util.io;version="[3.1.1,3.2.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 7b9f4ca41f..435bd8d0a4 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.1.0-SNAPSHOT</version> + <version>3.1.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.test</artifactId> diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revplot/PlotCommitListTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revplot/PlotCommitListTest.java index 5db6b86f81..926424c06d 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revplot/PlotCommitListTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revplot/PlotCommitListTest.java @@ -156,8 +156,8 @@ public class PlotCommitListTest extends RevWalkTestCase { CommitListAssert test = new CommitListAssert(pcl); test.commit(c).lanePos(0).parents(a); - test.commit(b).lanePos(1).parents(a); - test.commit(a).lanePos(0).parents(); + test.commit(b).lanePos(0).parents(a); + test.commit(a).lanePos(1).parents(); test.noMoreCommits(); } @@ -179,9 +179,9 @@ public class PlotCommitListTest extends RevWalkTestCase { CommitListAssert test = new CommitListAssert(pcl); test.commit(d).lanePos(0).parents(a); - test.commit(c).lanePos(1).parents(a); - test.commit(b).lanePos(1).parents(a); - test.commit(a).lanePos(0).parents(); + test.commit(c).lanePos(0).parents(a); + test.commit(b).lanePos(0).parents(a); + test.commit(a).lanePos(1).parents(); test.noMoreCommits(); } @@ -214,14 +214,45 @@ public class PlotCommitListTest extends RevWalkTestCase { CommitListAssert test = new CommitListAssert(pcl); test.commit(g).lanePos(0).parents(f); test.commit(f).lanePos(0).parents(a); - test.commit(e).lanePos(1).parents(a); - test.commit(d).lanePos(1).parents(a); - test.commit(c).lanePos(1).parents(a); - test.commit(b).lanePos(1).parents(a); - test.commit(a).lanePos(0).parents(); + test.commit(e).lanePos(0).parents(a); + test.commit(d).lanePos(0).parents(a); + test.commit(c).lanePos(0).parents(a); + test.commit(b).lanePos(0).parents(a); + test.commit(a).lanePos(1).parents(); test.noMoreCommits(); } + @Test + public void testBug368927() throws Exception { + final RevCommit a = commit(); + final RevCommit b = commit(a); + final RevCommit c = commit(b); + final RevCommit d = commit(b); + final RevCommit e = commit(c); + final RevCommit f = commit(e, d); + final RevCommit g = commit(a); + final RevCommit h = commit(f); + final RevCommit i = commit(h); + + PlotWalk pw = new PlotWalk(db); + pw.markStart(pw.lookupCommit(i.getId())); + pw.markStart(pw.lookupCommit(g.getId())); + + PlotCommitList<PlotLane> pcl = new PlotCommitList<PlotLane>(); + pcl.source(pw); + pcl.fillTo(Integer.MAX_VALUE); + CommitListAssert test = new CommitListAssert(pcl); + test.commit(i).lanePos(1).parents(h); + test.commit(h).lanePos(1).parents(f); + test.commit(g).lanePos(0).parents(a); + test.commit(f).lanePos(1).parents(e, d); + test.commit(e).lanePos(0).parents(c); + test.commit(d).lanePos(1).parents(b); + test.commit(c).lanePos(0).parents(b); + test.commit(b).lanePos(1).parents(a); + test.commit(a).lanePos(2).parents(); + } + // test the history of the egit project between 9fdaf3c1 and e76ad9170f @Test public void testEgitHistory() throws Exception { diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index bb72a3189c..d4b1fa7c86 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.1.0.qualifier +Bundle-Version: 3.1.1.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.jgit.awtui;version="3.1.0" -Import-Package: org.eclipse.jgit.errors;version="[3.1.0,3.2.0)", - org.eclipse.jgit.lib;version="[3.1.0,3.2.0)", - org.eclipse.jgit.nls;version="[3.1.0,3.2.0)", - org.eclipse.jgit.revplot;version="[3.1.0,3.2.0)", - org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)", - org.eclipse.jgit.transport;version="[3.1.0,3.2.0)", - org.eclipse.jgit.util;version="[3.1.0,3.2.0)" +Export-Package: org.eclipse.jgit.awtui;version="3.1.1" +Import-Package: org.eclipse.jgit.errors;version="[3.1.1,3.2.0)", + org.eclipse.jgit.lib;version="[3.1.1,3.2.0)", + org.eclipse.jgit.nls;version="[3.1.1,3.2.0)", + org.eclipse.jgit.revplot;version="[3.1.1,3.2.0)", + org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)", + org.eclipse.jgit.transport;version="[3.1.1,3.2.0)", + org.eclipse.jgit.util;version="[3.1.1,3.2.0)" diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 5d3b79af60..cc5d4fd269 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.1.0-SNAPSHOT</version> + <version>3.1.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 4f6d874bf4..afb46a1e08 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -2,50 +2,50 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 3.1.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.api;version="3.1.0", - org.eclipse.jgit.api.errors;version="3.1.0", - org.eclipse.jgit.blame;version="3.1.0", - org.eclipse.jgit.diff;version="3.1.0", - org.eclipse.jgit.dircache;version="3.1.0", - org.eclipse.jgit.errors;version="3.1.0", - org.eclipse.jgit.events;version="3.1.0", - org.eclipse.jgit.fnmatch;version="3.1.0", - org.eclipse.jgit.ignore;version="3.1.0", - org.eclipse.jgit.internal;version="3.1.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.storage.dfs;version="3.1.0";x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.file;version="3.1.0"; +Export-Package: org.eclipse.jgit.api;version="3.1.1", + org.eclipse.jgit.api.errors;version="3.1.1", + org.eclipse.jgit.blame;version="3.1.1", + org.eclipse.jgit.diff;version="3.1.1", + org.eclipse.jgit.dircache;version="3.1.1", + org.eclipse.jgit.errors;version="3.1.1", + org.eclipse.jgit.events;version="3.1.1", + org.eclipse.jgit.fnmatch;version="3.1.1", + org.eclipse.jgit.ignore;version="3.1.1", + org.eclipse.jgit.internal;version="3.1.1";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", + org.eclipse.jgit.internal.storage.dfs;version="3.1.1";x-friends:="org.eclipse.jgit.test", + org.eclipse.jgit.internal.storage.file;version="3.1.1"; 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.1.0"; + org.eclipse.jgit.internal.storage.pack;version="3.1.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.pack;version="3.1.0"; + org.eclipse.jgit.internal.storage.pack;version="3.1.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.lib;version="3.1.0", - org.eclipse.jgit.merge;version="3.1.0", - org.eclipse.jgit.nls;version="3.1.0", - org.eclipse.jgit.notes;version="3.1.0", - org.eclipse.jgit.patch;version="3.1.0", - org.eclipse.jgit.revplot;version="3.1.0", - org.eclipse.jgit.revwalk;version="3.1.0", - org.eclipse.jgit.revwalk.filter;version="3.1.0", - org.eclipse.jgit.storage.file;version="3.1.0", - org.eclipse.jgit.storage.pack;version="3.1.0", - org.eclipse.jgit.submodule;version="3.1.0", - org.eclipse.jgit.transport;version="3.1.0", - org.eclipse.jgit.transport.resolver;version="3.1.0", - org.eclipse.jgit.treewalk;version="3.1.0", - org.eclipse.jgit.treewalk.filter;version="3.1.0", - org.eclipse.jgit.util;version="3.1.0", - org.eclipse.jgit.util.io;version="3.1.0" + org.eclipse.jgit.lib;version="3.1.1", + org.eclipse.jgit.merge;version="3.1.1", + org.eclipse.jgit.nls;version="3.1.1", + org.eclipse.jgit.notes;version="3.1.1", + org.eclipse.jgit.patch;version="3.1.1", + org.eclipse.jgit.revplot;version="3.1.1", + org.eclipse.jgit.revwalk;version="3.1.1", + org.eclipse.jgit.revwalk.filter;version="3.1.1", + org.eclipse.jgit.storage.file;version="3.1.1", + org.eclipse.jgit.storage.pack;version="3.1.1", + org.eclipse.jgit.submodule;version="3.1.1", + org.eclipse.jgit.transport;version="3.1.1", + org.eclipse.jgit.transport.resolver;version="3.1.1", + org.eclipse.jgit.treewalk;version="3.1.1", + org.eclipse.jgit.treewalk.filter;version="3.1.1", + org.eclipse.jgit.util;version="3.1.1", + org.eclipse.jgit.util.io;version="3.1.1" 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 20968e8c76..10c561072b 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;singleton:=true Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 3.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="3.1.0";roots="." +Bundle-Version: 3.1.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="3.1.1";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index ca0d73a662..88c387487c 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.1.0-SNAPSHOT</version> + <version>3.1.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit</artifactId> diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java index 5a006792e1..a3f80c0f09 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java @@ -669,8 +669,8 @@ public class RebaseCommand extends GitCommand<RebaseResult> { BufferedWriter fw = new BufferedWriter(new OutputStreamWriter( new FileOutputStream(rebaseState.getFile(GIT_REBASE_TODO)), Constants.CHARACTER_ENCODING)); - fw.write("# Created by EGit: rebasing " + upstreamCommit.name() - + " onto " + headId.name()); + fw.write("# Created by EGit: rebasing " + headId.name() + " onto " + + upstreamCommit.name()); fw.newLine(); try { StringBuilder sb = new StringBuilder(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchTrackingStatus.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchTrackingStatus.java index 7844fd819f..1525e5b187 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchTrackingStatus.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchTrackingStatus.java @@ -70,8 +70,10 @@ public class BranchTrackingStatus { public static BranchTrackingStatus of(Repository repository, String branchName) throws IOException { + String shortBranchName = Repository.shortenRefName(branchName); + String fullBranchName = Constants.R_HEADS + shortBranchName; BranchConfig branchConfig = new BranchConfig(repository.getConfig(), - branchName); + shortBranchName); String trackingBranch = branchConfig.getTrackingBranch(); if (trackingBranch == null) @@ -81,7 +83,7 @@ public class BranchTrackingStatus { if (tracking == null) return null; - Ref local = repository.getRef(branchName); + Ref local = repository.getRef(fullBranchName); if (local == null) return null; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java index 382d162439..943ec4ec3f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java @@ -119,8 +119,12 @@ public class PlotCommitList<L extends PlotLane> extends setupChildren(currCommit); final int nChildren = currCommit.getChildCount(); - if (nChildren == 0) + if (nChildren == 0) { + currCommit.lane = nextFreeLane(); + activeLanes.add(currCommit.lane); + closeLane(currCommit.lane); return; + } if (nChildren == 1 && currCommit.children[0].getParentCount() < 2) { // Only one child, child has only us as their parent. @@ -51,7 +51,7 @@ <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> <packaging>pom</packaging> - <version>3.1.0-SNAPSHOT</version> + <version>3.1.1-SNAPSHOT</version> <name>JGit - Parent</name> <url>${jgit-url}</url> |