From 06d0b204a19933a31699d8a58a70002beccdab6e Mon Sep 17 00:00:00 2001 From: Marek Kopecky Date: Fri, 2 Jun 2017 16:25:22 +0200 Subject: [PATCH] [WFLY-9114] Move JaCoCo plugin to root pom --- pom.xml | 196 +++++++++++++++++++++++++++++++++ testsuite/mixed-domain/pom.xml | 2 +- testsuite/pom.xml | 188 ------------------------------- 3 files changed, 197 insertions(+), 189 deletions(-) diff --git a/pom.xml b/pom.xml index 083dd42d8871..bd509b607e66 100644 --- a/pom.xml +++ b/pom.xml @@ -6376,5 +6376,201 @@ + + + + ts.jacoco.profile + coverage + + + + org.jacoco + jacoco-maven-plugin + ${version.jacoco.plugin} + + + ts.jacoco-prepare + process-test-classes + prepare-agent + + true + target/jacoco.exec + + * + + + org.jboss.as.test.* + + file + surefire.jacoco.args + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + + ts.jacoco.debug + post-integration-test + run + false + + + Jacoco jvm args: ${surefire.jacoco.args} + + + + + + + ts.jacoco.report-ant + none + run + false + + + + Creating JaCoCo test coverage reports... + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.jacoco + org.jacoco.ant + ${version.jacoco.plugin} + + + + + + + + ts.jacoco.profile.not.enabled + !coverage + + + + diff --git a/testsuite/mixed-domain/pom.xml b/testsuite/mixed-domain/pom.xml index 2b1e943ec9aa..fc9159fb909f 100644 --- a/testsuite/mixed-domain/pom.xml +++ b/testsuite/mixed-domain/pom.xml @@ -109,7 +109,7 @@ ${node1} ${mcast} ${mcast1} - ${surefire.system.args} ${jvm.args.ip.server} ${jvm.args.jacoco} ${jvm.args.other} ${jvm.args.timeouts} -Dnode0=${node0} -Dnode1=${node1} -Djboss.default.multicast.address=${mcast} -Djboss.messaging.cluster.password=ILoveWildfly + ${surefire.system.args} ${jvm.args.ip.server} ${jvm.args.other} ${jvm.args.timeouts} -Dnode0=${node0} -Dnode1=${node1} -Djboss.default.multicast.address=${mcast} -Djboss.messaging.cluster.password=ILoveWildfly diff --git a/testsuite/pom.xml b/testsuite/pom.xml index 21051b0fd6fc..be63900902e7 100644 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -923,194 +923,6 @@ - - - - ts.jacoco.profile - coverage - - - - org.jacoco - jacoco-maven-plugin - ${version.jacoco.plugin} - - ts.jacoco-prepare - process-test-classes - prepare-agent - - true - target/jacoco.exec - - * - - - org.jboss.as.test.* - - file - surefire.jacoco.args - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - - ts.jacoco.debug - post-integration-test - run - false - - - Jacoco jvm args: ${surefire.jacoco.args} - - - - - - ts.jacoco.report-ant - site - run - false - - - - Creating JaCoCo test coverage reports... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.jacoco - org.jacoco.ant - ${version.jacoco.plugin} - - - - - - - help ts.help