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.ant | |
| 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.ant')
| -rw-r--r-- | org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 6 | ||||
| -rw-r--r-- | org.eclipse.jgit.ant/pom.xml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 26e4cc3be9..1525b729ec 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 4.6.0.qualifier +Bundle-Version: 4.6.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[4.6.0,4.7.0)" + org.eclipse.jgit.storage.file;version="[4.6.1,4.7.0)" Bundle-Localization: plugin Bundle-Vendor: %Provider-Name -Export-Package: org.eclipse.jgit.ant.tasks;version="4.6.0"; +Export-Package: org.eclipse.jgit.ant.tasks;version="4.6.1"; uses:="org.apache.tools.ant.types,org.apache.tools.ant" diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 01f0d42a9f..78c0e1f077 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -48,7 +48,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.ant</artifactId> |