Maven: Optimize JaCoCo build

20 files changed, 115 insertions, 33 deletions

diff --git a/.gitignore b/.gitignore
index 6e847cb57..bc8c6fbad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,7 +65,8 @@ plugins/org.eclipse.tcf.rse/bin
 # Tests
 tests/plugins/org.eclipse.tcf.debug.test/bin
 
-# target explorer
+# Target Explorer
+/target_explorer/coverage/
 /target_explorer/plugins/org.eclipse.tcf.te.core/target
 /target_explorer/plugins/org.eclipse.tcf.te.core/bin
 /target_explorer/plugins/org.eclipse.tcf.te.core.cdt/target
diff --git a/admin/pom-build.xml b/admin/pom-build.xml
index f565d9be6..1d3f18ed8 100644
--- a/admin/pom-build.xml
+++ b/admin/pom-build.xml
@@ -47,5 +47,45 @@
 				</plugins>
 			</build>
 		</profile>
+		
+		<profile>
+			<id>jacoco</id>
+			
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-resources-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>copy-resources</id>
+								<phase>validate</phase>
+								<goals>
+									<goal>copy-resources</goal>
+								</goals>
+								<configuration>
+									<outputDirectory>${basedir}/target</outputDirectory>
+									<resources>
+										<resource>
+											<directory>${jacoco.basedir}</directory>
+											<filtering>true</filtering>
+											<includes>
+												<include>jacoco.exec</include>
+											</includes>
+										</resource>
+									</resources>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					
+					<plugin>
+						<groupId>org.jacoco</groupId>
+						<artifactId>jacoco-maven-plugin</artifactId>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+			
 	</profiles>
 </project>
diff --git a/admin/pom-config.xml b/admin/pom-config.xml
index 6b6d4463d..0b7b520df 100644
--- a/admin/pom-config.xml
+++ b/admin/pom-config.xml
@@ -25,6 +25,13 @@
 		<!-- Common global properties -->
 		<adminDir>${env.WORKSPACE}/admin</adminDir>
 
+		<!-- JaCoCo global properties -->
+		<jacoco.basedir>${env.WORKSPACE}/target_explorer/coverage</jacoco.basedir>
+		<jacoco.destFile>${jacoco.basedir}/jacoco.exec</jacoco.destFile>
+		<jacoco.dataFile>${jacoco.basedir}/jacoco.exec</jacoco.dataFile>
+		<jacoco.outputDirectory>${jacoco.basedir}/jacoco</jacoco.outputDirectory>
+		<jacoco.skip>false</jacoco.skip>
+		
 		<!-- P2 repository URL's -->
 		<platform-site>http://download.eclipse.org/eclipse/updates/3.8milestones</platform-site>
 		<cdt-site>http://download.eclipse.org/tools/cdt/builds/juno/nightly</cdt-site>
@@ -216,10 +223,8 @@
 								<goal>prepare-agent</goal>
 							</goals>
 							<configuration>
-								<append>true</append>
 								<output>file</output>
 								<dumpOnExit>true</dumpOnExit>
-								<skip>false</skip>
 							</configuration>
 						</execution>
 					</executions>
diff --git a/features/org.eclipse.tcf.cdt.feature/pom.xml b/features/org.eclipse.tcf.cdt.feature/pom.xml
index 10081cc41..15bc7eefe 100644
--- a/features/org.eclipse.tcf.cdt.feature/pom.xml
+++ b/features/org.eclipse.tcf.cdt.feature/pom.xml
@@ -14,4 +14,8 @@
 	<artifactId>org.eclipse.tcf.cdt.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
 	<version>1.0.0.qualifier</version>
+	
+	<properties>
+		<jacoco.skip>true</jacoco.skip>
+	</properties>
 </project>
diff --git a/features/org.eclipse.tcf.cdt.sdk.feature/pom.xml b/features/org.eclipse.tcf.cdt.sdk.feature/pom.xml
index 5adfe06d7..4a3d878f4 100644
--- a/features/org.eclipse.tcf.cdt.sdk.feature/pom.xml
+++ b/features/org.eclipse.tcf.cdt.sdk.feature/pom.xml
@@ -14,4 +14,8 @@
 	<artifactId>org.eclipse.tcf.cdt.sdk.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
 	<version>1.0.0.qualifier</version>
+	
+	<properties>
+		<jacoco.skip>true</jacoco.skip>
+	</properties>
 </project>
