Update build to use Tycho 0.14.1
Also update default target platform to Indigo.
Change-Id: I565bb233271fecdfd0e7b470b337c7fa9acb7a0a
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
diff --git a/org.eclipse.example.calc.test/pom.xml b/org.eclipse.example.calc.test/pom.xml
index 29d1e40..e1a1587 100644
--- a/org.eclipse.example.calc.test/pom.xml
+++ b/org.eclipse.example.calc.test/pom.xml
@@ -27,8 +27,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-test-plugin</artifactId>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<excludes>
@@ -39,14 +39,6 @@
<useUIThread>false</useUIThread>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
diff --git a/org.eclipse.example.calc/pom.xml b/org.eclipse.example.calc/pom.xml
index 0e75968..6d21a62 100644
--- a/org.eclipse.example.calc/pom.xml
+++ b/org.eclipse.example.calc/pom.xml
@@ -24,28 +24,11 @@
<name>Calculator Example (Incubation)</name>
- <build>
- <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 -->
- <resources>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
+ <build>
<plugins>
<plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-source-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
</plugin>
</plugins>
</build>
diff --git a/pom.xml b/pom.xml
index a5a87a5..23b5b8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
<properties>
<calc-version>0.1.0-SNAPSHOT</calc-version>
- <tycho-version>0.10.0</tycho-version>
+ <tycho-version>0.14.1</tycho-version>
<junit-version>4.8.1</junit-version>
</properties>
@@ -58,7 +58,6 @@
<profile>
<id>platform-galileo</id>
<activation>
- <activeByDefault>true</activeByDefault>
<property>
<name>platform-version-name</name>
<value>galileo</value>
@@ -85,6 +84,7 @@
<profile>
<id>platform-indigo</id>
<activation>
+ <activeByDefault>true</activeByDefault>
<property>
<name>platform-version-name</name>
<value>indigo</value>
@@ -113,42 +113,65 @@
<build>
<plugins>
<plugin>
- <groupId>org.sonatype.tycho</groupId>
+ <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>${tycho-version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
- <groupId>org.sonatype.tycho</groupId>
+ <groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<resolver>p2</resolver>
<pomDependencies>consider</pomDependencies>
+ <environments>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86_64</arch>
+ </environment>
+ </environments>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-compiler-plugin</artifactId>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
- <!-- TODO remove workaround when
- https://issues.sonatype.org/browse/TYCHO-473
- is fixed -->
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-source-plugin</artifactId>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<id>attach-source</id>
- <phase>process-classes</phase>
<goals>
<goal>plugin-source</goal>
</goals>
@@ -158,7 +181,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.4.1</version>
+ <version>2.5</version>
<configuration>
<encoding>ISO-8859-1</encoding>
</configuration>
@@ -166,7 +189,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
+ <version>1.7</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -187,7 +210,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
<configuration>
<sourceEncoding>utf-8</sourceEncoding>
<minimumTokens>100</minimumTokens>
@@ -203,6 +226,16 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.dash.maven</groupId>
+ <artifactId>eclipse-signing-maven-plugin</artifactId>
+ <version>1.0.5</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
