summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorAndreas Sewe2012-11-02 07:14:12 (EDT)
committer Andreas Sewe2012-11-05 03:51:36 (EST)
commitdfff7fe41a92237d2ae9be9d0aaf8749a5a3720a (patch)
tree48425928471e136836ad4b684644e27e4eb621d2
parent83016f34277200a7648cb63f57d4473dab488c08 (diff)
downloadorg.eclipse.recommenders-dfff7fe41a92237d2ae9be9d0aaf8749a5a3720a.zip
org.eclipse.recommenders-dfff7fe41a92237d2ae9be9d0aaf8749a5a3720a.tar.gz
org.eclipse.recommenders-dfff7fe41a92237d2ae9be9d0aaf8749a5a3720a.tar.bz2
[releng] Cleaned up POMs and using Tycho 0.16 now.refs/changes/86/8486/5
Some possible benefits are outlined in the Tycho 0.16 release notes: <http://wiki.eclipse.org/Tycho/Release_Notes/0.16>. Change-Id: I16203c73abece9d007efb2a66995727dfa1cdf33
-rw-r--r--dist/pom.xml8
-rw-r--r--features/pom.xml6
-rw-r--r--plugins/pom.xml13
-rw-r--r--pom.xml10
-rw-r--r--tests/pom.xml56
5 files changed, 35 insertions, 58 deletions
diff --git a/dist/pom.xml b/dist/pom.xml
index 8312507..46bb53d 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -42,12 +42,4 @@
</modules>
</profile>
</profiles>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</project> \ No newline at end of file
diff --git a/features/pom.xml b/features/pom.xml
index 9cdaaf1..77230e4 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -33,12 +33,6 @@
</modules>
<build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- </plugin>
- </plugins>
<pluginManagement>
<plugins>
<plugin>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 32d95b9..3dd3fd3 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -56,14 +56,6 @@
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-compiler-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
</plugin>
<plugin>
@@ -71,14 +63,9 @@
<artifactId>tycho-source-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-packaging-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>com.mycila.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
</plugin>
-
</plugins>
<pluginManagement>
<plugins>
diff --git a/pom.xml b/pom.xml
index 90bd86c..dd4385a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<packaging>pom</packaging>
<properties>
<recommenders-version>1.0.0-SNAPSHOT</recommenders-version>
- <tycho-version>0.15.0</tycho-version>
+ <tycho-version>0.16.0</tycho-version>
<jacoco-version>0.5.4.201111111111</jacoco-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<build-alias>b000</build-alias>
@@ -115,6 +115,12 @@
<build>
<plugins>
<plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.5.6.201201232323</version>
@@ -141,8 +147,6 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>${tycho-version}</version>
- <!-- MB: why do we need extensions=true? -->
- <extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
diff --git a/tests/pom.xml b/tests/pom.xml
index f5dd116..8f98708 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -22,36 +22,36 @@
</modules>
<build>
<sourceDirectory>src</sourceDirectory>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <configuration>
+ <!-- don't run tests in UI thread and harness per default (i.e., run them headless). Can modules overwrite that? -->
+ <!-- see http://wiki.eclipse.org/Minerva#Headless_Tests -->
+ <!-- see http://wiki.eclipse.org/Tycho/Packaging_Types#eclipse-test-plugin for semantics of useUIHarness etc. -->
+ <useUIHarness>false</useUIHarness>
+ <useUIThread>false</useUIThread>
+ <!-- increase memory for test execution and enable mac execution by using +XstartOnFirstThread -->
+ <!-- STOP: using argline overwrites the jacoco arguments. DON'T use them -->
+ <!-- argLine>-Xms256m -Xmx512m -XX:MaxPermSize=256M -XstartOnFirstThread</argLine -->
+ <!-- Convention: We don't use test suites. All Test classes should end with "*Test.java". Everything else is not executed
+ by default. Modules may overwrite this? -->
+ <includes>
+ <!-- see http://intellectualcramps.wordpress.com/2011/06/04/tycho-surefire-test-setup-tips/ -->
+ <!-- see http://maksim.sorokin.dk/it/2010/12/21/tests-in-tycho/ -->
+ <include>**/*Test.java</include>
+ </includes>
+ <!-- Kill test JVM if tests take more than 5 minutes (300 seconds) to finish -->
+ <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
+ <argLine append="true">${tycho.testArgLine}</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <configuration>
- <!-- don't run tests in UI thread and harness per default (i.e., run them headless). Can modules overwrite that? -->
- <!-- see http://wiki.eclipse.org/Minerva#Headless_Tests -->
- <!-- see http://wiki.eclipse.org/Tycho/Packaging_Types#eclipse-test-plugin for semantics of useUIHarness etc. -->
- <useUIHarness>false</useUIHarness>
- <useUIThread>false</useUIThread>
- <!-- increase memory for test execution and enable mac execution by using +XstartOnFirstThread -->
- <!-- STOP: using argline overwrites the jacoco arguments. DON'T use them -->
- <!-- argLine>-Xms256m -Xmx512m -XX:MaxPermSize=256M -XstartOnFirstThread</argLine -->
- <!-- Convention: We don't use test suites. All Test classes should end with "*Test.java". Everything else is not executed
- by default. Modules may overwrite this? -->
- <includes>
- <!-- see http://intellectualcramps.wordpress.com/2011/06/04/tycho-surefire-test-setup-tips/ -->
- <!-- see http://maksim.sorokin.dk/it/2010/12/21/tests-in-tycho/ -->
- <include>**/*Test.java</include>
- </includes>
- <!-- Kill test JVM if tests take more than 5 minutes (300 seconds) to finish -->
- <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
- <argLine append="true">${tycho.testArgLine}</argLine>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>