cleaned up pom.xml file
diff --git a/build/org.eclipse.app4mc.build/pom.xml b/build/org.eclipse.app4mc.build/pom.xml index 9858f98..0e7eb10 100644 --- a/build/org.eclipse.app4mc.build/pom.xml +++ b/build/org.eclipse.app4mc.build/pom.xml
@@ -233,71 +233,9 @@ </modules> - <profiles> - <profile> - <id>withoutSigning</id> - - <!-- <activation> - <property> - <name>target</name> - <value>neon</value> - </property> - </activation>--> - - - - <modules> - <!--<module></module>--> - </modules> - - <build> <pluginManagement> <plugins> - - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200a-plugin</artifactId> - <version>${tycho-extras-version}</version> - <executions> - <execution> - <id>pack200-normalize</id> - <goals> - <goal>normalize</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.eclipse.cbi.maven.plugins</groupId> - <artifactId>eclipse-jarsigner-plugin</artifactId> - <version>1.1.3</version> - <executions> - <execution> - <id>sign</id> - <phase>package</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200b-plugin</artifactId> - <version>${tycho-extras-version}</version> - <executions> - <execution> - <id>pack200-pack</id> - <goals> - <goal>pack</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-packaging-plugin</artifactId> @@ -332,6 +270,7 @@ </baselineRepositories> </configuration> </plugin> + <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-compiler-plugin</artifactId> @@ -355,49 +294,6 @@ </pluginManagement> <plugins> - - - - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <version>${tycho.version}</version> - - <configuration> - <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_64</arch> - </environment> - <environment> - <os>macosx</os> - <ws>cocoa</ws> - <arch>x86_64</arch> - </environment> - </environments> - - <target> - <artifact> - <groupId>org.eclipse.app4mc.build</groupId> - <artifactId>org.eclipse.app4mc.target</artifactId> - <version>0.9.6-SNAPSHOT</version> - <classifier>./OXYGEN/_gen/_oxygen_platform_others_latest</classifier> - </artifact> - </target> - </configuration> - </plugin> - <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-maven-plugin</artifactId> @@ -405,7 +301,7 @@ <extensions>true</extensions> </plugin> - + <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-source-plugin</artifactId> @@ -436,221 +332,13 @@ </plugin> <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.4.201502262128</version> - - <executions> - <!-- Prepares the property pointing to the JaCoCo runtime agent which - is passed as VM argument when Maven the Surefire plugin is executed. --> - <execution> - <id>pre-unit-test</id> - <goals> - <goal>prepare-agent</goal> - </goals> - <configuration> - <!-- Sets the path to the file which contains the execution data. --> - <destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile> - </configuration> - </execution> - - <!-- Ensures that the code coverage report for unit tests is created - after unit tests have been run. --> - <execution> - <id>post-unit-test</id> - <phase>verify</phase> - <goals> - <goal>report</goal> - </goals> - <configuration> - <!-- Sets the path to the file which contains the execution data. --> - <dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile> - <!-- Sets the output directory for the code coverage report. --> - <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - </profile> - <profile> - <id>photon</id> - - - - <activation> - <activeByDefault>true</activeByDefault> - </activation> - - - <modules> - <!--<module></module>--> - </modules> - - - <build> - <pluginManagement> - <plugins> - - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200a-plugin</artifactId> - <version>${tycho-extras-version}</version> - <executions> - <execution> - <id>pack200-normalize</id> - <goals> - <goal>normalize</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.eclipse.cbi.maven.plugins</groupId> - <artifactId>eclipse-jarsigner-plugin</artifactId> - <version>1.1.3</version> - <executions> - <execution> - <id>sign</id> - <phase>package</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200b-plugin</artifactId> - <version>${tycho-extras-version}</version> - <executions> - <execution> - <id>pack200-pack</id> - <goals> - <goal>pack</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-packaging-plugin</artifactId> - <version>${tycho.version}</version> - - <dependencies> - <dependency> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-buildtimestamp-jgit</artifactId> - <version>${tycho.version}</version> - </dependency> - </dependencies> - - <configuration> - <timestampProvider>jgit</timestampProvider> - <jgit.ignore>pom.xml</jgit.ignore> - <jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree> - </configuration> - </plugin> - - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-p2-plugin</artifactId> - <version>${tycho.version}</version> - - <configuration> - <baselineReplace>none</baselineReplace> - <baselineRepositories> - <repository> - <url>https://download.eclipse.org/app4mc/updatesites/releases/0.9.5/</url> - </repository> - </baselineRepositories> - </configuration> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-compiler-plugin</artifactId> - <version>${tycho.version}</version> - - <configuration> - <useProjectSettings>false</useProjectSettings> - <encoding>UTF-8</encoding> - <extraClasspathElements> - <extraClasspathElement> - <groupId>com.oracle</groupId> - <artifactId>javafx</artifactId> - <version>8.0.0-SNAPSHOT</version> - <systemPath>${java.home}/lib/jfxswt.jar</systemPath> - <scope>system</scope> - </extraClasspathElement> - </extraClasspathElements> - </configuration> - </plugin> - </plugins> - </pluginManagement> - - <plugins> - - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200a-plugin</artifactId> - <version>${tycho-extras-version}</version> - <executions> - <execution> - <id>pack200-normalize</id> - <goals> - <goal>normalize</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.eclipse.cbi.maven.plugins</groupId> - <artifactId>eclipse-jarsigner-plugin</artifactId> - <version>1.1.3</version> - <executions> - <execution> - <id>sign</id> - <phase>package</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200b-plugin</artifactId> - <version>${tycho-extras-version}</version> - <executions> - <execution> - <id>pack200-pack</id> - <goals> - <goal>pack</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - - - <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>target-platform-configuration</artifactId> <version>${tycho.version}</version> <configuration> + <includePackedArtifacts>true</includePackedArtifacts> <environments> - <!--<environment> - <os>win32</os> - <ws>win32</ws> - <arch>x86</arch> - </environment>--> <environment> <os>win32</os> <ws>win32</ws> @@ -667,8 +355,7 @@ <arch>x86_64</arch> </environment> </environments> - - <target> + <target> <artifact> <groupId>org.eclipse.app4mc.build</groupId> <artifactId>org.eclipse.app4mc.target</artifactId> @@ -676,621 +363,50 @@ <classifier>./PHOTON/_gen/_photon_platform_others_latest</classifier> </artifact> </target> - </configuration> </plugin> - - <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>tycho-source-plugin</artifactId> - <version>${tycho.version}</version> - - <executions> - <execution> - <id>plugin-source</id> - <goals> - <goal>plugin-source</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <version>${tycho.version}</version> - - <configuration> - <includes> - <forkMode>never</forkMode> - <include>**/*Test.java</include> - <include>**/*Tests.java</include> - </includes> - </configuration> - </plugin> - - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.4.201502262128</version> - - <executions> - <!-- Prepares the property pointing to the JaCoCo runtime agent which - is passed as VM argument when Maven the Surefire plugin is executed. --> - <execution> - <id>pre-unit-test</id> - <goals> - <goal>prepare-agent</goal> - </goals> - <configuration> - <!-- Sets the path to the file which contains the execution data. --> - <destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile> - </configuration> - </execution> - - <!-- Ensures that the code coverage report for unit tests is created - after unit tests have been run. --> - <execution> - <id>post-unit-test</id> - <phase>verify</phase> - <goals> - <goal>report</goal> - </goals> - <configuration> - <!-- Sets the path to the file which contains the execution data. --> - <dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile> - <!-- Sets the output directory for the code coverage report. --> - <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - </profile> - - <profile> - <id>oxygen</id> - - - - <activation> - <activeByDefault>false</activeByDefault> - </activation> - - - <modules> - <!--<module></module>--> - </modules> - - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200a-plugin</artifactId> - <version>${tycho-extras-version}</version> - <executions> - <execution> - <id>pack200-normalize</id> - <goals> - <goal>normalize</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.eclipse.cbi.maven.plugins</groupId> - <artifactId>eclipse-jarsigner-plugin</artifactId> - <version>1.1.3</version> - <executions> - <execution> - <id>sign</id> - <phase>package</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200b-plugin</artifactId> - <version>${tycho-extras-version}</version> - <executions> - <execution> - <id>pack200-pack</id> - <goals> - <goal>pack</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-packaging-plugin</artifactId> - <version>${tycho.version}</version> - + <!-- + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-eclipserun-plugin</artifactId> + <version>${tycho-extras-version}</version> + <configuration> + <repositories> + <repository> + <id>${platform-version-name}</id> + <layout>p2</layout> + <url>http://download.eclipse.org/releases/${platform-version-name}</url> + </repository> + <repository> + <id>targetplatform</id> + <layout>p2</layout> + <url>${targetPlatform.repository.p2}</url> + </repository> + </repositories> + <appArgLine>-consoleLog -application ${targetPlatform.application.name} ${targetPlatform.application.args}</appArgLine> <dependencies> <dependency> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-buildtimestamp-jgit</artifactId> - <version>${tycho.version}</version> + <artifactId>${targetPlatform.application.feature}</artifactId> + <type>eclipse-feature</type> </dependency> - </dependencies> - - <configuration> - <timestampProvider>jgit</timestampProvider> - <jgit.ignore>pom.xml</jgit.ignore> - <jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree> - </configuration> - </plugin> - - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-p2-plugin</artifactId> - <version>${tycho.version}</version> - - <configuration> - <baselineReplace>none</baselineReplace> - <baselineRepositories> - <repository> - <url>https://download.eclipse.org/app4mc/updatesites/releases/0.9.5/</url> - </repository> - </baselineRepositories> - </configuration> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-compiler-plugin</artifactId> - <version>${tycho.version}</version> - - <configuration> - <useProjectSettings>false</useProjectSettings> - <encoding>UTF-8</encoding> - <extraClasspathElements> - <extraClasspathElement> - <groupId>com.oracle</groupId> - <artifactId>javafx</artifactId> - <version>8.0.0-SNAPSHOT</version> - <systemPath>${java.home}/lib/jfxswt.jar</systemPath> - <scope>system</scope> - </extraClasspathElement> - </extraClasspathElements> - </configuration> - </plugin> - </plugins> - </pluginManagement> - - <plugins> - - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200a-plugin</artifactId> - <version>${tycho-extras-version}</version> - <executions> - <execution> - <id>pack200-normalize</id> - <goals> - <goal>normalize</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.eclipse.cbi.maven.plugins</groupId> - <artifactId>eclipse-jarsigner-plugin</artifactId> - <version>1.1.3</version> - <executions> - <execution> - <id>sign</id> - <phase>package</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200b-plugin</artifactId> - <version>${tycho-extras-version}</version> - <executions> - <execution> - <id>pack200-pack</id> - <goals> - <goal>pack</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - - - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <version>${tycho.version}</version> - - <configuration> - <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_64</arch> - </environment> - <environment> - <os>macosx</os> - <ws>cocoa</ws> - <arch>x86_64</arch> - </environment> - </environments> - - <target> - <artifact> - <groupId>org.eclipse.app4mc.build</groupId> - <artifactId>org.eclipse.app4mc.target</artifactId> - <version>0.9.6-SNAPSHOT</version> - <classifier>./OXYGEN/_gen/_oxygen_platform_others_latest</classifier> - </artifact> - </target> - - </configuration> - </plugin> - - <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>tycho-source-plugin</artifactId> - <version>${tycho.version}</version> - - <executions> - <execution> - <id>plugin-source</id> - <goals> - <goal>plugin-source</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <version>${tycho.version}</version> - - <configuration> - <includes> - <forkMode>never</forkMode> - <include>**/*Test.java</include> - <include>**/*Tests.java</include> - </includes> - </configuration> - </plugin> - - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.4.201502262128</version> - - <executions> - <!-- Prepares the property pointing to the JaCoCo runtime agent which - is passed as VM argument when Maven the Surefire plugin is executed. --> - <execution> - <id>pre-unit-test</id> - <goals> - <goal>prepare-agent</goal> - </goals> - <configuration> - <!-- Sets the path to the file which contains the execution data. --> - <destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile> - </configuration> - </execution> - - <!-- Ensures that the code coverage report for unit tests is created - after unit tests have been run. --> - <execution> - <id>post-unit-test</id> - <phase>verify</phase> - <goals> - <goal>report</goal> - </goals> - <configuration> - <!-- Sets the path to the file which contains the execution data. --> - <dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile> - <!-- Sets the output directory for the code coverage report. --> - <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - </profile> - - - - - - <profile> - <id>neon</id> - - <!-- <activation> - <property> - <name>target</name> - <value>neon</value> - </property> - </activation>--> - - <!-- <activation> - <activeByDefault>true</activeByDefault> - </activation> - --> - - <modules> - <!--<module></module>--> - </modules> - - - <build> - <pluginManagement> - <plugins> - - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200a-plugin</artifactId> - <version>${tycho-extras-version}</version> - <executions> - <execution> - <id>pack200-normalize</id> - <goals> - <goal>normalize</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.eclipse.cbi.maven.plugins</groupId> - <artifactId>eclipse-jarsigner-plugin</artifactId> - <version>1.1.3</version> - <executions> - <execution> - <id>sign</id> - <phase>package</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200b-plugin</artifactId> - <version>${tycho-extras-version}</version> - <executions> - <execution> - <id>pack200-pack</id> - <goals> - <goal>pack</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-packaging-plugin</artifactId> - <version>${tycho.version}</version> - - <dependencies> <dependency> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-buildtimestamp-jgit</artifactId> - <version>${tycho.version}</version> + <artifactId>org.eclipse.equinox.p2.sdk</artifactId> + <type>eclipse-feature</type> </dependency> </dependencies> - - <configuration> - <timestampProvider>jgit</timestampProvider> - <jgit.ignore>pom.xml</jgit.ignore> - <jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree> - </configuration> - </plugin> - - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-p2-plugin</artifactId> - <version>${tycho.version}</version> - - <configuration> - <baselineReplace>none</baselineReplace> - <baselineRepositories> - <repository> - <url>https://download.eclipse.org/app4mc/updatesites/releases/0.9.5/</url> - </repository> - </baselineRepositories> - </configuration> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-compiler-plugin</artifactId> - <version>${tycho.version}</version> - - <configuration> - <useProjectSettings>false</useProjectSettings> - <encoding>UTF-8</encoding> - <extraClasspathElements> - <extraClasspathElement> - <groupId>com.oracle</groupId> - <artifactId>javafx</artifactId> - <version>8.0.0-SNAPSHOT</version> - <systemPath>${java.home}/lib/jfxswt.jar</systemPath> - <scope>system</scope> - </extraClasspathElement> - </extraClasspathElements> - </configuration> - </plugin> - </plugins> - </pluginManagement> - - <plugins> - - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200a-plugin</artifactId> - <version>${tycho-extras-version}</version> - <executions> - <execution> - <id>pack200-normalize</id> - <goals> - <goal>normalize</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.eclipse.cbi.maven.plugins</groupId> - <artifactId>eclipse-jarsigner-plugin</artifactId> - <version>1.1.3</version> - <executions> - <execution> - <id>sign</id> - <phase>package</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200b-plugin</artifactId> - <version>${tycho-extras-version}</version> - <executions> - <execution> - <id>pack200-pack</id> - <goals> - <goal>pack</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - - - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <version>${tycho.version}</version> - - <configuration> - <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_64</arch> - </environment> - <environment> - <os>macosx</os> - <ws>cocoa</ws> - <arch>x86_64</arch> - </environment> - </environments> - - <target> - <artifact> - <groupId>org.eclipse.app4mc.build</groupId> - <artifactId>org.eclipse.app4mc.target</artifactId> - <version>0.9.6-SNAPSHOT</version> - <classifier>dev</classifier> - </artifact> - </target> </configuration> - </plugin> - - <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>tycho-source-plugin</artifactId> - <version>${tycho.version}</version> - <executions> <execution> - <id>plugin-source</id> <goals> - <goal>plugin-source</goal> + <goal>eclipse-run</goal> </goals> + <phase>validate</phase> </execution> </executions> </plugin> - - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <version>${tycho.version}</version> - - <configuration> - <includes> - <forkMode>never</forkMode> - <include>**/*Test.java</include> - <include>**/*Tests.java</include> - </includes> - </configuration> - </plugin> - + --> + <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> @@ -1329,331 +445,77 @@ </plugin> </plugins> </build> - - </profile> - <profile> - <id>mars</id> - - <!-- <activation> - <property> - <name>target</name> - <value>mars</value> - </property> - </activation>--> - - - <modules> - <!--<module></module>--> - </modules> - - - <build> - <pluginManagement> - <plugins> - - <plugin> + <profiles> + <profile> + <id>sign</id> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-pack200a-plugin</artifactId> + <version>${tycho-extras-version}</version> + <executions> + <execution> + <id>pack200-normalize</id> + <goals> + <goal>normalize</goal> + </goals> + <phase>package</phase> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.eclipse.cbi.maven.plugins</groupId> <artifactId>eclipse-jarsigner-plugin</artifactId> <version>1.1.3</version> <executions> <execution> <id>sign</id> - <phase>verify</phase> + <phase>package</phase> <goals> <goal>sign</goal> </goals> </execution> </executions> </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.7</version> - - <executions> - <execution> - <id>replace-build-token</id> - <phase>pre-clean</phase> - - <configuration> - <target> - <!--<echo>==================Modifying the directory contents======================</echo> - - <delete dir="../org.eclipse.app4mc.platform.product"/> - <copy todir="../org.eclipse.app4mc.platform.product"> - <fileset dir="../../content_compatible_to_previous_targets/mars/build/org.eclipse.app4mc.platform.product/"> - - </fileset> - </copy> - - <delete dir="../org.eclipse.app4mc.target"/> - <copy todir="../org.eclipse.app4mc.target"> - <fileset dir="../../content_compatible_to_previous_targets/mars/build/org.eclipse.app4mc.target/"> - - </fileset> - </copy> - - - - <delete dir="../../features/org.eclipse.app4mc.multicore"/> - <copy todir="../../features/org.eclipse.app4mc.multicore"> - <fileset dir="../../content_compatible_to_previous_targets/mars/features/org.eclipse.app4mc.multicore/"> - - </fileset> - </copy> - - - <delete dir="../../features/org.eclipse.app4mc.platform.3rdparty"/> - <copy todir="../../features/org.eclipse.app4mc.platform.3rdparty"> - <fileset dir="../../content_compatible_to_previous_targets/mars/features/org.eclipse.app4mc.platform.3rdparty/"> - - </fileset> - </copy> - - <delete dir="../../features/org.eclipse.app4mc.validation.sdk"/> - <copy todir="../../features/org.eclipse.app4mc.validation.sdk"> - <fileset dir="../../content_compatible_to_previous_targets/mars/features/org.eclipse.app4mc.validation.sdk/"> - - </fileset> - </copy> - --> - - </target> - </configuration> - - <goals> - <goal>run</goal> - </goals> - </execution> - + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-pack200b-plugin</artifactId> + <version>${tycho-extras-version}</version> + <executions> + <execution> + <id>pack200-pack</id> + <goals> + <goal>pack</goal> + </goals> + <phase>package</phase> + </execution> + </executions> + </plugin> - </executions> - - </plugin> - - <plugin> - - - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-packaging-plugin</artifactId> - <version>${tycho.version}</version> - - <dependencies> - <dependency> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-buildtimestamp-jgit</artifactId> - <version>${tycho.version}</version> - </dependency> - </dependencies> - - <configuration> - <timestampProvider>jgit</timestampProvider> - <jgit.ignore>pom.xml</jgit.ignore> - <jgit.dirtyWorkingTree>ignore</jgit.dirtyWorkingTree> - </configuration> - </plugin> - - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-p2-plugin</artifactId> - <version>${tycho.version}</version> - - <configuration> - <baselineReplace>none</baselineReplace> - <baselineRepositories> - <repository> - <url>https://download.eclipse.org/app4mc/updatesites/releases/0.9.5/</url> - </repository> - </baselineRepositories> - </configuration> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-compiler-plugin</artifactId> - <version>${tycho.version}</version> - - <configuration> - <useProjectSettings>false</useProjectSettings> - <encoding>UTF-8</encoding> - <extraClasspathElements> - <extraClasspathElement> - <groupId>com.oracle</groupId> - <artifactId>javafx</artifactId> - <version>8.0.0-SNAPSHOT</version> - <systemPath>${java.home}/lib/jfxswt.jar</systemPath> - <scope>system</scope> - </extraClasspathElement> - </extraClasspathElements> - </configuration> - </plugin> - </plugins> - </pluginManagement> - - <plugins> - - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200a-plugin</artifactId> - <version>${tycho-extras-version}</version> - <executions> - <execution> - <id>pack200-normalize</id> - <goals> - <goal>normalize</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.eclipse.cbi.maven.plugins</groupId> - <artifactId>eclipse-jarsigner-plugin</artifactId> - <version>1.1.3</version> - <executions> - <execution> - <id>sign</id> - <phase>package</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200b-plugin</artifactId> - <version>${tycho-extras-version}</version> - <executions> - <execution> - <id>pack200-pack</id> - <goals> - <goal>pack</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <version>${tycho.version}</version> - - <configuration> - <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_64</arch> - </environment> - <environment> - <os>macosx</os> - <ws>cocoa</ws> - <arch>x86_64</arch> - </environment> - </environments> - - <target> - <artifact> - <groupId>org.eclipse.app4mc.build</groupId> - <artifactId>org.eclipse.app4mc.target</artifactId> - <version>0.9.6-SNAPSHOT</version> - <classifier>dev</classifier> - </artifact> - </target> - </configuration> - </plugin> - - <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>tycho-source-plugin</artifactId> - <version>${tycho.version}</version> - - <executions> - <execution> - <id>plugin-source</id> - <goals> - <goal>plugin-source</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <version>${tycho.version}</version> - - <configuration> - <includes> - <forkMode>never</forkMode> - <include>**/*Test.java</include> - <include>**/*Tests.java</include> - </includes> - </configuration> - </plugin> - - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.4.201502262128</version> - - <executions> - <!-- Prepares the property pointing to the JaCoCo runtime agent which - is passed as VM argument when Maven the Surefire plugin is executed. --> - <execution> - <id>pre-unit-test</id> - <goals> - <goal>prepare-agent</goal> - </goals> + <!-- Then, alter p2-metadata to make the .pack.gz artifact visible from other modules --> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tychoVersion}</version> + <executions> + <execution> + <id>p2-metadata</id> + <goals> + <goal>p2-metadata</goal> + </goals> + <phase>package</phase> + </execution> + </executions> <configuration> - <!-- Sets the path to the file which contains the execution data. --> - <destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile> + <defaultP2Metadata>false</defaultP2Metadata> </configuration> - </execution> - - <!-- Ensures that the code coverage report for unit tests is created - after unit tests have been run. --> - <execution> - <id>post-unit-test</id> - <phase>verify</phase> - <goals> - <goal>report</goal> - </goals> - <configuration> - <!-- Sets the path to the file which contains the execution data. --> - <dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile> - <!-- Sets the output directory for the code coverage report. --> - <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - </profile> - + </plugin> + </plugins> + </build> + </profile> </profiles> -</project> \ No newline at end of file + </project> \ No newline at end of file