aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.packaging/org.eclipse.jgit.target
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2016-12-27 01:14:06 +0100
committerMatthias Sohn <matthias.sohn@sap.com>2016-12-27 01:14:19 +0100
commitb97fa05941ad8218ac6539c431d7ab43ec5d0cf7 (patch)
treea12842af6bb99eb195653ef7048086e67f16c6bb /org.eclipse.jgit.packaging/org.eclipse.jgit.target
parent5274da3c3ca8d59c4cce41914776837f457ca734 (diff)
parent16e515a59efe1e545710ced6e52d396056ac9467 (diff)
downloadjgit-b97fa05941ad8218ac6539c431d7ab43ec5d0cf7.tar.gz
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.packaging/org.eclipse.jgit.target')
-rw-r--r--org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml2
2 files changed, 2 insertions, 2 deletions
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 6854007d39..7cf2cfe45f 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.6.0.qualifier
+Bundle-Version: 4.6.1.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 fc33622ddc..350541a48c 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 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>4.6.0-SNAPSHOT</version>
+ <version>4.6.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.target</artifactId>