diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2015-09-28 14:21:47 +0200 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2015-09-28 14:27:24 +0200 |
commit | 25b7a0124f6043df514d9f65bbc6f3d135b46a93 (patch) | |
tree | 4da1eb93d66d30d63b7785c02fa02526cbd87974 /org.eclipse.jgit.archive | |
parent | 9e5380e7fb797e83b6f6b5754249bea4cae534e7 (diff) | |
parent | 729f085ac21507e631361cf97457e0edd5a7370c (diff) | |
download | jgit-25b7a0124f6043df514d9f65bbc6f3d135b46a93.tar.gz jgit-25b7a0124f6043df514d9f65bbc6f3d135b46a93.zip |
Merge branch 'stable-4.1'
* stable-4.1:
Prepare 4.1.1-SNAPSHOT builds
JGit v4.1.0.201509280440-r
Change-Id: Ie898f10c39f32419628f2b6dff7e3ec083ddfdfe
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.archive')
-rw-r--r-- | org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 12 | ||||
-rw-r--r-- | org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF | 4 | ||||
-rw-r--r-- | org.eclipse.jgit.archive/pom.xml | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 98fc610bc0..0d073188c8 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.1.0.qualifier +Bundle-Version: 4.1.1.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.1.0,4.2.0)", - org.eclipse.jgit.lib;version="[4.1.0,4.2.0)", - org.eclipse.jgit.nls;version="[4.1.0,4.2.0)", - org.eclipse.jgit.util;version="[4.1.0,4.2.0)", + org.eclipse.jgit.api;version="[4.1.1,4.2.0)", + org.eclipse.jgit.lib;version="[4.1.1,4.2.0)", + org.eclipse.jgit.nls;version="[4.1.1,4.2.0)", + org.eclipse.jgit.util;version="[4.1.1,4.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="4.1.0"; +Export-Package: org.eclipse.jgit.archive;version="4.1.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.api, org.apache.commons.compress.archivers, diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 2d431c4646..743fe11f0d 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.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.1.0.qualifier";roots="." +Bundle-Version: 4.1.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.1.1.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 3fdc347989..65e87aa681 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.archive</artifactId> |