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.junit | |
| 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.junit')
| -rw-r--r-- | org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 30 | ||||
| -rw-r--r-- | org.eclipse.jgit.junit/pom.xml | 2 |
2 files changed, 16 insertions, 16 deletions
diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index bc4e4f83ad..f3b53493fc 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -2,23 +2,23 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 3.1.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.eclipse.jgit.api;version="[3.1.0,3.2.0)", - org.eclipse.jgit.api.errors;version="[3.1.0,3.2.0)", - org.eclipse.jgit.dircache;version="[3.1.0,3.2.0)", - org.eclipse.jgit.errors;version="[3.1.0,3.2.0)", - org.eclipse.jgit.internal.storage.file;version="[3.1.0,3.2.0)", - org.eclipse.jgit.internal.storage.pack;version="[3.1.0,3.2.0)", - org.eclipse.jgit.lib;version="[3.1.0,3.2.0)", - org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)", - org.eclipse.jgit.storage.file;version="[3.1.0,3.2.0)", - org.eclipse.jgit.treewalk;version="[3.1.0,3.2.0)", - org.eclipse.jgit.treewalk.filter;version="[3.1.0,3.2.0)", - org.eclipse.jgit.util;version="[3.1.0,3.2.0)", - org.eclipse.jgit.util.io;version="[3.1.0,3.2.0)", +Import-Package: org.eclipse.jgit.api;version="[3.1.1,3.2.0)", + org.eclipse.jgit.api.errors;version="[3.1.1,3.2.0)", + org.eclipse.jgit.dircache;version="[3.1.1,3.2.0)", + org.eclipse.jgit.errors;version="[3.1.1,3.2.0)", + org.eclipse.jgit.internal.storage.file;version="[3.1.1,3.2.0)", + org.eclipse.jgit.internal.storage.pack;version="[3.1.1,3.2.0)", + org.eclipse.jgit.lib;version="[3.1.1,3.2.0)", + org.eclipse.jgit.revwalk;version="[3.1.1,3.2.0)", + org.eclipse.jgit.storage.file;version="[3.1.1,3.2.0)", + org.eclipse.jgit.treewalk;version="[3.1.1,3.2.0)", + org.eclipse.jgit.treewalk.filter;version="[3.1.1,3.2.0)", + org.eclipse.jgit.util;version="[3.1.1,3.2.0)", + org.eclipse.jgit.util.io;version="[3.1.1,3.2.0)", org.junit;version="[4.0.0,5.0.0)" -Export-Package: org.eclipse.jgit.junit;version="3.1.0" +Export-Package: org.eclipse.jgit.junit;version="3.1.1" diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 76a330b049..82da022ddd 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -52,7 +52,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>3.1.0-SNAPSHOT</version> + <version>3.1.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.junit</artifactId> |