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.junit.feature | |
| 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.junit.feature')
| -rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml | 2 | ||||
| -rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index dcd67e3e8c..b589b85c5a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit.junit" label="%featureName" - version="3.1.0.qualifier" + version="3.1.1.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 3fefc0bf8e..a229f288da 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -50,7 +50,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> <groupId>org.eclipse.jgit.feature</groupId> |