diff --git a/features/org.eclipse.tcf.feature/pom.xml b/features/org.eclipse.tcf.feature/pom.xml
index 77c7bcf3f..1dbc89281 100644
--- a/features/org.eclipse.tcf.feature/pom.xml
+++ b/features/org.eclipse.tcf.feature/pom.xml
@@ -14,4 +14,8 @@
 	<artifactId>org.eclipse.tcf.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
 	<version>1.0.0.qualifier</version>
+	
+	<properties>
+		<jacoco.skip>true</jacoco.skip>
+	</properties>
 </project>
diff --git a/features/org.eclipse.tcf.repo/pom.xml b/features/org.eclipse.tcf.repo/pom.xml
index f4707612c..b01d1e10f 100644
--- a/features/org.eclipse.tcf.repo/pom.xml
+++ b/features/org.eclipse.tcf.repo/pom.xml
@@ -19,6 +19,7 @@
 		<tcf-stream>juno</tcf-stream>
 		<tcf-zipfile>org.eclipse.tcf.repo.zip</tcf-zipfile>
 		<tcf-install>/home/data/httpd/download.eclipse.org/tools/tcf/builds/${tcf-stream}/nightly</tcf-install>
+		<jacoco.skip>true</jacoco.skip>
 	</properties>
 	
 	<pluginRepositories>
diff --git a/features/org.eclipse.tcf.rse.feature/pom.xml b/features/org.eclipse.tcf.rse.feature/pom.xml
index 978882608..1397a1c54 100644
--- a/features/org.eclipse.tcf.rse.feature/pom.xml
+++ b/features/org.eclipse.tcf.rse.feature/pom.xml
@@ -14,4 +14,8 @@
 	<artifactId>org.eclipse.tcf.rse.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
 	<version>1.0.0.qualifier</version>
+	
+	<properties>
+		<jacoco.skip>true</jacoco.skip>
+	</properties>
 </project>
diff --git a/features/org.eclipse.tcf.rse.sdk.feature/pom.xml b/features/org.eclipse.tcf.rse.sdk.feature/pom.xml
index ab57452fe..935a23c18 100644
--- a/features/org.eclipse.tcf.rse.sdk.feature/pom.xml
+++ b/features/org.eclipse.tcf.rse.sdk.feature/pom.xml
@@ -14,4 +14,8 @@
 	<artifactId>org.eclipse.tcf.rse.sdk.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
 	<version>1.0.0.qualifier</version>
+	
+	<properties>
+		<jacoco.skip>true</jacoco.skip>
+	</properties>
 </project>
diff --git a/features/org.eclipse.tcf.sdk.feature/pom.xml b/features/org.eclipse.tcf.sdk.feature/pom.xml
index 82d0e1f95..4b5379ff9 100644
--- a/features/org.eclipse.tcf.sdk.feature/pom.xml
+++ b/features/org.eclipse.tcf.sdk.feature/pom.xml
@@ -14,4 +14,8 @@
 	<artifactId>org.eclipse.tcf.sdk.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
 	<version>1.0.0.qualifier</version>
+	
+	<properties>
+		<jacoco.skip>true</jacoco.skip>
+	</properties>
 </project>
diff --git a/pom-tests.xml b/pom-tests.xml
index b0033ed0e..3086330f7 100644
--- a/pom-tests.xml
+++ b/pom-tests.xml
@@ -21,25 +21,4 @@
 		<module>target_explorer/plugins/org.eclipse.tcf.te.tests</module>
 	</modules>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>report</goal>
-						</goals>
-						<configuration>
-							<includes>
-								<include>org.eclipse.tcf.te.*</include>
-							</includes>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
 </project>
diff --git a/target_explorer/features/org.eclipse.tcf.te.cdt.feature/pom.xml b/target_explorer/features/org.eclipse.tcf.te.cdt.feature/pom.xml
index 19471efd5..ddc860f9e 100644
--- a/target_explorer/features/org.eclipse.tcf.te.cdt.feature/pom.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.cdt.feature/pom.xml
@@ -14,4 +14,8 @@
 	<version>1.0.0.qualifier</version>
 	<artifactId>org.eclipse.tcf.te.cdt.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
+	
+	<properties>
+		<jacoco.skip>true</jacoco.skip>
+	</properties>
 </project>
diff --git a/target_explorer/features/org.eclipse.tcf.te.cdt.sdk.feature/pom.xml b/target_explorer/features/org.eclipse.tcf.te.cdt.sdk.feature/pom.xml
index 5a72eb2bb..2e8229c1b 100644
--- a/target_explorer/features/org.eclipse.tcf.te.cdt.sdk.feature/pom.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.cdt.sdk.feature/pom.xml
@@ -14,4 +14,8 @@
 	<version>1.0.0.qualifier</version>
 	<artifactId>org.eclipse.tcf.te.cdt.sdk.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
