From 11a12ceb0be1bf13e2e6d5de2368688a58f9400c Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 25 Mar 2017 01:21:58 +0100 Subject: [PATCH 1/3] Prepare 4.5.2-SNAPSHOT builds Change-Id: I8485de1f3f63dc9ec445b8fb08093ca144aedc59 Signed-off-by: Matthias Sohn --- .../META-INF/MANIFEST.MF | 12 +-- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 6 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 12 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.archive/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 10 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 26 +++--- org.eclipse.jgit.http.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 38 ++++----- org.eclipse.jgit.http.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 20 ++--- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 32 ++++---- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 12 +-- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 28 +++---- org.eclipse.jgit.lfs.server/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 14 ++-- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 16 ++-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.jgit.target/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 36 ++++---- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 78 +++++++++--------- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 82 +++++++++---------- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 ++-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 80 +++++++++--------- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 56 files changed, 302 insertions(+), 302 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 0e9a6d0e6..f35e53a70 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.ant.test -Bundle-Version: 4.5.1.201703201650-r +Bundle-Version: 4.5.2.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[4.5.1,4.6.0)", - org.eclipse.jgit.internal.storage.file;version="[4.5.1,4.6.0)", - org.eclipse.jgit.junit;version="[4.5.1,4.6.0)", - org.eclipse.jgit.lib;version="[4.5.1,4.6.0)", - org.eclipse.jgit.util;version="[4.5.1,4.6.0)", + org.eclipse.jgit.ant.tasks;version="[4.5.2,4.6.0)", + org.eclipse.jgit.internal.storage.file;version="[4.5.2,4.6.0)", + org.eclipse.jgit.junit;version="[4.5.2,4.6.0)", + org.eclipse.jgit.lib;version="[4.5.2,4.6.0)", + org.eclipse.jgit.util;version="[4.5.2,4.6.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 3719145cd..96ed56123 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 7c04a2eea..fd32a2ea8 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 4.5.1.201703201650-r +Bundle-Version: 4.5.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[4.5.1,4.6.0)" + org.eclipse.jgit.storage.file;version="[4.5.2,4.6.0)" Bundle-Localization: plugin Bundle-Vendor: %Provider-Name -Export-Package: org.eclipse.jgit.ant.tasks;version="4.5.1"; +Export-Package: org.eclipse.jgit.ant.tasks;version="4.5.2"; 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 799e6de0b..2ed5cc25a 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 5ff159503..d4ef6111d 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 4.5.1.201703201650-r +Bundle-Version: 4.5.2.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.7 @@ -12,14 +12,14 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)", org.apache.commons.compress.compressors.bzip2;version="[1.4,2.0)", org.apache.commons.compress.compressors.gzip;version="[1.4,2.0)", org.apache.commons.compress.compressors.xz;version="[1.4,2.0)", - org.eclipse.jgit.api;version="[4.5.1,4.6.0)", - org.eclipse.jgit.lib;version="[4.5.1,4.6.0)", - org.eclipse.jgit.nls;version="[4.5.1,4.6.0)", - org.eclipse.jgit.util;version="[4.5.1,4.6.0)", + org.eclipse.jgit.api;version="[4.5.2,4.6.0)", + org.eclipse.jgit.lib;version="[4.5.2,4.6.0)", + org.eclipse.jgit.nls;version="[4.5.2,4.6.0)", + org.eclipse.jgit.util;version="[4.5.2,4.6.0)", org.osgi.framework;version="[1.3.0,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.jgit.archive.FormatActivator -Export-Package: org.eclipse.jgit.archive;version="4.5.1"; +Export-Package: org.eclipse.jgit.archive;version="4.5.2"; 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 d3fff2213..066fc8772 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 4.5.1.201703201650-r -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.5.1.201703201650-r";roots="." +Bundle-Version: 4.5.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.5.2.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index bfd618617..327f6f807 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index a5f27fd6e..534f3ef25 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 4.5.1.201703201650-r +Bundle-Version: 4.5.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-Localization: plugin Bundle-Vendor: %Provider-Name @@ -19,10 +19,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="[4.5.1,4.6.0)", - org.eclipse.jgit.transport.http;version="[4.5.1,4.6.0)", - org.eclipse.jgit.util;version="[4.5.1,4.6.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="4.5.1"; + org.eclipse.jgit.nls;version="[4.5.2,4.6.0)", + org.eclipse.jgit.transport.http;version="[4.5.2,4.6.0)", + org.eclipse.jgit.util;version="[4.5.2,4.6.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="4.5.2"; 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 72d30c1e7..0bc24f22d 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -48,7 +48,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 90c6a1ecd..4a468e667 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 4.5.1.201703201650-r +Bundle-Version: 4.5.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.http.server;version="4.5.1", - org.eclipse.jgit.http.server.glue;version="4.5.1"; +Export-Package: org.eclipse.jgit.http.server;version="4.5.2", + org.eclipse.jgit.http.server.glue;version="4.5.2"; uses:="javax.servlet,javax.servlet.http", - org.eclipse.jgit.http.server.resolver;version="4.5.1"; + org.eclipse.jgit.http.server.resolver;version="4.5.2"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, @@ -17,12 +17,12 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: javax.servlet;version="[2.5.0,3.2.0)", javax.servlet.http;version="[2.5.0,3.2.0)", - org.eclipse.jgit.errors;version="[4.5.1,4.6.0)", - org.eclipse.jgit.internal.storage.dfs;version="[4.5.1,4.6.0)", - org.eclipse.jgit.internal.storage.file;version="[4.5.1,4.6.0)", - org.eclipse.jgit.lib;version="[4.5.1,4.6.0)", - org.eclipse.jgit.nls;version="[4.5.1,4.6.0)", - org.eclipse.jgit.revwalk;version="[4.5.1,4.6.0)", - org.eclipse.jgit.transport;version="[4.5.1,4.6.0)", - org.eclipse.jgit.transport.resolver;version="[4.5.1,4.6.0)", - org.eclipse.jgit.util;version="[4.5.1,4.6.0)" + org.eclipse.jgit.errors;version="[4.5.2,4.6.0)", + org.eclipse.jgit.internal.storage.dfs;version="[4.5.2,4.6.0)", + org.eclipse.jgit.internal.storage.file;version="[4.5.2,4.6.0)", + org.eclipse.jgit.lib;version="[4.5.2,4.6.0)", + org.eclipse.jgit.nls;version="[4.5.2,4.6.0)", + org.eclipse.jgit.revwalk;version="[4.5.2,4.6.0)", + org.eclipse.jgit.transport;version="[4.5.2,4.6.0)", + org.eclipse.jgit.transport.resolver;version="[4.5.2,4.6.0)", + org.eclipse.jgit.util;version="[4.5.2,4.6.0)" diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 4c5473612..bed3fc1de 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 9502a6b58..240c256e3 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 4.5.1.201703201650-r +Bundle-Version: 4.5.2.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.7 @@ -22,24 +22,24 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)", org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)", org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)", org.eclipse.jetty.util.thread;version="[9.0.0,10.0.0)", - org.eclipse.jgit.errors;version="[4.5.1,4.6.0)", - org.eclipse.jgit.http.server;version="[4.5.1,4.6.0)", - org.eclipse.jgit.http.server.glue;version="[4.5.1,4.6.0)", - org.eclipse.jgit.http.server.resolver;version="[4.5.1,4.6.0)", - org.eclipse.jgit.internal;version="[4.5.1,4.6.0)", - org.eclipse.jgit.internal.storage.dfs;version="[4.5.1,4.6.0)", - org.eclipse.jgit.internal.storage.file;version="[4.5.1,4.6.0)", - org.eclipse.jgit.junit;version="[4.5.1,4.6.0)", - org.eclipse.jgit.junit.http;version="[4.5.1,4.6.0)", - org.eclipse.jgit.lib;version="[4.5.1,4.6.0)", - org.eclipse.jgit.nls;version="[4.5.1,4.6.0)", - org.eclipse.jgit.revwalk;version="[4.5.1,4.6.0)", - org.eclipse.jgit.storage.file;version="[4.5.1,4.6.0)", - org.eclipse.jgit.transport;version="[4.5.1,4.6.0)", - org.eclipse.jgit.transport.http;version="[4.5.1,4.6.0)", - org.eclipse.jgit.transport.http.apache;version="[4.5.1,4.6.0)", - org.eclipse.jgit.transport.resolver;version="[4.5.1,4.6.0)", - org.eclipse.jgit.util;version="[4.5.1,4.6.0)", + org.eclipse.jgit.errors;version="[4.5.2,4.6.0)", + org.eclipse.jgit.http.server;version="[4.5.2,4.6.0)", + org.eclipse.jgit.http.server.glue;version="[4.5.2,4.6.0)", + org.eclipse.jgit.http.server.resolver;version="[4.5.2,4.6.0)", + org.eclipse.jgit.internal;version="[4.5.2,4.6.0)", + org.eclipse.jgit.internal.storage.dfs;version="[4.5.2,4.6.0)", + org.eclipse.jgit.internal.storage.file;version="[4.5.2,4.6.0)", + org.eclipse.jgit.junit;version="[4.5.2,4.6.0)", + org.eclipse.jgit.junit.http;version="[4.5.2,4.6.0)", + org.eclipse.jgit.lib;version="[4.5.2,4.6.0)", + org.eclipse.jgit.nls;version="[4.5.2,4.6.0)", + org.eclipse.jgit.revwalk;version="[4.5.2,4.6.0)", + org.eclipse.jgit.storage.file;version="[4.5.2,4.6.0)", + org.eclipse.jgit.transport;version="[4.5.2,4.6.0)", + org.eclipse.jgit.transport.http;version="[4.5.2,4.6.0)", + org.eclipse.jgit.transport.http.apache;version="[4.5.2,4.6.0)", + org.eclipse.jgit.transport.resolver;version="[4.5.2,4.6.0)", + org.eclipse.jgit.util;version="[4.5.2,4.6.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 23fe8baa7..590745d1b 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 780b79beb..6c32dae8a 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 4.5.1.201703201650-r +Bundle-Version: 4.5.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy @@ -20,16 +20,16 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)", org.eclipse.jetty.util.component;version="[9.0.0,10.0.0)", org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)", org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)", - org.eclipse.jgit.errors;version="[4.5.1,4.6.0)", - org.eclipse.jgit.http.server;version="[4.5.1,4.6.0)", - org.eclipse.jgit.internal.storage.file;version="[4.5.1,4.6.0)", - org.eclipse.jgit.junit;version="[4.5.1,4.6.0)", - org.eclipse.jgit.lib;version="[4.5.1,4.6.0)", - org.eclipse.jgit.revwalk;version="[4.5.1,4.6.0)", - org.eclipse.jgit.transport;version="[4.5.1,4.6.0)", - org.eclipse.jgit.transport.resolver;version="[4.5.1,4.6.0)", + org.eclipse.jgit.errors;version="[4.5.2,4.6.0)", + org.eclipse.jgit.http.server;version="[4.5.2,4.6.0)", + org.eclipse.jgit.internal.storage.file;version="[4.5.2,4.6.0)", + org.eclipse.jgit.junit;version="[4.5.2,4.6.0)", + org.eclipse.jgit.lib;version="[4.5.2,4.6.0)", + org.eclipse.jgit.revwalk;version="[4.5.2,4.6.0)", + org.eclipse.jgit.transport;version="[4.5.2,4.6.0)", + org.eclipse.jgit.transport.resolver;version="[4.5.2,4.6.0)", org.junit;version="[4.0.0,5.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="4.5.1"; +Export-Package: org.eclipse.jgit.junit.http;version="4.5.2"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.junit, javax.servlet.http, diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 2b17cbb47..305a9f7ae 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index af7ac1e42..bbbed274e 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -2,30 +2,30 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 4.5.1.201703201650-r +Bundle-Version: 4.5.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Import-Package: org.eclipse.jgit.api;version="[4.5.1,4.6.0)", - org.eclipse.jgit.api.errors;version="[4.5.1,4.6.0)", - org.eclipse.jgit.dircache;version="[4.5.1,4.6.0)", - org.eclipse.jgit.errors;version="[4.5.1,4.6.0)", - org.eclipse.jgit.internal.storage.file;version="[4.5.1,4.6.0)", - org.eclipse.jgit.internal.storage.pack;version="[4.5.1,4.6.0)", - org.eclipse.jgit.lib;version="[4.5.1,4.6.0)", - org.eclipse.jgit.merge;version="[4.5.1,4.6.0)", - org.eclipse.jgit.revwalk;version="[4.5.1,4.6.0)", - org.eclipse.jgit.storage.file;version="[4.5.1,4.6.0)", - org.eclipse.jgit.treewalk;version="[4.5.1,4.6.0)", - org.eclipse.jgit.treewalk.filter;version="[4.5.1,4.6.0)", - org.eclipse.jgit.util;version="[4.5.1,4.6.0)", - org.eclipse.jgit.util.io;version="[4.5.1,4.6.0)", +Import-Package: org.eclipse.jgit.api;version="[4.5.2,4.6.0)", + org.eclipse.jgit.api.errors;version="[4.5.2,4.6.0)", + org.eclipse.jgit.dircache;version="[4.5.2,4.6.0)", + org.eclipse.jgit.errors;version="[4.5.2,4.6.0)", + org.eclipse.jgit.internal.storage.file;version="[4.5.2,4.6.0)", + org.eclipse.jgit.internal.storage.pack;version="[4.5.2,4.6.0)", + org.eclipse.jgit.lib;version="[4.5.2,4.6.0)", + org.eclipse.jgit.merge;version="[4.5.2,4.6.0)", + org.eclipse.jgit.revwalk;version="[4.5.2,4.6.0)", + org.eclipse.jgit.storage.file;version="[4.5.2,4.6.0)", + org.eclipse.jgit.treewalk;version="[4.5.2,4.6.0)", + org.eclipse.jgit.treewalk.filter;version="[4.5.2,4.6.0)", + org.eclipse.jgit.util;version="[4.5.2,4.6.0)", + org.eclipse.jgit.util.io;version="[4.5.2,4.6.0)", org.junit;version="[4.0.0,5.0.0)", org.junit.rules;version="[4.9.0,5.0.0)", org.junit.runner;version="[4.0.0,5.0.0)", org.junit.runners.model;version="[4.5.0,5.0.0)" -Export-Package: org.eclipse.jgit.junit;version="4.5.1"; +Export-Package: org.eclipse.jgit.junit;version="4.5.2"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 1cec4b95a..6ddfe2676 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index adb1476dd..d7386d05b 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 4.5.1.201703201650-r +Bundle-Version: 4.5.2.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.7 @@ -27,11 +27,11 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)", org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)", org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)", org.eclipse.jetty.util.thread;version="[9.0.0,10.0.0)", - org.eclipse.jgit.junit.http;version="[4.5.1,4.6.0)", - org.eclipse.jgit.lfs.lib;version="[4.5.1,4.6.0)", - org.eclipse.jgit.lfs.server.fs;version="[4.5.1,4.6.0)", - org.eclipse.jgit.lfs.test;version="[4.5.1,4.6.0)", - org.eclipse.jgit.util;version="[4.5.1,4.6.0)", + org.eclipse.jgit.junit.http;version="[4.5.2,4.6.0)", + org.eclipse.jgit.lfs.lib;version="[4.5.2,4.6.0)", + org.eclipse.jgit.lfs.server.fs;version="[4.5.2,4.6.0)", + org.eclipse.jgit.lfs.test;version="[4.5.2,4.6.0)", + org.eclipse.jgit.util;version="[4.5.2,4.6.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.0.0,5.0.0)", org.junit.runner;version="[4.0.0,5.0.0)", diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index c369bb575..03c86f4ce 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index e1b189603..ac7f8c390 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -2,19 +2,19 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 4.5.1.201703201650-r +Bundle-Version: 4.5.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.lfs.server;version="4.5.1"; +Export-Package: org.eclipse.jgit.lfs.server;version="4.5.2"; uses:="javax.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="4.5.1"; + org.eclipse.jgit.lfs.server.fs;version="4.5.2"; uses:="javax.servlet, javax.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="4.5.1";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="4.5.1"; + org.eclipse.jgit.lfs.server.internal;version="4.5.2";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="4.5.2"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 @@ -24,12 +24,12 @@ Import-Package: com.google.gson;version="[2.2.4,3.0.0)", javax.servlet.http;version="[3.1.0,4.0.0)", org.apache.http;version="[4.3.0,5.0.0)", org.apache.http.client;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[4.5.1,4.6.0)", - org.eclipse.jgit.internal;version="[4.5.1,4.6.0)", - org.eclipse.jgit.internal.storage.file;version="[4.5.1,4.6.0)", - org.eclipse.jgit.lfs.errors;version="[4.5.1,4.6.0)", - org.eclipse.jgit.lfs.lib;version="[4.5.1,4.6.0)", - org.eclipse.jgit.nls;version="[4.5.1,4.6.0)", - org.eclipse.jgit.transport.http;version="[4.5.1,4.6.0)", - org.eclipse.jgit.transport.http.apache;version="[4.5.1,4.6.0)", - org.eclipse.jgit.util;version="[4.5.1,4.6.0)" + org.eclipse.jgit.annotations;version="[4.5.2,4.6.0)", + org.eclipse.jgit.internal;version="[4.5.2,4.6.0)", + org.eclipse.jgit.internal.storage.file;version="[4.5.2,4.6.0)", + org.eclipse.jgit.lfs.errors;version="[4.5.2,4.6.0)", + org.eclipse.jgit.lfs.lib;version="[4.5.2,4.6.0)", + org.eclipse.jgit.nls;version="[4.5.2,4.6.0)", + org.eclipse.jgit.transport.http;version="[4.5.2,4.6.0)", + org.eclipse.jgit.transport.http.apache;version="[4.5.2,4.6.0)", + org.eclipse.jgit.util;version="[4.5.2,4.6.0)" diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 53c144c12..7a25c30a5 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 94bb21b15..958e1bd79 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -2,18 +2,18 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 4.5.1.201703201650-r +Bundle-Version: 4.5.2.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Import-Package: org.eclipse.jgit.junit;version="[4.5.1,4.6.0)", - org.eclipse.jgit.lfs.errors;version="[4.5.1,4.6.0)", - org.eclipse.jgit.lfs.lib;version="[4.5.1,4.6.0)", - org.eclipse.jgit.lib;version="[4.5.1,4.6.0)", - org.eclipse.jgit.util;version="[4.5.1,4.6.0)", +Import-Package: org.eclipse.jgit.junit;version="[4.5.2,4.6.0)", + org.eclipse.jgit.lfs.errors;version="[4.5.2,4.6.0)", + org.eclipse.jgit.lfs.lib;version="[4.5.2,4.6.0)", + org.eclipse.jgit.lib;version="[4.5.2,4.6.0)", + org.eclipse.jgit.util;version="[4.5.2,4.6.0)", org.hamcrest.core;version="[1.1.0,2.0.0)", org.junit;version="[4.0.0,5.0.0)", org.junit.runner;version="[4.0.0,5.0.0)", org.junit.runners;version="[4.0.0,5.0.0)" -Export-Package: org.eclipse.jgit.lfs.test;version="4.5.1";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="4.5.2";x-friends:="org.eclipse.jgit.lfs.server.test" diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index b03290999..e47bf27d4 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index a135c8c7e..5ec35c2b2 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 4.5.1.201703201650-r +Bundle-Version: 4.5.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.lfs.errors;version="4.5.1", - org.eclipse.jgit.lfs.internal;version="4.5.1";x-friends:="org.eclipse.jgit.lfs.test", - org.eclipse.jgit.lfs.lib;version="4.5.1" +Export-Package: org.eclipse.jgit.lfs.errors;version="4.5.2", + org.eclipse.jgit.lfs.internal;version="4.5.2";x-friends:="org.eclipse.jgit.lfs.test", + org.eclipse.jgit.lfs.lib;version="4.5.2" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Import-Package: org.eclipse.jgit.internal.storage.file;version="[4.5.1,4.6.0)", - org.eclipse.jgit.lib;version="[4.5.1,4.6.0)", - org.eclipse.jgit.nls;version="[4.5.1,4.6.0)", - org.eclipse.jgit.util;version="[4.5.1,4.6.0)" +Import-Package: org.eclipse.jgit.internal.storage.file;version="[4.5.2,4.6.0)", + org.eclipse.jgit.lib;version="[4.5.2,4.6.0)", + org.eclipse.jgit.nls;version="[4.5.2,4.6.0)", + org.eclipse.jgit.util;version="[4.5.2,4.6.0)" diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 918effb0d..6dc1e82d6 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT org.eclipse.jgit.lfs 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 9e88cce9b..4a475def6 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 @@ 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 307a6f0a5..2d00759ed 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 @@ org.eclipse.jgit jgit.tycho.parent - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT org.eclipse.jgit.feature 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 8790f18f3..c8c32b242 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 @@ 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 b826a3a68..a53e4e974 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 @@ org.eclipse.jgit jgit.tycho.parent - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT org.eclipse.jgit.feature 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 abe0144ce..d7b43ffef 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 @@ 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 aa9f8cba9..85cfb030c 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 @@ org.eclipse.jgit jgit.tycho.parent - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 25b23e41e..b535c925d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index b1be26ebc..30809de9e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT org.eclipse.jgit.feature 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 4e7f2f9ac..2c5c042b6 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 @@ 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 76e48be75..eb6eb2c67 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 @@ org.eclipse.jgit jgit.tycho.parent - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT org.eclipse.jgit.feature 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 4d84b0488..f36b984e8 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 @@ 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 026c556ce..271bccb4c 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 @@ org.eclipse.jgit jgit.tycho.parent - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT org.eclipse.jgit.feature 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 4c905ed06..d4d51a79b 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 @@ org.eclipse.jgit jgit.tycho.parent - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT org.eclipse.jgit.repository 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 9500b5fe2..593cc6ed8 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 @@ 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 1b830a1df..0fd6a72d1 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 @@ org.eclipse.jgit jgit.tycho.parent - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT org.eclipse.jgit.feature 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 c5731afd7..9355fa760 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF @@ -2,4 +2,4 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JGit Target Platform Bundle Bundle-SymbolicName: org.eclipse.jgit.target -Bundle-Version: 4.5.1.201703201650-r +Bundle-Version: 4.5.2.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 dfba025db..f148a577e 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 @@ org.eclipse.jgit jgit.tycho.parent - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 27cd8e8ea..6f8ab4e69 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit jgit.tycho.parent - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index e6d00b890..167e21ec2 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -2,28 +2,28 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 4.5.1.201703201650-r +Bundle-Version: 4.5.2.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Import-Package: org.eclipse.jgit.api;version="[4.5.1,4.6.0)", - org.eclipse.jgit.api.errors;version="[4.5.1,4.6.0)", - org.eclipse.jgit.diff;version="[4.5.1,4.6.0)", - org.eclipse.jgit.dircache;version="[4.5.1,4.6.0)", - org.eclipse.jgit.internal.storage.file;version="4.5.1", - org.eclipse.jgit.junit;version="[4.5.1,4.6.0)", - org.eclipse.jgit.lib;version="[4.5.1,4.6.0)", - org.eclipse.jgit.merge;version="[4.5.1,4.6.0)", - org.eclipse.jgit.pgm;version="[4.5.1,4.6.0)", - org.eclipse.jgit.pgm.internal;version="[4.5.1,4.6.0)", - org.eclipse.jgit.pgm.opt;version="[4.5.1,4.6.0)", - org.eclipse.jgit.revwalk;version="[4.5.1,4.6.0)", - org.eclipse.jgit.storage.file;version="[4.5.1,4.6.0)", - org.eclipse.jgit.transport;version="[4.5.1,4.6.0)", - org.eclipse.jgit.treewalk;version="[4.5.1,4.6.0)", - org.eclipse.jgit.util;version="[4.5.1,4.6.0)", - org.eclipse.jgit.util.io;version="[4.5.1,4.6.0)", +Import-Package: org.eclipse.jgit.api;version="[4.5.2,4.6.0)", + org.eclipse.jgit.api.errors;version="[4.5.2,4.6.0)", + org.eclipse.jgit.diff;version="[4.5.2,4.6.0)", + org.eclipse.jgit.dircache;version="[4.5.2,4.6.0)", + org.eclipse.jgit.internal.storage.file;version="4.5.2", + org.eclipse.jgit.junit;version="[4.5.2,4.6.0)", + org.eclipse.jgit.lib;version="[4.5.2,4.6.0)", + org.eclipse.jgit.merge;version="[4.5.2,4.6.0)", + org.eclipse.jgit.pgm;version="[4.5.2,4.6.0)", + org.eclipse.jgit.pgm.internal;version="[4.5.2,4.6.0)", + org.eclipse.jgit.pgm.opt;version="[4.5.2,4.6.0)", + org.eclipse.jgit.revwalk;version="[4.5.2,4.6.0)", + org.eclipse.jgit.storage.file;version="[4.5.2,4.6.0)", + org.eclipse.jgit.transport;version="[4.5.2,4.6.0)", + org.eclipse.jgit.treewalk;version="[4.5.2,4.6.0)", + org.eclipse.jgit.util;version="[4.5.2,4.6.0)", + org.eclipse.jgit.util.io;version="[4.5.2,4.6.0)", org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", org.junit;version="[4.11.0,5.0.0)", org.junit.rules;version="[4.11.0,5.0.0)", diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 9e0430423..e644cff03 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index f9ba98357..a30e4fcee 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 4.5.1.201703201650-r +Bundle-Version: 4.5.2.qualifier Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-Localization: plugin @@ -26,45 +26,45 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)", org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)", org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)", org.eclipse.jetty.util.thread;version="[9.0.0,10.0.0)", - org.eclipse.jgit.api;version="[4.5.1,4.6.0)", - org.eclipse.jgit.api.errors;version="[4.5.1,4.6.0)", - org.eclipse.jgit.archive;version="[4.5.1,4.6.0)", - org.eclipse.jgit.awtui;version="[4.5.1,4.6.0)", - org.eclipse.jgit.blame;version="[4.5.1,4.6.0)", - org.eclipse.jgit.diff;version="[4.5.1,4.6.0)", - org.eclipse.jgit.dircache;version="[4.5.1,4.6.0)", - org.eclipse.jgit.errors;version="[4.5.1,4.6.0)", - org.eclipse.jgit.gitrepo;version="[4.5.1,4.6.0)", - org.eclipse.jgit.internal.ketch;version="[4.5.1,4.6.0)", - org.eclipse.jgit.internal.storage.file;version="[4.5.1,4.6.0)", - org.eclipse.jgit.internal.storage.pack;version="[4.5.1,4.6.0)", - org.eclipse.jgit.internal.storage.reftree;version="[4.5.1,4.6.0)", - org.eclipse.jgit.lfs.lib;version="[4.5.1,4.6.0)", - org.eclipse.jgit.lfs.server;version="[4.5.1,4.6.0)", - org.eclipse.jgit.lfs.server.fs;version="[4.5.1,4.6.0)", - org.eclipse.jgit.lfs.server.s3;version="[4.5.1,4.6.0)", - org.eclipse.jgit.lib;version="[4.5.1,4.6.0)", - org.eclipse.jgit.merge;version="[4.5.1,4.6.0)", - org.eclipse.jgit.nls;version="[4.5.1,4.6.0)", - org.eclipse.jgit.notes;version="[4.5.1,4.6.0)", - org.eclipse.jgit.revplot;version="[4.5.1,4.6.0)", - org.eclipse.jgit.revwalk;version="[4.5.1,4.6.0)", - org.eclipse.jgit.revwalk.filter;version="[4.5.1,4.6.0)", - org.eclipse.jgit.storage.file;version="[4.5.1,4.6.0)", - org.eclipse.jgit.storage.pack;version="[4.5.1,4.6.0)", - org.eclipse.jgit.transport;version="[4.5.1,4.6.0)", - org.eclipse.jgit.transport.http.apache;version="[4.5.1,4.6.0)", - org.eclipse.jgit.transport.resolver;version="[4.5.1,4.6.0)", - org.eclipse.jgit.treewalk;version="[4.5.1,4.6.0)", - org.eclipse.jgit.treewalk.filter;version="[4.5.1,4.6.0)", - org.eclipse.jgit.util;version="[4.5.1,4.6.0)", - org.eclipse.jgit.util.io;version="[4.5.1,4.6.0)", + org.eclipse.jgit.api;version="[4.5.2,4.6.0)", + org.eclipse.jgit.api.errors;version="[4.5.2,4.6.0)", + org.eclipse.jgit.archive;version="[4.5.2,4.6.0)", + org.eclipse.jgit.awtui;version="[4.5.2,4.6.0)", + org.eclipse.jgit.blame;version="[4.5.2,4.6.0)", + org.eclipse.jgit.diff;version="[4.5.2,4.6.0)", + org.eclipse.jgit.dircache;version="[4.5.2,4.6.0)", + org.eclipse.jgit.errors;version="[4.5.2,4.6.0)", + org.eclipse.jgit.gitrepo;version="[4.5.2,4.6.0)", + org.eclipse.jgit.internal.ketch;version="[4.5.2,4.6.0)", + org.eclipse.jgit.internal.storage.file;version="[4.5.2,4.6.0)", + org.eclipse.jgit.internal.storage.pack;version="[4.5.2,4.6.0)", + org.eclipse.jgit.internal.storage.reftree;version="[4.5.2,4.6.0)", + org.eclipse.jgit.lfs.lib;version="[4.5.2,4.6.0)", + org.eclipse.jgit.lfs.server;version="[4.5.2,4.6.0)", + org.eclipse.jgit.lfs.server.fs;version="[4.5.2,4.6.0)", + org.eclipse.jgit.lfs.server.s3;version="[4.5.2,4.6.0)", + org.eclipse.jgit.lib;version="[4.5.2,4.6.0)", + org.eclipse.jgit.merge;version="[4.5.2,4.6.0)", + org.eclipse.jgit.nls;version="[4.5.2,4.6.0)", + org.eclipse.jgit.notes;version="[4.5.2,4.6.0)", + org.eclipse.jgit.revplot;version="[4.5.2,4.6.0)", + org.eclipse.jgit.revwalk;version="[4.5.2,4.6.0)", + org.eclipse.jgit.revwalk.filter;version="[4.5.2,4.6.0)", + org.eclipse.jgit.storage.file;version="[4.5.2,4.6.0)", + org.eclipse.jgit.storage.pack;version="[4.5.2,4.6.0)", + org.eclipse.jgit.transport;version="[4.5.2,4.6.0)", + org.eclipse.jgit.transport.http.apache;version="[4.5.2,4.6.0)", + org.eclipse.jgit.transport.resolver;version="[4.5.2,4.6.0)", + org.eclipse.jgit.treewalk;version="[4.5.2,4.6.0)", + org.eclipse.jgit.treewalk.filter;version="[4.5.2,4.6.0)", + org.eclipse.jgit.util;version="[4.5.2,4.6.0)", + org.eclipse.jgit.util.io;version="[4.5.2,4.6.0)", org.kohsuke.args4j;version="[2.0.12,2.1.0)", org.kohsuke.args4j.spi;version="[2.0.15,2.1.0)" -Export-Package: org.eclipse.jgit.console;version="4.5.1"; +Export-Package: org.eclipse.jgit.console;version="4.5.2"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="4.5.1"; + org.eclipse.jgit.pgm;version="4.5.2"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.pgm.opt, @@ -75,11 +75,11 @@ Export-Package: org.eclipse.jgit.console;version="4.5.1"; org.eclipse.jgit.treewalk, javax.swing, org.eclipse.jgit.transport", - org.eclipse.jgit.pgm.debug;version="4.5.1"; + org.eclipse.jgit.pgm.debug;version="4.5.2"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm", - org.eclipse.jgit.pgm.internal;version="4.5.1";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="4.5.1"; + org.eclipse.jgit.pgm.internal;version="4.5.2";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test", + org.eclipse.jgit.pgm.opt;version="4.5.2"; 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 47dacdef9..98ad3437f 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 4.5.1.201703201650-r -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="4.5.1.201703201650-r";roots="." +Bundle-Version: 4.5.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="4.5.2.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 14e32a8b1..57e46c855 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 407eec2ef..ced3e02e0 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -2,52 +2,52 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 4.5.1.201703201650-r +Bundle-Version: 4.5.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: com.googlecode.javaewah;version="[0.7.9,0.8.0)", - org.eclipse.jgit.api;version="[4.5.1,4.6.0)", - org.eclipse.jgit.api.errors;version="[4.5.1,4.6.0)", - org.eclipse.jgit.attributes;version="[4.5.1,4.6.0)", - org.eclipse.jgit.awtui;version="[4.5.1,4.6.0)", - org.eclipse.jgit.blame;version="[4.5.1,4.6.0)", - org.eclipse.jgit.diff;version="[4.5.1,4.6.0)", - org.eclipse.jgit.dircache;version="[4.5.1,4.6.0)", - org.eclipse.jgit.errors;version="[4.5.1,4.6.0)", - org.eclipse.jgit.events;version="[4.5.1,4.6.0)", - org.eclipse.jgit.fnmatch;version="[4.5.1,4.6.0)", - org.eclipse.jgit.gitrepo;version="[4.5.1,4.6.0)", - org.eclipse.jgit.hooks;version="[4.5.1,4.6.0)", - org.eclipse.jgit.ignore;version="[4.5.1,4.6.0)", - org.eclipse.jgit.ignore.internal;version="[4.5.1,4.6.0)", - org.eclipse.jgit.internal;version="[4.5.1,4.6.0)", - org.eclipse.jgit.internal.storage.dfs;version="[4.5.1,4.6.0)", - org.eclipse.jgit.internal.storage.file;version="[4.5.1,4.6.0)", - org.eclipse.jgit.internal.storage.pack;version="[4.5.1,4.6.0)", - org.eclipse.jgit.internal.storage.reftree;version="[4.5.1,4.6.0)", - org.eclipse.jgit.junit;version="[4.5.1,4.6.0)", - org.eclipse.jgit.lib;version="[4.5.1,4.6.0)", - org.eclipse.jgit.merge;version="[4.5.1,4.6.0)", - org.eclipse.jgit.nls;version="[4.5.1,4.6.0)", - org.eclipse.jgit.notes;version="[4.5.1,4.6.0)", - org.eclipse.jgit.patch;version="[4.5.1,4.6.0)", - org.eclipse.jgit.pgm;version="[4.5.1,4.6.0)", - org.eclipse.jgit.pgm.internal;version="[4.5.1,4.6.0)", - org.eclipse.jgit.revplot;version="[4.5.1,4.6.0)", - org.eclipse.jgit.revwalk;version="[4.5.1,4.6.0)", - org.eclipse.jgit.revwalk.filter;version="[4.5.1,4.6.0)", - org.eclipse.jgit.storage.file;version="[4.5.1,4.6.0)", - org.eclipse.jgit.storage.pack;version="[4.5.1,4.6.0)", - org.eclipse.jgit.submodule;version="[4.5.1,4.6.0)", - org.eclipse.jgit.transport;version="[4.5.1,4.6.0)", - org.eclipse.jgit.transport.http;version="[4.5.1,4.6.0)", - org.eclipse.jgit.transport.resolver;version="[4.5.1,4.6.0)", - org.eclipse.jgit.treewalk;version="[4.5.1,4.6.0)", - org.eclipse.jgit.treewalk.filter;version="[4.5.1,4.6.0)", - org.eclipse.jgit.util;version="[4.5.1,4.6.0)", - org.eclipse.jgit.util.io;version="[4.5.1,4.6.0)", + org.eclipse.jgit.api;version="[4.5.2,4.6.0)", + org.eclipse.jgit.api.errors;version="[4.5.2,4.6.0)", + org.eclipse.jgit.attributes;version="[4.5.2,4.6.0)", + org.eclipse.jgit.awtui;version="[4.5.2,4.6.0)", + org.eclipse.jgit.blame;version="[4.5.2,4.6.0)", + org.eclipse.jgit.diff;version="[4.5.2,4.6.0)", + org.eclipse.jgit.dircache;version="[4.5.2,4.6.0)", + org.eclipse.jgit.errors;version="[4.5.2,4.6.0)", + org.eclipse.jgit.events;version="[4.5.2,4.6.0)", + org.eclipse.jgit.fnmatch;version="[4.5.2,4.6.0)", + org.eclipse.jgit.gitrepo;version="[4.5.2,4.6.0)", + org.eclipse.jgit.hooks;version="[4.5.2,4.6.0)", + org.eclipse.jgit.ignore;version="[4.5.2,4.6.0)", + org.eclipse.jgit.ignore.internal;version="[4.5.2,4.6.0)", + org.eclipse.jgit.internal;version="[4.5.2,4.6.0)", + org.eclipse.jgit.internal.storage.dfs;version="[4.5.2,4.6.0)", + org.eclipse.jgit.internal.storage.file;version="[4.5.2,4.6.0)", + org.eclipse.jgit.internal.storage.pack;version="[4.5.2,4.6.0)", + org.eclipse.jgit.internal.storage.reftree;version="[4.5.2,4.6.0)", + org.eclipse.jgit.junit;version="[4.5.2,4.6.0)", + org.eclipse.jgit.lib;version="[4.5.2,4.6.0)", + org.eclipse.jgit.merge;version="[4.5.2,4.6.0)", + org.eclipse.jgit.nls;version="[4.5.2,4.6.0)", + org.eclipse.jgit.notes;version="[4.5.2,4.6.0)", + org.eclipse.jgit.patch;version="[4.5.2,4.6.0)", + org.eclipse.jgit.pgm;version="[4.5.2,4.6.0)", + org.eclipse.jgit.pgm.internal;version="[4.5.2,4.6.0)", + org.eclipse.jgit.revplot;version="[4.5.2,4.6.0)", + org.eclipse.jgit.revwalk;version="[4.5.2,4.6.0)", + org.eclipse.jgit.revwalk.filter;version="[4.5.2,4.6.0)", + org.eclipse.jgit.storage.file;version="[4.5.2,4.6.0)", + org.eclipse.jgit.storage.pack;version="[4.5.2,4.6.0)", + org.eclipse.jgit.submodule;version="[4.5.2,4.6.0)", + org.eclipse.jgit.transport;version="[4.5.2,4.6.0)", + org.eclipse.jgit.transport.http;version="[4.5.2,4.6.0)", + org.eclipse.jgit.transport.resolver;version="[4.5.2,4.6.0)", + org.eclipse.jgit.treewalk;version="[4.5.2,4.6.0)", + org.eclipse.jgit.treewalk.filter;version="[4.5.2,4.6.0)", + org.eclipse.jgit.util;version="[4.5.2,4.6.0)", + org.eclipse.jgit.util.io;version="[4.5.2,4.6.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 36b515b85..a9ff18052 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index fff2c6b3e..f3c721361 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 4.5.1.201703201650-r +Bundle-Version: 4.5.2.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Export-Package: org.eclipse.jgit.awtui;version="4.5.1" -Import-Package: org.eclipse.jgit.errors;version="[4.5.1,4.6.0)", - org.eclipse.jgit.lib;version="[4.5.1,4.6.0)", - org.eclipse.jgit.nls;version="[4.5.1,4.6.0)", - org.eclipse.jgit.revplot;version="[4.5.1,4.6.0)", - org.eclipse.jgit.revwalk;version="[4.5.1,4.6.0)", - org.eclipse.jgit.transport;version="[4.5.1,4.6.0)", - org.eclipse.jgit.util;version="[4.5.1,4.6.0)" +Export-Package: org.eclipse.jgit.awtui;version="4.5.2" +Import-Package: org.eclipse.jgit.errors;version="[4.5.2,4.6.0)", + org.eclipse.jgit.lib;version="[4.5.2,4.6.0)", + org.eclipse.jgit.nls;version="[4.5.2,4.6.0)", + org.eclipse.jgit.revplot;version="[4.5.2,4.6.0)", + org.eclipse.jgit.revwalk;version="[4.5.2,4.6.0)", + org.eclipse.jgit.transport;version="[4.5.2,4.6.0)", + org.eclipse.jgit.util;version="[4.5.2,4.6.0)" diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 2d9f75a2a..2bb1e34e8 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -52,7 +52,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 189a7c7c0..98c4710be 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 4.5.1.201703201650-r +Bundle-Version: 4.5.2.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.jgit.annotations;version="4.5.1", - org.eclipse.jgit.api;version="4.5.1"; +Export-Package: org.eclipse.jgit.annotations;version="4.5.2", + org.eclipse.jgit.api;version="4.5.2"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff, @@ -21,50 +21,50 @@ Export-Package: org.eclipse.jgit.annotations;version="4.5.1", org.eclipse.jgit.submodule, org.eclipse.jgit.transport, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="4.5.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="4.5.1", - org.eclipse.jgit.blame;version="4.5.1"; + org.eclipse.jgit.api.errors;version="4.5.2";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors", + org.eclipse.jgit.attributes;version="4.5.2", + org.eclipse.jgit.blame;version="4.5.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff", - org.eclipse.jgit.diff;version="4.5.1"; + org.eclipse.jgit.diff;version="4.5.2"; uses:="org.eclipse.jgit.patch, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="4.5.1"; + org.eclipse.jgit.dircache;version="4.5.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.util, org.eclipse.jgit.events, org.eclipse.jgit.attributes", - org.eclipse.jgit.errors;version="4.5.1"; + org.eclipse.jgit.errors;version="4.5.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.internal.storage.pack, org.eclipse.jgit.transport, org.eclipse.jgit.dircache", - org.eclipse.jgit.events;version="4.5.1";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="4.5.1", - org.eclipse.jgit.gitrepo;version="4.5.1"; + org.eclipse.jgit.events;version="4.5.2";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.fnmatch;version="4.5.2", + org.eclipse.jgit.gitrepo;version="4.5.2"; uses:="org.eclipse.jgit.api, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax.helpers, org.xml.sax", - org.eclipse.jgit.gitrepo.internal;version="4.5.1";x-internal:=true, - org.eclipse.jgit.hooks;version="4.5.1";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.ignore;version="4.5.1", - org.eclipse.jgit.ignore.internal;version="4.5.1";x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="4.5.1";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.ketch;version="4.5.1";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.dfs;version="4.5.1"; + org.eclipse.jgit.gitrepo.internal;version="4.5.2";x-internal:=true, + org.eclipse.jgit.hooks;version="4.5.2";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.ignore;version="4.5.2", + org.eclipse.jgit.ignore.internal;version="4.5.2";x-friends:="org.eclipse.jgit.test", + org.eclipse.jgit.internal;version="4.5.2";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test", + org.eclipse.jgit.internal.ketch;version="4.5.2";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.internal.storage.dfs;version="4.5.2"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.server, org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.storage.file;version="4.5.1"; + org.eclipse.jgit.internal.storage.file;version="4.5.2"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, @@ -72,9 +72,9 @@ Export-Package: org.eclipse.jgit.annotations;version="4.5.1", org.eclipse.jgit.lfs.server, org.eclipse.jgit.pgm, org.eclipse.jgit.pgm.test", - org.eclipse.jgit.internal.storage.pack;version="4.5.1";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftree;version="4.5.1";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", - org.eclipse.jgit.lib;version="4.5.1"; + org.eclipse.jgit.internal.storage.pack;version="4.5.2";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.internal.storage.reftree;version="4.5.2";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm", + org.eclipse.jgit.lib;version="4.5.2"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util, @@ -84,32 +84,32 @@ Export-Package: org.eclipse.jgit.annotations;version="4.5.1", org.eclipse.jgit.treewalk, org.eclipse.jgit.transport, org.eclipse.jgit.submodule", - org.eclipse.jgit.merge;version="4.5.1"; + org.eclipse.jgit.merge;version="4.5.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.diff, org.eclipse.jgit.dircache, org.eclipse.jgit.api", - org.eclipse.jgit.nls;version="4.5.1", - org.eclipse.jgit.notes;version="4.5.1"; + org.eclipse.jgit.nls;version="4.5.2", + org.eclipse.jgit.notes;version="4.5.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.revwalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="4.5.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="4.5.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="4.5.1"; + org.eclipse.jgit.patch;version="4.5.2";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff", + org.eclipse.jgit.revplot;version="4.5.2";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk", + org.eclipse.jgit.revwalk;version="4.5.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff, org.eclipse.jgit.revwalk.filter", - org.eclipse.jgit.revwalk.filter;version="4.5.1";uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.lib,org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="4.5.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="4.5.1";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="4.5.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk.filter,org.eclipse.jgit.treewalk", - org.eclipse.jgit.transport;version="4.5.1"; + org.eclipse.jgit.revwalk.filter;version="4.5.2";uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.lib,org.eclipse.jgit.util", + org.eclipse.jgit.storage.file;version="4.5.2";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util", + org.eclipse.jgit.storage.pack;version="4.5.2";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.submodule;version="4.5.2";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk.filter,org.eclipse.jgit.treewalk", + org.eclipse.jgit.transport;version="4.5.2"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.revwalk, org.eclipse.jgit.internal.storage.pack, @@ -121,22 +121,22 @@ Export-Package: org.eclipse.jgit.annotations;version="4.5.1", org.eclipse.jgit.transport.http, org.eclipse.jgit.errors, org.eclipse.jgit.storage.pack", - org.eclipse.jgit.transport.http;version="4.5.1";uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="4.5.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport", - org.eclipse.jgit.treewalk;version="4.5.1"; + org.eclipse.jgit.transport.http;version="4.5.2";uses:="javax.net.ssl", + org.eclipse.jgit.transport.resolver;version="4.5.2";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport", + org.eclipse.jgit.treewalk;version="4.5.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.attributes, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util, org.eclipse.jgit.dircache", - org.eclipse.jgit.treewalk.filter;version="4.5.1";uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="4.5.1"; + org.eclipse.jgit.treewalk.filter;version="4.5.2";uses:="org.eclipse.jgit.treewalk", + org.eclipse.jgit.util;version="4.5.2"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.transport.http, org.eclipse.jgit.storage.file, org.ietf.jgss", - org.eclipse.jgit.util.io;version="4.5.1" + org.eclipse.jgit.util.io;version="4.5.2" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: com.googlecode.javaewah;version="[0.7.9,0.8.0)", com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index fecd33b6d..3989c2378 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 4.5.1.201703201650-r -Eclipse-SourceBundle: org.eclipse.jgit;version="4.5.1.201703201650-r";roots="." +Bundle-Version: 4.5.2.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="4.5.2.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index f25017df0..78268bb18 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -53,7 +53,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 72ffdbb53..a54fcdb85 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 4.5.1.201703201650-r + 4.5.2-SNAPSHOT JGit - Parent ${jgit-url} From 363a3657b133ea4668bd832410eff67cfdb7dfd1 Mon Sep 17 00:00:00 2001 From: Luca Milanesio Date: Fri, 24 Mar 2017 00:18:12 +0000 Subject: [PATCH 2/3] Don't flag a packfile invalid if opening existing file failed A packfile random file open operation may fail with a FileNotFoundException even if the file exists, possibly for the temporary lack of resources. Instead of managing the FileNotFoundException as any generic IOException it is best to rethrow the exception but prevent the packfile for being flagged as invalid until it is actually opened and read successfully or unsuccessfully. Bug: 514170 Change-Id: Ie37edba2df77052bceafc0b314fd1d487544bf35 Signed-off-by: Luca Milanesio Signed-off-by: Matthias Sohn --- .../org/eclipse/jgit/internal/storage/file/PackFile.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java index e004f9090..d33148152 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java @@ -50,6 +50,7 @@ import static org.eclipse.jgit.internal.storage.pack.PackExt.INDEX; import java.io.EOFException; import java.io.File; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.InterruptedIOException; import java.io.RandomAccessFile; @@ -635,6 +636,12 @@ public class PackFile implements Iterable { // don't invalidate the pack, we are interrupted from another thread openFail(false); throw e; + } catch (FileNotFoundException fn) { + // don't invalidate the pack if opening an existing file failed + // since it may be related to a temporary lack of resources (e.g. + // max open files) + openFail(!packFile.exists()); + throw fn; } catch (IOException ioe) { openFail(true); throw ioe; From aaf3c5154ea3b8a367266a7be7100ad7386a84b3 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 25 Mar 2017 02:33:06 +0100 Subject: [PATCH 3/3] Only mark packfile invalid if exception signals permanent problem Add NoPackSignatureException and UnsupportedPackVersionException to explicitly mark permanent unrecoverable problems with a pack Assume problem with a pack is permanent only if we are sure the exception signals a non-transient problem we can't recover from: - AccessDeniedException: we lack permissions - CorruptObjectException: we detected corruption - EOFException: file ended unexpectedly - NoPackSignatureException: pack has no pack signature - NoSuchFileException: file has gone missing - PackMismatchException: pack no longer matches its index - UnpackException: unpacking failed - UnsupportedPackIndexVersionException: unsupported pack index version - UnsupportedPackVersionException: unsupported pack version Do not attempt to handle Errors since they are thrown for serious problems applications should not try to recover from. Change-Id: I2c416ce2b0e23255c4fb03a3f9a0ee237f7a484a Signed-off-by: Matthias Sohn --- org.eclipse.jgit/.settings/.api_filters | 11 +++ .../jgit/errors/NoPackSignatureException.java | 66 ++++++++++++++++++ .../UnsupportedPackIndexVersionException.java | 69 +++++++++++++++++++ .../UnsupportedPackVersionException.java | 69 +++++++++++++++++++ .../jgit/internal/storage/file/PackFile.java | 43 ++++++++---- .../jgit/internal/storage/file/PackIndex.java | 5 +- 6 files changed, 245 insertions(+), 18 deletions(-) create mode 100644 org.eclipse.jgit/.settings/.api_filters create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/errors/NoPackSignatureException.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/errors/UnsupportedPackIndexVersionException.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/errors/UnsupportedPackVersionException.java diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters new file mode 100644 index 000000000..2c27b051b --- /dev/null +++ b/org.eclipse.jgit/.settings/.api_filters @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/NoPackSignatureException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/NoPackSignatureException.java new file mode 100644 index 000000000..28e978897 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/NoPackSignatureException.java @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2017, Matthias Sohn + * and other copyright owners as documented in the project's IP log. + * + * This program and the accompanying materials are made available + * under the terms of the Eclipse Distribution License v1.0 which + * accompanies this distribution, is reproduced below, and is + * available at http://www.eclipse.org/org/documents/edl-v10.php + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * + * - Neither the name of the Eclipse Foundation, Inc. nor the + * names of its contributors may be used to endorse or promote + * products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.eclipse.jgit.errors; + +import java.io.IOException; + +/** + * Thrown when a PackFile is found not to contain the pack signature defined by + * git. + * + * @since 4.5 + */ +public class NoPackSignatureException extends IOException { + private static final long serialVersionUID = 1L; + + /** + * Construct an exception. + * + * @param why + * description of the type of error. + */ + public NoPackSignatureException(final String why) { + super(why); + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/UnsupportedPackIndexVersionException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/UnsupportedPackIndexVersionException.java new file mode 100644 index 000000000..0b7ccf577 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/UnsupportedPackIndexVersionException.java @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2017, Matthias Sohn + * and other copyright owners as documented in the project's IP log. + * + * This program and the accompanying materials are made available + * under the terms of the Eclipse Distribution License v1.0 which + * accompanies this distribution, is reproduced below, and is + * available at http://www.eclipse.org/org/documents/edl-v10.php + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * + * - Neither the name of the Eclipse Foundation, Inc. nor the + * names of its contributors may be used to endorse or promote + * products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.eclipse.jgit.errors; + +import java.io.IOException; +import java.text.MessageFormat; + +import org.eclipse.jgit.internal.JGitText; + +/** + * Thrown when a PackIndex uses an index version not supported by JGit. + * + * @since 4.5 + */ +public class UnsupportedPackIndexVersionException extends IOException { + private static final long serialVersionUID = 1L; + + /** + * Construct an exception. + * + * @param version + * pack index version + */ + public UnsupportedPackIndexVersionException(final int version) { + super(MessageFormat.format(JGitText.get().unsupportedPackIndexVersion, + Integer.valueOf(version))); + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/UnsupportedPackVersionException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/UnsupportedPackVersionException.java new file mode 100644 index 000000000..23611867b --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/UnsupportedPackVersionException.java @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2017, Matthias Sohn + * and other copyright owners as documented in the project's IP log. + * + * This program and the accompanying materials are made available + * under the terms of the Eclipse Distribution License v1.0 which + * accompanies this distribution, is reproduced below, and is + * available at http://www.eclipse.org/org/documents/edl-v10.php + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * + * - Neither the name of the Eclipse Foundation, Inc. nor the + * names of its contributors may be used to endorse or promote + * products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.eclipse.jgit.errors; + +import java.io.IOException; +import java.text.MessageFormat; + +import org.eclipse.jgit.internal.JGitText; + +/** + * Thrown when a PackFile uses a pack version not supported by JGit. + * + * @since 4.5 + */ +public class UnsupportedPackVersionException extends IOException { + private static final long serialVersionUID = 1L; + + /** + * Construct an exception. + * + * @param version + * pack version + */ + public UnsupportedPackVersionException(final long version) { + super(MessageFormat.format(JGitText.get().unsupportedPackVersion, + Long.valueOf(version))); + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java index d33148152..038172f92 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java @@ -56,6 +56,8 @@ import java.io.InterruptedIOException; import java.io.RandomAccessFile; import java.nio.MappedByteBuffer; import java.nio.channels.FileChannel.MapMode; +import java.nio.file.AccessDeniedException; +import java.nio.file.NoSuchFileException; import java.text.MessageFormat; import java.util.Arrays; import java.util.Collections; @@ -70,9 +72,13 @@ import java.util.zip.Inflater; import org.eclipse.jgit.errors.CorruptObjectException; import org.eclipse.jgit.errors.LargeObjectException; import org.eclipse.jgit.errors.MissingObjectException; +import org.eclipse.jgit.errors.NoPackSignatureException; import org.eclipse.jgit.errors.PackInvalidException; import org.eclipse.jgit.errors.PackMismatchException; import org.eclipse.jgit.errors.StoredObjectRepresentationNotAvailableException; +import org.eclipse.jgit.errors.UnpackException; +import org.eclipse.jgit.errors.UnsupportedPackIndexVersionException; +import org.eclipse.jgit.errors.UnsupportedPackVersionException; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.internal.storage.pack.BinaryDelta; import org.eclipse.jgit.internal.storage.pack.ObjectToPack; @@ -642,15 +648,19 @@ public class PackFile implements Iterable { // max open files) openFail(!packFile.exists()); throw fn; - } catch (IOException ioe) { + } catch (EOFException | AccessDeniedException | NoSuchFileException + | CorruptObjectException | NoPackSignatureException + | PackMismatchException | UnpackException + | UnsupportedPackIndexVersionException + | UnsupportedPackVersionException pe) { + // exceptions signaling permanent problems with a pack openFail(true); - throw ioe; - } catch (RuntimeException re) { - openFail(true); - throw re; - } catch (Error re) { - openFail(true); - throw re; + throw pe; + } catch (IOException | RuntimeException ge) { + // generic exceptions could be transient so we should not mark the + // pack invalid to avoid false MissingObjectExceptions + openFail(false); + throw ge; } } @@ -717,28 +727,31 @@ public class PackFile implements Iterable { fd.seek(0); fd.readFully(buf, 0, 12); - if (RawParseUtils.match(buf, 0, Constants.PACK_SIGNATURE) != 4) - throw new IOException(JGitText.get().notAPACKFile); + if (RawParseUtils.match(buf, 0, Constants.PACK_SIGNATURE) != 4) { + throw new NoPackSignatureException(JGitText.get().notAPACKFile); + } final long vers = NB.decodeUInt32(buf, 4); final long packCnt = NB.decodeUInt32(buf, 8); - if (vers != 2 && vers != 3) - throw new IOException(MessageFormat.format( - JGitText.get().unsupportedPackVersion, Long.valueOf(vers))); + if (vers != 2 && vers != 3) { + throw new UnsupportedPackVersionException(vers); + } - if (packCnt != idx.getObjectCount()) + if (packCnt != idx.getObjectCount()) { throw new PackMismatchException(MessageFormat.format( JGitText.get().packObjectCountMismatch, Long.valueOf(packCnt), Long.valueOf(idx.getObjectCount()), getPackFile())); + } fd.seek(length - 20); fd.readFully(buf, 0, 20); - if (!Arrays.equals(buf, packChecksum)) + if (!Arrays.equals(buf, packChecksum)) { throw new PackMismatchException(MessageFormat.format( JGitText.get().packObjectCountMismatch , ObjectId.fromRaw(buf).name() , ObjectId.fromRaw(idx.packChecksum).name() , getPackFile())); + } } ObjectLoader load(final WindowCursor curs, long pos) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java index f36bd4d70..5d4a30ff2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java @@ -55,6 +55,7 @@ import java.util.Set; import org.eclipse.jgit.errors.CorruptObjectException; import org.eclipse.jgit.errors.MissingObjectException; +import org.eclipse.jgit.errors.UnsupportedPackIndexVersionException; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.lib.AbbreviatedObjectId; import org.eclipse.jgit.lib.AnyObjectId; @@ -138,9 +139,7 @@ public abstract class PackIndex case 2: return new PackIndexV2(fd); default: - throw new IOException(MessageFormat.format( - JGitText.get().unsupportedPackIndexVersion, - Integer.valueOf(v))); + throw new UnsupportedPackIndexVersionException(v); } } return new PackIndexV1(fd, hdr);