Author: mickael_istria Date: 2012-04-19 05:11:57 -0400 (Thu, 19 Apr 2012) New Revision: 40325 Modified: trunk/build/parent/pom.xml Log: JBIDE-10537 : Re-enable Jacoco (0.5.7) Modified: trunk/build/parent/pom.xml =================================================================== --- trunk/build/parent/pom.xml 2012-04-19 09:02:39 UTC (rev 40324) +++ trunk/build/parent/pom.xml 2012-04-19 09:11:57 UTC (rev 40325) @@ -176,7 +176,8 @@ <useUIHarness>true</useUIHarness> <useUIThread>true</useUIThread> <!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING --> - <argLine>${memoryOptions1} ${memoryOptions2} ${systemProperties} -Dusage_reporting_enabled=false</argLine> + <!-- tycho.testArgLine repeated to keep jacoco configuration for jacoco-maven-plugin --> + <argLine>${tycho.testArgLine} ${memoryOptions1} ${memoryOptions2} ${systemProperties} -Dusage_reporting_enabled=false</argLine> <!-- https://docs.sonatype.org/display/TYCHO/How+to+run+SWTBot+tests+with+Tycho --> <!-- set useUIThread=true for regular ui tests --> <!-- set useUIThread=false for swtbot tests (?) --> @@ -248,31 +249,28 @@ <encoding>ISO-8859-1</encoding> </configuration> </plugin> - <!-- Plugin disabled because of conflicts with Emma: JBIDE-10537 - TODO re-enable as soon as we have Jacoco "continous" reports, and we get rid of Emma <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> - <version>0.5.6.201201232323</version> + <version>0.5.7.201204190339</version> <executions> <execution> <goals> <goal>prepare-agent</goal> </goals> <configuration> - <!- Where to put jacoco coverage report, basically in the tests/target folder - for each component -> + <!-- Where to put jacoco coverage report, basically in the tests/target folder + for each component --> <destFile>../target/jacoco.exec</destFile> <includes> <include>${coverage.filter}</include> </includes> - <!- Merge reports from all executions -> + <!-- Merge reports from all executions --> <append>true</append> </configuration> </execution> </executions> </plugin> - --> </plugins> <pluginManagement>