+	
+	<properties>
+		<jacoco.skip>true</jacoco.skip>
+	</properties>
 </project>
diff --git a/target_explorer/features/org.eclipse.tcf.te.feature/pom.xml b/target_explorer/features/org.eclipse.tcf.te.feature/pom.xml
index 01140ef94..d6ff4e916 100644
--- a/target_explorer/features/org.eclipse.tcf.te.feature/pom.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.feature/pom.xml
@@ -14,4 +14,8 @@
 	<version>1.0.0.qualifier</version>
 	<artifactId>org.eclipse.tcf.te.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
+	
+	<properties>
+		<jacoco.skip>true</jacoco.skip>
+	</properties>
 </project>
diff --git a/target_explorer/features/org.eclipse.tcf.te.rcp.feature/pom.xml b/target_explorer/features/org.eclipse.tcf.te.rcp.feature/pom.xml
index 3171410b4..22760667f 100644
--- a/target_explorer/features/org.eclipse.tcf.te.rcp.feature/pom.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.rcp.feature/pom.xml
@@ -14,4 +14,8 @@
 	<version>1.0.0.qualifier</version>
 	<artifactId>org.eclipse.tcf.te.rcp.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
+	
+	<properties>
+		<jacoco.skip>true</jacoco.skip>
+	</properties>
 </project>
diff --git a/target_explorer/features/org.eclipse.tcf.te.sdk.feature/pom.xml b/target_explorer/features/org.eclipse.tcf.te.sdk.feature/pom.xml
index f5dfe82c9..0d560a071 100644
--- a/target_explorer/features/org.eclipse.tcf.te.sdk.feature/pom.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.sdk.feature/pom.xml
@@ -14,4 +14,8 @@
 	<version>1.0.0.qualifier</version>
 	<artifactId>org.eclipse.tcf.te.sdk.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
+	
+	<properties>
+		<jacoco.skip>true</jacoco.skip>
+	</properties>
 </project>
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.feature/pom.xml b/target_explorer/features/org.eclipse.tcf.te.tcf.feature/pom.xml
index 5c9257397..fa9843885 100644
--- a/target_explorer/features/org.eclipse.tcf.te.tcf.feature/pom.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.tcf.feature/pom.xml
@@ -14,4 +14,8 @@
 	<version>1.0.0.qualifier</version>
 	<artifactId>org.eclipse.tcf.te.tcf.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
+	
+	<properties>
+		<jacoco.skip>true</jacoco.skip>
+	</properties>
 </project>
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.rcp.feature/pom.xml b/target_explorer/features/org.eclipse.tcf.te.tcf.rcp.feature/pom.xml
index 35cb80480..8ab21832e 100644
--- a/target_explorer/features/org.eclipse.tcf.te.tcf.rcp.feature/pom.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.tcf.rcp.feature/pom.xml
@@ -14,4 +14,8 @@
 	<version>1.0.0.qualifier</version>
 	<artifactId>org.eclipse.tcf.te.tcf.rcp.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
+	
+	<properties>
+		<jacoco.skip>true</jacoco.skip>
+	</properties>
 </project>
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/pom.xml b/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/pom.xml
index d849e700c..52a0d108f 100644
--- a/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/pom.xml
+++ b/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/pom.xml
@@ -14,4 +14,8 @@
 	<version>1.0.0.qualifier</version>
 	<artifactId>org.eclipse.tcf.te.tcf.sdk.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
+	
+	<properties>
+		<jacoco.skip>true</jacoco.skip>
+	</properties>
 </project>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.statushandler/pom.xml b/target_explorer/plugins/org.eclipse.tcf.te.runtime.statushandler/pom.xml
index 9d5831d40..287a74b6b 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.statushandler/pom.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.statushandler/pom.xml
@@ -4,14 +4,14 @@
     xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>org.eclipse.tcf</groupId>
-    <artifactId>tcf-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../../pom.xml</relativePath>
-  </parent>
+	<parent>
+		<groupId>org.eclipse.tcf</groupId>
+		<artifactId>tcf-parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../../../pom.xml</relativePath>
+	</parent>
 
-  <version>1.0.0.qualifier</version>
-  <artifactId>org.eclipse.tcf.te.runtime.statushandler</artifactId>
-  <packaging>eclipse-plugin</packaging>
+	<version>1.0.0.qualifier</version>
+	<artifactId>org.eclipse.tcf.te.runtime.statushandler</artifactId>
+	<packaging>eclipse-plugin</packaging>
 </project>