summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.http.test
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2015-09-28 14:21:47 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2015-09-28 14:27:24 +0200
commit25b7a0124f6043df514d9f65bbc6f3d135b46a93 (patch)
tree4da1eb93d66d30d63b7785c02fa02526cbd87974 /org.eclipse.jgit.http.test
parent9e5380e7fb797e83b6f6b5754249bea4cae534e7 (diff)
parent729f085ac21507e631361cf97457e0edd5a7370c (diff)
downloadjgit-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.http.test')
-rw-r--r--org.eclipse.jgit.http.test/META-INF/MANIFEST.MF36
-rw-r--r--org.eclipse.jgit.http.test/pom.xml2
2 files changed, 19 insertions, 19 deletions
diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
index cd7cff45f2..8aaeeb0324 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.1.0.qualifier
+Bundle-Version: 4.1.1.qualifier
Bundle-Vendor: %provider_name
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
@@ -22,23 +22,23 @@ 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.1.0,4.2.0)",
- org.eclipse.jgit.http.server;version="[4.1.0,4.2.0)",
- org.eclipse.jgit.http.server.glue;version="[4.1.0,4.2.0)",
- org.eclipse.jgit.http.server.resolver;version="[4.1.0,4.2.0)",
- org.eclipse.jgit.internal;version="[4.1.0,4.2.0)",
- org.eclipse.jgit.internal.storage.file;version="[4.1.0,4.2.0)",
- org.eclipse.jgit.junit;version="[4.1.0,4.2.0)",
- org.eclipse.jgit.junit.http;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.revwalk;version="[4.1.0,4.2.0)",
- org.eclipse.jgit.storage.file;version="[4.1.0,4.2.0)",
- org.eclipse.jgit.transport;version="[4.1.0,4.2.0)",
- org.eclipse.jgit.transport.http;version="[4.1.0,4.2.0)",
- org.eclipse.jgit.transport.http.apache;version="[4.1.0,4.2.0)",
- org.eclipse.jgit.transport.resolver;version="[4.1.0,4.2.0)",
- org.eclipse.jgit.util;version="[4.1.0,4.2.0)",
+ org.eclipse.jgit.errors;version="[4.1.1,4.2.0)",
+ org.eclipse.jgit.http.server;version="[4.1.1,4.2.0)",
+ org.eclipse.jgit.http.server.glue;version="[4.1.1,4.2.0)",
+ org.eclipse.jgit.http.server.resolver;version="[4.1.1,4.2.0)",
+ org.eclipse.jgit.internal;version="[4.1.1,4.2.0)",
+ org.eclipse.jgit.internal.storage.file;version="[4.1.1,4.2.0)",
+ org.eclipse.jgit.junit;version="[4.1.1,4.2.0)",
+ org.eclipse.jgit.junit.http;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.revwalk;version="[4.1.1,4.2.0)",
+ org.eclipse.jgit.storage.file;version="[4.1.1,4.2.0)",
+ org.eclipse.jgit.transport;version="[4.1.1,4.2.0)",
+ org.eclipse.jgit.transport.http;version="[4.1.1,4.2.0)",
+ org.eclipse.jgit.transport.http.apache;version="[4.1.1,4.2.0)",
+ org.eclipse.jgit.transport.resolver;version="[4.1.1,4.2.0)",
+ org.eclipse.jgit.util;version="[4.1.1,4.2.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 2cc07e3932..33a0f6d677 100644
--- a/org.eclipse.jgit.http.test/pom.xml
+++ b/org.eclipse.jgit.http.test/pom.xml
@@ -51,7 +51,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.http.test</artifactId>