Skip to content

Commit

Permalink
[WFLY-9114] Move JaCoCo plugin to root pom
Browse files Browse the repository at this point in the history
  • Loading branch information
@marekkopecky
marekkopecky committed Jul 24, 2017
1 parent 7dff92d commit 06d0b20
Show file tree
Hide file tree
Showing 3 changed files with 197 additions and 189 deletions.
196 changes: 196 additions & 0 deletions pom.xml
View file
Expand Up @@ -6376,5 +6376,201 @@
</plugins>
</build>
</profile>

<!-- JaCoCo test coverage. Will set ${surefire.jacoco.args} to be used in Arquillian config and as surefire jvm argument. -->
<profile>
<id>ts.jacoco.profile</id>
<activation><property><name>coverage</name></property></activation>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${version.jacoco.plugin}</version>
<executions>
<execution>
<id>ts.jacoco-prepare</id>
<phase>process-test-classes</phase>
<goals><goal>prepare-agent</goal></goals>
<configuration>
<append>true</append>
<destFile>target/jacoco.exec</destFile>
<includes>
<include>*</include>
</includes>
<excludes>
<exclude>org.jboss.as.test.*</exclude>
</excludes>
<output>file</output>
<propertyName>surefire.jacoco.args</propertyName>
</configuration>
</execution>
</executions>
</plugin>
<!-- Ant plugin. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<!-- DEBUG -->
<execution>
<id>ts.jacoco.debug</id>
<phase>post-integration-test</phase>
<goals><goal>run</goal></goals>
<inherited>false</inherited>
<configuration>
<target>
<echo>Jacoco jvm args: ${surefire.jacoco.args}</echo>
</target>
</configuration>
</execution>
<!-- Must be run using Ant due to https://sourceforge.net/tracker/?func=detail&aid=3474708&group_id=177969&atid=883354 -->
<!-- mvn antrun:run@ts.jacoco.report-ant -Dcoverage -Dtarget=report -Djboss.dist=$JBOSS_DIST -->
<execution>
<id>ts.jacoco.report-ant</id>
<phase>none</phase>
<goals><goal>run</goal></goals>
<inherited>false</inherited>
<configuration>
<target>
<taskdef name="report" classname="org.jacoco.ant.ReportTask"/>
<echo>Creating JaCoCo test coverage reports...</echo>
<mkdir dir="${basedir}/target/coverage-report"></mkdir>
<report>
<executiondata>
<fileset dir="${basedir}">
<include name="**/target/jacoco.exec"></include>
</fileset>
</executiondata>
<structure name="AS 7 project">
<classfiles>
<fileset dir="${jboss.dist}/modules">
<include name="**/*.jar"></include>
<!-- Excludes solve "Can't add different class with same name: ..." -->
<!-- We have 2.x in main. -->
<exclude name="com/sun/jsf-impl/1.*/**/*"></exclude>
<!-- Wildfly-3383 - com/sun/codemodel vs. /1.0/com/sun/codemodel -->
<exclude name="com/sun/xml/**/*"></exclude>
<exclude name="javax/faces/api/1.2/**/*"></exclude>
<!-- Wildfly-3390 -->
<exclude name="org/apache/commons/beanutils/**/*"></exclude>
<!-- others -->
<exclude name="**/jipijapa-hibernate4-3/**/*"></exclude>
<exclude name="**/hornetq-core-client*"></exclude>
<exclude name="**/jboss-marshalling*"></exclude>
<!-- Wildfly-3389 -->
</fileset>
</classfiles>
<sourcefiles encoding="UTF-8">
<!--
for i in $(find . -path './*/src/main/java' | sort); do
DIR=`echo $i | sed 's|./||'`;
echo "<fileset dir=\"$DIR\"><include name=\"**/*.java\"></include></fileset>";
done
-->
<fileset dir="appclient/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="batch/extension-jberet/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="batch/extension/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="bean-validation/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="clustering/api/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="clustering/common/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="clustering/ee/infinispan/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="clustering/ee/spi/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="clustering/ejb/infinispan/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="clustering/ejb/spi/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="clustering/infinispan/extension/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="clustering/infinispan/spi/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="clustering/jgroups/api/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="clustering/jgroups/extension/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="clustering/jgroups/spi/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="clustering/marshalling/api/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="clustering/marshalling/infinispan/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="clustering/marshalling/jboss/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="clustering/marshalling/spi/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="clustering/server/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="clustering/service/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="clustering/singleton/api/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="clustering/singleton/extension/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="clustering/spi/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="clustering/web/api/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="clustering/web/infinispan/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="clustering/web/spi/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="clustering/web/undertow/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="connector/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="ee/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="ejb3/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="iiop-openjdk/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="jaxrs/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="jdr/jboss-as-jdr/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="jpa/eclipselink/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="jpa/hibernate4_1/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="jpa/hibernate4_3/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="jpa/hibernate5/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="jpa/openjpa/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="jpa/spi/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="jpa/subsystem/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="jsf/injection/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="jsf/subsystem/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="jsr77/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="legacy/cmp/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="legacy/configadmin/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="legacy/jacorb/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="legacy/jaxr/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="legacy/messaging/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="legacy/web/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="mail/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="messaging-activemq/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="mod_cluster/extension/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="mod_cluster/undertow/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="naming/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="picketlink/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="pojo/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="rts/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="sar/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="security/api/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="security/subsystem/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="system-jmx/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="testsuite/shared/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="transactions/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="undertow/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="web-common/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="webservices/server-integration/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="weld/bean-validation/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="weld/common/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="weld/ejb/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="weld/jpa/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="weld/spi/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="weld/subsystem/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="weld/transactions/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="weld/webservices/src/main/java"><include name="**/*.java"></include></fileset>
<fileset dir="xts/src/main/java"><include name="**/*.java"></include></fileset>
</sourcefiles>
</structure>
<html destdir="${basedir}/target/coverage-report/html"></html>
<xml destfile="${basedir}/target/coverage-report/coverage-report.xml"></xml>
<csv destfile="${basedir}/target/coverage-report/coverage-report.csv"></csv>
</report>
</target>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.ant</artifactId>
<version>${version.jacoco.plugin}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</profile>
<profile> <!-- surefire.jacoco.args property needs to be set correctly, if coverage profile is not enabled -->
<id>ts.jacoco.profile.not.enabled</id>
<activation><property><name>!coverage</name></property></activation>
<properties>
<surefire.jacoco.args></surefire.jacoco.args>
</properties>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion testsuite/mixed-domain/pom.xml
View file
Expand Up @@ -109,7 +109,7 @@
<jboss.test.host.slave.address>${node1}</jboss.test.host.slave.address>
<jboss.default.multicast.address>${mcast}</jboss.default.multicast.address>
<jboss.modcluster.multicast.address>${mcast1}</jboss.modcluster.multicast.address>
<server.jvm.args>${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 </server.jvm.args>
<server.jvm.args>${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 </server.jvm.args>
</systemPropertyVariables>
<includes>
<!-- include>**/*TestCase.java</include -->
Expand Down

0 comments on commit 06d0b20

Please sign in to comment.