Bug 560849: [Releng] Update build to Tycho 1.6.0
- Update to CBI 1.1.7
- Update to EBR 1.1.0 (stick with Tycho 1.4.0 for recipes)
diff --git a/3rdparty/bundle-recipes-pom.xml b/3rdparty/bundle-recipes-pom.xml
index a40a310..62bcdb9 100644
--- a/3rdparty/bundle-recipes-pom.xml
+++ b/3rdparty/bundle-recipes-pom.xml
@@ -18,7 +18,9 @@
<packaging>pom</packaging>
<properties>
- <ebr.version>1.0.0</ebr.version>
+ <ebr.version>1.1.0</ebr.version>
+ <!-- tycho version compatible with ebr -->
+ <tycho.version>1.4.0</tycho.version>
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/statet/org.eclipse.statet.git</tycho.scmUrl>
diff --git a/releng/pom.xml b/releng/pom.xml
index bde83da..134f67f 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -28,15 +28,15 @@
<name>Eclipse StatET - Maven Parent</name>
<prerequisites>
- <maven>3.5.4</maven>
+ <maven>3.6.3</maven>
</prerequisites>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tycho.version>1.4.0</tycho.version>
+ <tycho.version>1.6.0</tycho.version>
<tycho-extras.version>${tycho.version}</tycho-extras.version>
- <cbi-plugins.version>1.1.5</cbi-plugins.version>
+ <cbi-plugins.version>1.1.7</cbi-plugins.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
@@ -259,7 +259,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.1.1</version>
+ <version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -301,7 +301,7 @@
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-repository-plugin</artifactId>
+ <artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho.version}</version>
</plugin>
<plugin>
@@ -341,6 +341,16 @@
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-publisher-plugin</artifactId>
+ <version>${tycho.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-repository-plugin</artifactId>
+ <version>${tycho.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
<version>${tycho.version}</version>
</plugin>
diff --git a/releng/spring.boot/pom.xml b/releng/spring.boot/pom.xml
index 102850c..3e81b7f 100644
--- a/releng/spring.boot/pom.xml
+++ b/releng/spring.boot/pom.xml
@@ -34,6 +34,10 @@
<relativePath/>
</parent>
+ <prerequisites>
+ <maven>3.6.3</maven>
+ </prerequisites>
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>