Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikaƫl Barbero2014-07-17 13:09:35 -0400
committerMikael Barbero2014-07-17 13:16:40 -0400
commitad3981eeab5b0f9fc1456d40465418b892e6e3b2 (patch)
tree219d0915ffc3c83168233420cde55ee796643a5c
parent695994391470b24a8f3e88a816d2badb81811639 (diff)
downloadorg.eclipse.emf.compare-ad3981eeab5b0f9fc1456d40465418b892e6e3b2.tar.gz
org.eclipse.emf.compare-ad3981eeab5b0f9fc1456d40465418b892e6e3b2.tar.xz
org.eclipse.emf.compare-ad3981eeab5b0f9fc1456d40465418b892e6e3b2.zip
Reworked Maven build
All plugins are now declared in the pluginManagement section with proper version Each module has its dedicated <build> section if appropriate (it avoids to execute source-feature goal for bundles e.g.) Change-Id: Id33a5f556666834ce1cae1fa0775c1fb44457316
-rw-r--r--org.eclipse.emf.compare-parent/pom.xml396
-rw-r--r--packaging/org.eclipse.emf.compare-feature/pom.xml29
-rw-r--r--packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/pom.xml29
-rw-r--r--packaging/org.eclipse.emf.compare.diagram.gmf-feature/pom.xml29
-rw-r--r--packaging/org.eclipse.emf.compare.diagram.papyrus-feature/pom.xml29
-rw-r--r--packaging/org.eclipse.emf.compare.gendoc/pom.xml14
-rw-r--r--packaging/org.eclipse.emf.compare.ide.ui-feature/pom.xml25
-rw-r--r--packaging/org.eclipse.emf.compare.rcp.ui-feature/pom.xml29
-rw-r--r--packaging/org.eclipse.emf.compare.subversive-feature/pom.xml29
-rw-r--r--packaging/org.eclipse.emf.compare.uml2-feature/pom.xml29
-rw-r--r--packaging/org.eclipse.emf.compare.update/pom.xml3
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/pom.xml1
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/pom.xml1
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.edit/pom.xml9
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/pom.xml1
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/pom.xml9
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/pom.xml9
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui/pom.xml9
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/pom.xml1
-rw-r--r--plugins/org.eclipse.emf.compare.diagram/pom.xml9
-rw-r--r--plugins/org.eclipse.emf.compare.doc/pom.xml1
-rw-r--r--plugins/org.eclipse.emf.compare.edit/pom.xml9
-rw-r--r--plugins/org.eclipse.emf.compare.ide.tests/pom.xml1
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests/pom.xml1
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/pom.xml9
-rw-r--r--plugins/org.eclipse.emf.compare.ide/pom.xml9
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui.tests/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/pom.xml9
-rw-r--r--plugins/org.eclipse.emf.compare.rcp/pom.xml9
-rw-r--r--plugins/org.eclipse.emf.compare.subversive/pom.xml9
-rw-r--r--plugins/org.eclipse.emf.compare.tests.fuzzy/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.compare.tests/pom.xml1
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/pom.xml9
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests/pom.xml1
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp.ui/pom.xml9
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp/pom.xml9
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/pom.xml1
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/pom.xml9
-rw-r--r--plugins/org.eclipse.emf.compare/pom.xml9
40 files changed, 620 insertions, 181 deletions
diff --git a/org.eclipse.emf.compare-parent/pom.xml b/org.eclipse.emf.compare-parent/pom.xml
index 7d14b4ba2..f42a42e3b 100644
--- a/org.eclipse.emf.compare-parent/pom.xml
+++ b/org.eclipse.emf.compare-parent/pom.xml
@@ -30,9 +30,34 @@
</license>
</licenses>
<properties>
+ <!-- Properties -->
+ <parent-version>3.1.0-SNAPSHOT</parent-version>
+ <source-java-version>1.5</source-java-version>
+ <target-java-version>${source-java-version}</target-java-version>
+ <java-source-encoding>UTF-8</java-source-encoding>
+ <resource-encoding>UTF-8</resource-encoding>
+ <os-jvm-flags/>
+
+ <!-- plugins versions -->
+ <!-- use 'mvn versions:display-plugin-updates' to check for the latest -->
<tycho-version>0.20.0</tycho-version>
<tycho-extras-version>0.20.0</tycho-extras-version>
- <os-jvm-flags/>
+ <maven-resources-version>2.6</maven-resources-version>
+ <maven-antrun-version>1.7</maven-antrun-version>
+ <findbugs-maven-version>2.5.4</findbugs-maven-version>
+ <maven-pmd-version>3.1</maven-pmd-version>
+ <exec-maven-version>1.3.1</exec-maven-version>
+ <maven-compiler-version>3.1</maven-compiler-version>
+ <maven-assembly-version>2.4</maven-assembly-version>
+ <maven-jar-version>2.5</maven-jar-version>
+ <maven-checkstyle-version>2.12.1</maven-checkstyle-version>
+ <maven-clean-version>2.5</maven-clean-version>
+ <maven-deploy-version>2.8.1</maven-deploy-version>
+ <maven-install-version>2.5.1</maven-install-version>
+ <maven-site-version>3.4</maven-site-version>
+ <maven-surefire-version>2.17</maven-surefire-version>
+ <jacoco-maven-version>0.7.1.201405082137</jacoco-maven-version>
+ <eclipse-jarsigner-version>1.0.5</eclipse-jarsigner-version>
</properties>
<!--
Platform-specific modules will be activated from the related profiles.
@@ -59,69 +84,45 @@
<module>../plugins/org.eclipse.emf.compare.rcp.ui.tests</module>
</modules>
<build>
- <sourceDirectory>src</sourceDirectory>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho-version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
<configuration>
<includePackedArtifacts>true</includePackedArtifacts>
<resolver>p2</resolver>
- </configuration>
- </plugin>
- <!-- enable source bundle generation -->
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <archive>
- <addMavenDescriptor>false</addMavenDescriptor>
- </archive>
- </configuration>
- <executions>
- <execution>
- <id>plugin-source</id>
- <goals>
- <goal>plugin-source</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-source-feature-plugin</artifactId>
- <version>${tycho-extras-version}</version>
- <configuration>
- <archive>
- <addMavenDescriptor>false</addMavenDescriptor>
- </archive>
- </configuration>
- <executions>
- <execution>
- <id>source-feature</id>
- <phase>package</phase>
- <goals>
- <goal>source-feature</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-packaging-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <archive>
- <addMavenDescriptor>false</addMavenDescriptor>
- </archive>
+ <environments>
+ <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>linux</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86_64</arch>
+ </environment>
+ </environments>
</configuration>
</plugin>
</plugins>
@@ -129,50 +130,78 @@
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tycho-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</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>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
</configuration>
</plugin>
<plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ <version>${tycho-extras-version}</version>
+ <configuration>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <id>source-feature</id>
+ <phase>package</phase>
+ <goals>
+ <goal>source-feature</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <id>plugin-source</id>
+ <goals>
+ <goal>plugin-source</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ </plugin>
+ <plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
- <encoding>UTF-8</encoding>
- <source>1.5</source>
- <target>1.5</target>
+ <encoding>${java-source-encoding}</encoding>
+ <source>${source-java-version}</source>
+ <target>${target-java-version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tycho-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
@@ -180,69 +209,107 @@
</configuration>
</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.extras</groupId>
+ <artifactId>tycho-pack200a-plugin</artifactId>
+ <version>${tycho-extras-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200b-plugin</artifactId>
+ <version>${tycho-extras-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-jarsigner-plugin</artifactId>
+ <version>${eclipse-jarsigner-version}</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.4.1</version>
+ <version>${maven-resources-version}</version>
<configuration>
- <encoding>ISO-8859-1</encoding>
+ <encoding>${resource-encoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
+ <version>${maven-antrun-version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <findbugsXmlOutput>true</findbugsXmlOutput>
- <failOnError>false</failOnError>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
+ <version>${findbugs-maven-version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- <targetJdk>1.5</targetJdk>
- <format>xml</format>
- <failOnViolation>false</failOnViolation>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>cpd-check</goal>
- </goals>
- </execution>
- </executions>
+ <version>${maven-pmd-version}</version>
</plugin>
<plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-plugin</artifactId>
- <version>${tycho-extras-version}</version>
- <executions>
- <execution>
- <id>p2-metadata</id>
- <goals>
- <goal>p2-metadata</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- <configuration>
- <defaultP2Metadata>false</defaultP2Metadata>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${maven-checkstyle-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>${exec-maven-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco-maven-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>${maven-jar-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>${maven-clean-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>${maven-deploy-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>${maven-install-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>${maven-site-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${maven-surefire-version}</version>
</plugin>
</plugins>
</pluginManagement>
@@ -265,14 +332,13 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
<configuration>
<includePackedArtifacts>true</includePackedArtifacts>
<target>
<artifact>
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>emf.compare-parent</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>${parent-version}</version>
<classifier>targetPlatforms/mars-sdk</classifier>
</artifact>
</target>
@@ -312,14 +378,13 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
<configuration>
<includePackedArtifacts>true</includePackedArtifacts>
<target>
<artifact>
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>emf.compare-parent</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>${parent-version}</version>
<classifier>targetPlatforms/luna-sdk</classifier>
</artifact>
</target>
@@ -358,14 +423,13 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
<configuration>
<includePackedArtifacts>true</includePackedArtifacts>
<target>
<artifact>
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>emf.compare-parent</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>${parent-version}</version>
<classifier>targetPlatforms/kepler-sdk</classifier>
</artifact>
</target>
@@ -395,14 +459,13 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
<configuration>
<includePackedArtifacts>true</includePackedArtifacts>
<target>
<artifact>
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>emf.compare-parent</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>${parent-version}</version>
<classifier>targetPlatforms/juno-4.2-sdk</classifier>
</artifact>
</target>
@@ -432,14 +495,13 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
<configuration>
<includePackedArtifacts>true</includePackedArtifacts>
<target>
<artifact>
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>emf.compare-parent</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>${parent-version}</version>
<classifier>targetPlatforms/indigo-sdk</classifier>
</artifact>
</target>
@@ -458,14 +520,13 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
<configuration>
<includePackedArtifacts>true</includePackedArtifacts>
<target>
<artifact>
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>emf.compare-parent</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>${parent-version}</version>
<classifier>targetPlatforms/helios-sdk</classifier>
</artifact>
</target>
@@ -484,14 +545,13 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
<configuration>
<includePackedArtifacts>true</includePackedArtifacts>
<target>
<artifact>
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>emf.compare-parent</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>${parent-version}</version>
<classifier>targetPlatforms/galileo-sdk</classifier>
</artifact>
</target>
@@ -510,7 +570,6 @@
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200a-plugin</artifactId>
- <version>${tycho-extras-version}</version>
<executions>
<execution>
<id>pack200-normalize</id>
@@ -524,7 +583,6 @@
<plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-jarsigner-plugin</artifactId>
- <version>1.0.4</version>
<executions>
<execution>
<id>sign</id>
@@ -538,7 +596,6 @@
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200b-plugin</artifactId>
- <version>${tycho-extras-version}</version>
<executions>
<execution>
<id>pack200-pack</id>
@@ -549,6 +606,22 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>alter-p2-metadata-for-signing</id>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <defaultP2Metadata>false</defaultP2Metadata>
+ </configuration>
+ </plugin>
</plugins>
</build>
<pluginRepositories>
@@ -582,7 +655,6 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.6.4.201312101107</version>
<executions>
<execution>
<goals>
@@ -598,7 +670,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.11</version>
<executions>
<execution>
<id>check my sources</id>
@@ -616,12 +687,35 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.5.3</version>
+ <configuration>
+ <findbugsXmlOutput>true</findbugsXmlOutput>
+ <failOnError>false</failOnError>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.0.1</version>
+ <configuration>
+ <sourceEncoding>${java-source-encoding}</sourceEncoding>
+ <minimumTokens>100</minimumTokens>
+ <targetJdk>${target-java-version}</targetJdk>
+ <format>xml</format>
+ <failOnViolation>false</failOnViolation>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>cpd-check</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
@@ -642,14 +736,13 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
<configuration>
<includePackedArtifacts>true</includePackedArtifacts>
<target>
<artifact>
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>emf.compare-parent</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>${parent-version}</version>
<classifier>targetPlatforms/mars-sdk</classifier>
</artifact>
</target>
@@ -658,6 +751,7 @@
</plugins>
</build>
</profile>
+ <!-- this profile will activate by itself if the build is ran on a mac. Be carefull to also activate a profile -->
<profile>
<id>macosx-jvm-flags</id>
<activation>
diff --git a/packaging/org.eclipse.emf.compare-feature/pom.xml b/packaging/org.eclipse.emf.compare-feature/pom.xml
index 0fa092ea4..ee4aa451a 100644
--- a/packaging/org.eclipse.emf.compare-feature/pom.xml
+++ b/packaging/org.eclipse.emf.compare-feature/pom.xml
@@ -12,4 +12,33 @@
<artifactId>org.eclipse.emf.compare</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- Don't attach (default) metadata before the source-feature execution.-->
+ <id>default-p2-metadata-default</id>
+ <configuration>
+ <attachP2Metadata>false</attachP2Metadata>
+ </configuration>
+ </execution>
+ <execution>
+ <id>attach-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/pom.xml b/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/pom.xml
index d23977df0..efe8656ff 100644
--- a/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/pom.xml
+++ b/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/pom.xml
@@ -12,4 +12,33 @@
<artifactId>org.eclipse.emf.compare.diagram.ecoretools</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- Don't attach (default) metadata before the source-feature execution.-->
+ <id>default-p2-metadata-default</id>
+ <configuration>
+ <attachP2Metadata>false</attachP2Metadata>
+ </configuration>
+ </execution>
+ <execution>
+ <id>attach-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/packaging/org.eclipse.emf.compare.diagram.gmf-feature/pom.xml b/packaging/org.eclipse.emf.compare.diagram.gmf-feature/pom.xml
index ff582177e..506a14c28 100644
--- a/packaging/org.eclipse.emf.compare.diagram.gmf-feature/pom.xml
+++ b/packaging/org.eclipse.emf.compare.diagram.gmf-feature/pom.xml
@@ -12,4 +12,33 @@
<artifactId>org.eclipse.emf.compare.diagram.gmf</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- Don't attach (default) metadata before the source-feature execution.-->
+ <id>default-p2-metadata-default</id>
+ <configuration>
+ <attachP2Metadata>false</attachP2Metadata>
+ </configuration>
+ </execution>
+ <execution>
+ <id>attach-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/pom.xml b/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/pom.xml
index f311cf6a1..cf90dfe2d 100644
--- a/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/pom.xml
+++ b/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/pom.xml
@@ -12,4 +12,33 @@
<artifactId>org.eclipse.emf.compare.diagram.papyrus</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- Don't attach (default) metadata before the source-feature execution.-->
+ <id>default-p2-metadata-default</id>
+ <configuration>
+ <attachP2Metadata>false</attachP2Metadata>
+ </configuration>
+ </execution>
+ <execution>
+ <id>attach-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/packaging/org.eclipse.emf.compare.gendoc/pom.xml b/packaging/org.eclipse.emf.compare.gendoc/pom.xml
index 7164f9dda..b06c5974d 100644
--- a/packaging/org.eclipse.emf.compare.gendoc/pom.xml
+++ b/packaging/org.eclipse.emf.compare.gendoc/pom.xml
@@ -3,6 +3,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>emf.compare-parent</artifactId>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <version>3.1.0-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
+ </parent>
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>org.eclipse.emf.compare.gendoc</artifactId>
<packaging>jar</packaging>
@@ -44,15 +50,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
<executions>
<execution>
<id>prepare</id>
<phase>validate</phase>
<configuration>
- <tasks>
+ <target>
<unzip src="lib/jar-in-jar-loader.zip" dest="${project.build.outputDirectory}/" />
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -63,7 +68,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
<configuration>
<source>${jdk.version}</source>
<target>${jdk.version}</target>
@@ -72,9 +76,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
diff --git a/packaging/org.eclipse.emf.compare.ide.ui-feature/pom.xml b/packaging/org.eclipse.emf.compare.ide.ui-feature/pom.xml
index 2e9aa09cf..bc07ffa26 100644
--- a/packaging/org.eclipse.emf.compare.ide.ui-feature/pom.xml
+++ b/packaging/org.eclipse.emf.compare.ide.ui-feature/pom.xml
@@ -18,18 +18,29 @@
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <plugin id="org.eclipse.emf.compare.doc"/>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
<executions>
<execution>
+ <!-- Don't attach (default) metadata before the source-feature execution.-->
+ <id>default-p2-metadata-default</id>
+ <configuration>
+ <attachP2Metadata>false</attachP2Metadata>
+ </configuration>
+ </execution>
+ <execution>
+ <id>attach-p2-metadata</id>
<phase>package</phase>
- <id>source-feature</id>
<goals>
- <goal>source-feature</goal>
+ <goal>p2-metadata</goal>
</goals>
- <configuration>
- <excludes>
- <plugin id="org.eclipse.emf.compare.doc"/>
- </excludes>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/packaging/org.eclipse.emf.compare.rcp.ui-feature/pom.xml b/packaging/org.eclipse.emf.compare.rcp.ui-feature/pom.xml
index cf5ecc3a4..dada9e921 100644
--- a/packaging/org.eclipse.emf.compare.rcp.ui-feature/pom.xml
+++ b/packaging/org.eclipse.emf.compare.rcp.ui-feature/pom.xml
@@ -12,4 +12,33 @@
<artifactId>org.eclipse.emf.compare.rcp.ui</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- Don't attach (default) metadata before the source-feature execution.-->
+ <id>default-p2-metadata-default</id>
+ <configuration>
+ <attachP2Metadata>false</attachP2Metadata>
+ </configuration>
+ </execution>
+ <execution>
+ <id>attach-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/packaging/org.eclipse.emf.compare.subversive-feature/pom.xml b/packaging/org.eclipse.emf.compare.subversive-feature/pom.xml
index 0f3ab9326..6263a9e54 100644
--- a/packaging/org.eclipse.emf.compare.subversive-feature/pom.xml
+++ b/packaging/org.eclipse.emf.compare.subversive-feature/pom.xml
@@ -12,4 +12,33 @@
<artifactId>org.eclipse.emf.compare.subversive</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- Don't attach (default) metadata before the source-feature execution.-->
+ <id>default-p2-metadata-default</id>
+ <configuration>
+ <attachP2Metadata>false</attachP2Metadata>
+ </configuration>
+ </execution>
+ <execution>
+ <id>attach-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/packaging/org.eclipse.emf.compare.uml2-feature/pom.xml b/packaging/org.eclipse.emf.compare.uml2-feature/pom.xml
index 7fd2a172e..1facc37fb 100644
--- a/packaging/org.eclipse.emf.compare.uml2-feature/pom.xml
+++ b/packaging/org.eclipse.emf.compare.uml2-feature/pom.xml
@@ -12,4 +12,33 @@
<artifactId>org.eclipse.emf.compare.uml2</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- Don't attach (default) metadata before the source-feature execution.-->
+ <id>default-p2-metadata-default</id>
+ <configuration>
+ <attachP2Metadata>false</attachP2Metadata>
+ </configuration>
+ </execution>
+ <execution>
+ <id>attach-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/packaging/org.eclipse.emf.compare.update/pom.xml b/packaging/org.eclipse.emf.compare.update/pom.xml
index 94c61ad2d..deb41e994 100644
--- a/packaging/org.eclipse.emf.compare.update/pom.xml
+++ b/packaging/org.eclipse.emf.compare.update/pom.xml
@@ -24,7 +24,6 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-repository-plugin</artifactId>
- <version>${tycho-version}</version>
<configuration>
<createArtifactRepository>true</createArtifactRepository>
<finalName>${project.groupId}-${unqualifiedVersion}.${buildQualifier}</finalName>
@@ -33,8 +32,8 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
<executions>
<execution>
<phase>verify</phase>
diff --git a/performance/org.eclipse.emf.compare.tests.performance/pom.xml b/performance/org.eclipse.emf.compare.tests.performance/pom.xml
index ef467c91c..46736a663 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/pom.xml
+++ b/performance/org.eclipse.emf.compare.tests.performance/pom.xml
@@ -18,7 +18,6 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
<configuration>
<includes>
<include>org/eclipse/emf/compare/tests/performance/PerformanceSuite.class</include>
diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/pom.xml b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/pom.xml
index 76c1314cc..c44e9bff8 100644
--- a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/pom.xml
+++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/pom.xml
@@ -18,7 +18,6 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
<configuration>
<includes>
<include>org/eclipse/emf/compare/diagram/ecoretools/tests/suite/AllTests.class</include>
diff --git a/plugins/org.eclipse.emf.compare.diagram.edit/pom.xml b/plugins/org.eclipse.emf.compare.diagram.edit/pom.xml
index 4ac5bc5c7..bf3344b2d 100644
--- a/plugins/org.eclipse.emf.compare.diagram.edit/pom.xml
+++ b/plugins/org.eclipse.emf.compare.diagram.edit/pom.xml
@@ -12,4 +12,13 @@
<artifactId>org.eclipse.emf.compare.diagram.edit</artifactId>
<version>2.3.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/pom.xml b/plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/pom.xml
index 89877064a..62973a13c 100644
--- a/plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/pom.xml
+++ b/plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/pom.xml
@@ -18,7 +18,6 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
<configuration>
<includes>
<include>org/eclipse/emf/compare/diagram/ide/ecoretools/tests/suite/AllTests.class</include>
diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/pom.xml b/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/pom.xml
index 280fd2e69..f5bf4d579 100644
--- a/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/pom.xml
+++ b/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/pom.xml
@@ -12,4 +12,13 @@
<artifactId>org.eclipse.emf.compare.diagram.ide.ui.ecoretools</artifactId>
<version>2.3.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/pom.xml b/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/pom.xml
index 3281fcbdf..14f9260bc 100644
--- a/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/pom.xml
+++ b/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/pom.xml
@@ -12,4 +12,13 @@
<artifactId>org.eclipse.emf.compare.diagram.ide.ui.papyrus</artifactId>
<version>2.3.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ui/pom.xml b/plugins/org.eclipse.emf.compare.diagram.ide.ui/pom.xml
index 86153d8f4..296d1c593 100644
--- a/plugins/org.eclipse.emf.compare.diagram.ide.ui/pom.xml
+++ b/plugins/org.eclipse.emf.compare.diagram.ide.ui/pom.xml
@@ -12,4 +12,13 @@
<artifactId>org.eclipse.emf.compare.diagram.ide.ui</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/pom.xml b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/pom.xml
index f9313f193..aec2b990e 100644
--- a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/pom.xml
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/pom.xml
@@ -18,7 +18,6 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
<configuration>
<includes>
<include>org/eclipse/emf/compare/diagram/papyrus/tests/suite/AllTests.class</include>
diff --git a/plugins/org.eclipse.emf.compare.diagram/pom.xml b/plugins/org.eclipse.emf.compare.diagram/pom.xml
index a6cdfc33a..f83c39646 100644
--- a/plugins/org.eclipse.emf.compare.diagram/pom.xml
+++ b/plugins/org.eclipse.emf.compare.diagram/pom.xml
@@ -12,4 +12,13 @@
<artifactId>org.eclipse.emf.compare.diagram</artifactId>
<version>2.2.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/plugins/org.eclipse.emf.compare.doc/pom.xml b/plugins/org.eclipse.emf.compare.doc/pom.xml
index e0cd3de87..942791425 100644
--- a/plugins/org.eclipse.emf.compare.doc/pom.xml
+++ b/plugins/org.eclipse.emf.compare.doc/pom.xml
@@ -60,7 +60,6 @@
-->
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
<executions>
<execution>
<phase>generate-resources</phase>
diff --git a/plugins/org.eclipse.emf.compare.edit/pom.xml b/plugins/org.eclipse.emf.compare.edit/pom.xml
index da2eb6ab1..b1e74cf40 100644
--- a/plugins/org.eclipse.emf.compare.edit/pom.xml
+++ b/plugins/org.eclipse.emf.compare.edit/pom.xml
@@ -12,4 +12,13 @@
<artifactId>org.eclipse.emf.compare.edit</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/plugins/org.eclipse.emf.compare.ide.tests/pom.xml b/plugins/org.eclipse.emf.compare.ide.tests/pom.xml
index b4e832869..c8c86ef82 100644
--- a/plugins/org.eclipse.emf.compare.ide.tests/pom.xml
+++ b/plugins/org.eclipse.emf.compare.ide.tests/pom.xml
@@ -18,7 +18,6 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
<configuration>
<includes>
<include>org/eclipse/emf/compare/ide/tests/suite/AllTests.class</include>
diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests.git/pom.xml b/plugins/org.eclipse.emf.compare.ide.ui.tests.git/pom.xml
index cac15fee4..690dd2622 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui.tests.git/pom.xml
+++ b/plugins/org.eclipse.emf.compare.ide.ui.tests.git/pom.xml
@@ -18,7 +18,6 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
<configuration>
<includes>
<include>org/eclipse/emf/compare/ide/ui/tests/suite/AllTests.class</include>
@@ -26,7 +25,6 @@
<useUIHarness>true</useUIHarness>
<useUIThread>false</useUIThread>
<appArgLine>-Xmx1024m -XX:MaxPermSize=256m</appArgLine>
- <testFailureIgnore>true</testFailureIgnore>
</configuration>
</plugin>
</plugins>
diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests/pom.xml b/plugins/org.eclipse.emf.compare.ide.ui.tests/pom.xml
index e524db60d..27a23572c 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui.tests/pom.xml
+++ b/plugins/org.eclipse.emf.compare.ide.ui.tests/pom.xml
@@ -18,7 +18,6 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
<configuration>
<includes>
<include>org/eclipse/emf/compare/ide/ui/tests/suite/AllTests.class</include>
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/pom.xml b/plugins/org.eclipse.emf.compare.ide.ui/pom.xml
index 2bec2bfdb..0f9a67db2 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/pom.xml
+++ b/plugins/org.eclipse.emf.compare.ide.ui/pom.xml
@@ -12,4 +12,13 @@
<artifactId>org.eclipse.emf.compare.ide.ui</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/plugins/org.eclipse.emf.compare.ide/pom.xml b/plugins/org.eclipse.emf.compare.ide/pom.xml
index 7e6f0b76b..45a546f4f 100644
--- a/plugins/org.eclipse.emf.compare.ide/pom.xml
+++ b/plugins/org.eclipse.emf.compare.ide/pom.xml
@@ -12,4 +12,13 @@
<artifactId>org.eclipse.emf.compare.ide</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui.tests/pom.xml b/plugins/org.eclipse.emf.compare.rcp.ui.tests/pom.xml
index a5eb17549..99a970733 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui.tests/pom.xml
+++ b/plugins/org.eclipse.emf.compare.rcp.ui.tests/pom.xml
@@ -18,14 +18,12 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
<configuration>
<includes>
<include>org/eclipse/emf/compare/rcp/ui/tests/suite/AllTests.class</include>
</includes>
<useUIHarness>true</useUIHarness>
<useUIThread>false</useUIThread>
- <appArgLine>-Xmx1024m -XX:MaxPermSize=256m</appArgLine>
</configuration>
</plugin>
</plugins>
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/pom.xml b/plugins/org.eclipse.emf.compare.rcp.ui/pom.xml
index 0a7c9c32f..c002d64cd 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/pom.xml
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/pom.xml
@@ -12,4 +12,13 @@
<artifactId>org.eclipse.emf.compare.rcp.ui</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/plugins/org.eclipse.emf.compare.rcp/pom.xml b/plugins/org.eclipse.emf.compare.rcp/pom.xml
index 47ae39f64..12a247d7d 100644
--- a/plugins/org.eclipse.emf.compare.rcp/pom.xml
+++ b/plugins/org.eclipse.emf.compare.rcp/pom.xml
@@ -12,4 +12,13 @@
<artifactId>org.eclipse.emf.compare.rcp</artifactId>
<version>2.2.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/plugins/org.eclipse.emf.compare.subversive/pom.xml b/plugins/org.eclipse.emf.compare.subversive/pom.xml
index 2a270c27a..7df8e02c7 100644
--- a/plugins/org.eclipse.emf.compare.subversive/pom.xml
+++ b/plugins/org.eclipse.emf.compare.subversive/pom.xml
@@ -12,4 +12,13 @@
<artifactId>org.eclipse.emf.compare.subversive</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/plugins/org.eclipse.emf.compare.tests.fuzzy/pom.xml b/plugins/org.eclipse.emf.compare.tests.fuzzy/pom.xml
index 6e954abc2..15717266a 100644
--- a/plugins/org.eclipse.emf.compare.tests.fuzzy/pom.xml
+++ b/plugins/org.eclipse.emf.compare.tests.fuzzy/pom.xml
@@ -17,14 +17,12 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
<configuration>
<includes>
<include>org/eclipse/emf/compare/tests/suite/AllPluginTests.class</include>
</includes>
<useUIHarness>false</useUIHarness>
<useUIThread>false</useUIThread>
- <appArgLine>-Xmx1024m -XX:MaxPermSize=256m</appArgLine>
</configuration>
</plugin>
</plugins>
diff --git a/plugins/org.eclipse.emf.compare.tests/pom.xml b/plugins/org.eclipse.emf.compare.tests/pom.xml
index a3991857b..17c523f04 100644
--- a/plugins/org.eclipse.emf.compare.tests/pom.xml
+++ b/plugins/org.eclipse.emf.compare.tests/pom.xml
@@ -18,7 +18,6 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
<configuration>
<includes>
<include>org/eclipse/emf/compare/tests/suite/AllTests.class</include>
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/pom.xml b/plugins/org.eclipse.emf.compare.uml2.edit/pom.xml
index 1884cff8d..f2f853c32 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/pom.xml
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/pom.xml
@@ -12,4 +12,13 @@
<artifactId>org.eclipse.emf.compare.uml2.edit</artifactId>
<version>2.2.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests/pom.xml b/plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests/pom.xml
index 99ba8c995..316747e36 100644
--- a/plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests/pom.xml
+++ b/plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests/pom.xml
@@ -18,7 +18,6 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
<configuration>
<includes>
<include>org/eclipse/emf/compare/uml2/rcp/ui/tests/suite/AllTests.class</include>
diff --git a/plugins/org.eclipse.emf.compare.uml2.rcp.ui/pom.xml b/plugins/org.eclipse.emf.compare.uml2.rcp.ui/pom.xml
index 9f157ffc7..35e605ab4 100644
--- a/plugins/org.eclipse.emf.compare.uml2.rcp.ui/pom.xml
+++ b/plugins/org.eclipse.emf.compare.uml2.rcp.ui/pom.xml
@@ -12,4 +12,13 @@
<artifactId>org.eclipse.emf.compare.uml2.rcp.ui</artifactId>
<version>2.2.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/plugins/org.eclipse.emf.compare.uml2.rcp/pom.xml b/plugins/org.eclipse.emf.compare.uml2.rcp/pom.xml
index 1c3f12f2b..5b6d06d69 100644
--- a/plugins/org.eclipse.emf.compare.uml2.rcp/pom.xml
+++ b/plugins/org.eclipse.emf.compare.uml2.rcp/pom.xml
@@ -12,4 +12,13 @@
<artifactId>org.eclipse.emf.compare.uml2.rcp</artifactId>
<version>2.2.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml b/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml
index 414b16514..087877c0f 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml
@@ -18,7 +18,6 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
<configuration>
<includes>
<include>org/eclipse/emf/compare/uml2/tests/suite/AllTests.class</include>
diff --git a/plugins/org.eclipse.emf.compare.uml2/pom.xml b/plugins/org.eclipse.emf.compare.uml2/pom.xml
index 31c14d1df..1545c88a4 100644
--- a/plugins/org.eclipse.emf.compare.uml2/pom.xml
+++ b/plugins/org.eclipse.emf.compare.uml2/pom.xml
@@ -12,4 +12,13 @@
<artifactId>org.eclipse.emf.compare.uml2</artifactId>
<version>2.2.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/plugins/org.eclipse.emf.compare/pom.xml b/plugins/org.eclipse.emf.compare/pom.xml
index 2567ad424..aad3c193d 100644
--- a/plugins/org.eclipse.emf.compare/pom.xml
+++ b/plugins/org.eclipse.emf.compare/pom.xml
@@ -12,4 +12,13 @@
<artifactId>org.eclipse.emf.compare</artifactId>
<version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>

Back to the top