diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2013-10-03 17:39:03 +0200 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2013-10-03 17:39:33 +0200 |
commit | fdc80f7cad0979e65e669e8564a67a1fedbc5705 (patch) | |
tree | 09d44cfdba0527aa4df395a8e9ec68644496b677 /org.eclipse.jgit.packaging/org.eclipse.jgit.target | |
parent | 0be59ab033a66d63389cf8bd1145af0763a70a5b (diff) | |
parent | da6e87bc373c54c1cda8ed563f41f65df52bacbf (diff) | |
download | jgit-fdc80f7cad0979e65e669e8564a67a1fedbc5705.tar.gz jgit-fdc80f7cad0979e65e669e8564a67a1fedbc5705.zip |
Merge branch 'stable-3.1'
* stable-3.1:
Prepare post 3.1.0 builds
JGit v3.1.0.201310021548-r
Fix order of commits in rebase todo file header
Prepare post 3.1.0 RC1 builds
JGit v3.1.0.201309270735-rc1
Attempt to fix graph layout when new heads are introduced
Prepare re-signing pgm's ueberjar to avoid SecurityException
Use full branch name when getting ref in BranchTrackingStatus
Change-Id: Ida30175d0c058048cbe4b563aae7f85cd008db29
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.MF | 2 | ||||
-rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml | 2 |
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 72b4df8795..f2448ff52c 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: 3.1.0.qualifier +Bundle-Version: 3.1.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 df8bacc031..118d1e2ecc 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>3.1.0-SNAPSHOT</version> + <version>3.1.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.target</artifactId> |