diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2016-12-27 01:14:06 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2016-12-27 01:14:19 +0100 |
| commit | b97fa05941ad8218ac6539c431d7ab43ec5d0cf7 (patch) | |
| tree | a12842af6bb99eb195653ef7048086e67f16c6bb /org.eclipse.jgit.pgm.test | |
| parent | 5274da3c3ca8d59c4cce41914776837f457ca734 (diff) | |
| parent | 16e515a59efe1e545710ced6e52d396056ac9467 (diff) | |
| download | jgit-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.pgm.test')
| -rw-r--r-- | org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 36 | ||||
| -rw-r--r-- | org.eclipse.jgit.pgm.test/pom.xml | 2 |
2 files changed, 19 insertions, 19 deletions
diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 45e3692cf3..90d6f4c23d 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -2,28 +2,28 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 4.6.0.qualifier +Bundle-Version: 4.6.1.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.api;version="[4.6.0,4.7.0)", - org.eclipse.jgit.api.errors;version="[4.6.0,4.7.0)", - org.eclipse.jgit.diff;version="[4.6.0,4.7.0)", - org.eclipse.jgit.dircache;version="[4.6.0,4.7.0)", - org.eclipse.jgit.internal.storage.file;version="4.6.0", - org.eclipse.jgit.junit;version="[4.6.0,4.7.0)", - org.eclipse.jgit.lib;version="[4.6.0,4.7.0)", - org.eclipse.jgit.merge;version="[4.6.0,4.7.0)", - org.eclipse.jgit.pgm;version="[4.6.0,4.7.0)", - org.eclipse.jgit.pgm.internal;version="[4.6.0,4.7.0)", - org.eclipse.jgit.pgm.opt;version="[4.6.0,4.7.0)", - org.eclipse.jgit.revwalk;version="[4.6.0,4.7.0)", - org.eclipse.jgit.storage.file;version="[4.6.0,4.7.0)", - org.eclipse.jgit.transport;version="[4.6.0,4.7.0)", - org.eclipse.jgit.treewalk;version="[4.6.0,4.7.0)", - org.eclipse.jgit.util;version="[4.6.0,4.7.0)", - org.eclipse.jgit.util.io;version="[4.6.0,4.7.0)", +Import-Package: org.eclipse.jgit.api;version="[4.6.1,4.7.0)", + org.eclipse.jgit.api.errors;version="[4.6.1,4.7.0)", + org.eclipse.jgit.diff;version="[4.6.1,4.7.0)", + org.eclipse.jgit.dircache;version="[4.6.1,4.7.0)", + org.eclipse.jgit.internal.storage.file;version="4.6.1", + org.eclipse.jgit.junit;version="[4.6.1,4.7.0)", + org.eclipse.jgit.lib;version="[4.6.1,4.7.0)", + org.eclipse.jgit.merge;version="[4.6.1,4.7.0)", + org.eclipse.jgit.pgm;version="[4.6.1,4.7.0)", + org.eclipse.jgit.pgm.internal;version="[4.6.1,4.7.0)", + org.eclipse.jgit.pgm.opt;version="[4.6.1,4.7.0)", + org.eclipse.jgit.revwalk;version="[4.6.1,4.7.0)", + org.eclipse.jgit.storage.file;version="[4.6.1,4.7.0)", + org.eclipse.jgit.transport;version="[4.6.1,4.7.0)", + org.eclipse.jgit.treewalk;version="[4.6.1,4.7.0)", + org.eclipse.jgit.util;version="[4.6.1,4.7.0)", + org.eclipse.jgit.util.io;version="[4.6.1,4.7.0)", org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", org.junit;version="[4.11.0,5.0.0)", org.junit.rules;version="[4.11.0,5.0.0)", diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index f5d0bd3aaa..57593cd945 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -50,7 +50,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.pgm.test</artifactId> |