Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2016-12-27 00:14:06 +0000
committerMatthias Sohn2016-12-27 00:14:19 +0000
commitb97fa05941ad8218ac6539c431d7ab43ec5d0cf7 (patch)
treea12842af6bb99eb195653ef7048086e67f16c6bb /org.eclipse.jgit.http.server
parent5274da3c3ca8d59c4cce41914776837f457ca734 (diff)
parent16e515a59efe1e545710ced6e52d396056ac9467 (diff)
downloadjgit-b97fa05941ad8218ac6539c431d7ab43ec5d0cf7.tar.gz
jgit-b97fa05941ad8218ac6539c431d7ab43ec5d0cf7.tar.xz
jgit-b97fa05941ad8218ac6539c431d7ab43ec5d0cf7.zip
Merge branch 'stable-4.6'
* stable-4.6: Update tycho version to 0.26 Update maven plugins Skip javadoc generation for org.eclipse.jgit.http.test Prepare 4.6.1-SNAPSHOT builds JGit v4.6.0.201612231935-r Change-Id: Ia70329af7ec8bdb6d8bd6f917e00024a3ea4ac1f 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 83510153cc..a5accce426 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.6.0.qualifier
+Bundle-Version: 4.6.1.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
-Export-Package: org.eclipse.jgit.http.server;version="4.6.0",
- org.eclipse.jgit.http.server.glue;version="4.6.0";
+Export-Package: org.eclipse.jgit.http.server;version="4.6.1",
+ org.eclipse.jgit.http.server.glue;version="4.6.1";
uses:="javax.servlet,javax.servlet.http",
- org.eclipse.jgit.http.server.resolver;version="4.6.0";
+ org.eclipse.jgit.http.server.resolver;version="4.6.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.8
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.6.0,4.7.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.internal.storage.file;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.lib;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.nls;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.revwalk;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.transport;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.transport.resolver;version="[4.6.0,4.7.0)",
- org.eclipse.jgit.util;version="[4.6.0,4.7.0)"
+ org.eclipse.jgit.errors;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.internal.storage.file;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.lib;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.nls;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.revwalk;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.transport;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.transport.resolver;version="[4.6.1,4.7.0)",
+ org.eclipse.jgit.util;version="[4.6.1,4.7.0)"
diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml
index 4d08ee9caf..c80bc4ecad 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.6.0-SNAPSHOT</version>
+ <version>4.6.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.http.server</artifactId>

Back to the top