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/pom.xml | |
| 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/pom.xml')
| -rw-r--r-- | org.eclipse.jgit.packaging/pom.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index cf4d7405fe..4d09dee1eb 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -53,13 +53,13 @@ <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>JGit Tycho Parent</name> <properties> - <tycho-version>0.25.0</tycho-version> + <tycho-version>0.26.0</tycho-version> <tycho-extras-version>${tycho-version}</tycho-extras-version> <target-platform>jgit-4.6</target-platform> </properties> @@ -149,7 +149,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.7</version> + <version>3.0.2</version> <configuration> <encoding>ISO-8859-1</encoding> </configuration> @@ -221,7 +221,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.10</version> + <version>1.12</version> </plugin> </plugins> </pluginManagement> |