summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.http.server
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.server
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.server')
-rw-r--r--org.eclipse.jgit.http.server/META-INF/MANIFEST.MF26
-rw-r--r--org.eclipse.jgit.http.server/pom.xml2
2 files changed, 14 insertions, 14 deletions
diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
index 8f0388478a..90c15fc599 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.1.0.qualifier
+Bundle-Version: 4.1.1.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
-Export-Package: org.eclipse.jgit.http.server;version="4.1.0",
- org.eclipse.jgit.http.server.glue;version="4.1.0";
+Export-Package: org.eclipse.jgit.http.server;version="4.1.1",
+ org.eclipse.jgit.http.server.glue;version="4.1.1";
uses:="javax.servlet,javax.servlet.http",
- org.eclipse.jgit.http.server.resolver;version="4.1.0";
+ org.eclipse.jgit.http.server.resolver;version="4.1.1";
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.1.0,4.2.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[4.1.0,4.2.0)",
- org.eclipse.jgit.internal.storage.file;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.transport;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.internal.storage.dfs;version="[4.1.1,4.2.0)",
+ org.eclipse.jgit.internal.storage.file;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.transport;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)"
diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml
index 13a7a8d073..a487bd3523 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>4.1.0-SNAPSHOT</version>
+ <version>4.1.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.http.server</artifactId>