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.packaging/org.eclipse.jgit.pgm.source.feature | |
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.packaging/org.eclipse.jgit.pgm.source.feature')
-rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml | 2 | ||||
-rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml index 8584ee1763..4491184237 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit.pgm.source" label="%featureName" - version="4.6.0.qualifier" + version="4.6.1.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml index d5e1168a16..5e928667f3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.6.1-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> |