Author: veithen
Date: Sun Sep 29 21:37:49 2013
New Revision: 1527411
URL: http://svn.apache.org/r1527411
Log:
Include Eclipse tests in code coverage.
Modified:
webservices/axiom/trunk/code-coverage/pom.xml
webservices/axiom/trunk/pom.xml
webservices/axiom/trunk/systests/eclipse-tests/pom.xml
webservices/axiom/trunk/systests/eclipse-tests/src/it/project/pom.xml
Modified: webservices/axiom/trunk/code-coverage/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/code-coverage/pom.xml?rev=1527411&r1=1527410&r2=1527411&view=diff
==============================================================================
--- webservices/axiom/trunk/code-coverage/pom.xml (original)
+++ webservices/axiom/trunk/code-coverage/pom.xml Sun Sep 29 21:37:49 2013
@@ -170,6 +170,14 @@
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>eclipse-tests</artifactId>
+ <version>${project.version}</version>
+ <classifier>jacoco</classifier>
+ <type>exec</type>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>jboss-tests</artifactId>
<version>${project.version}</version>
<classifier>jacoco</classifier>
Modified: webservices/axiom/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1527411&r1=1527410&r2=1527411&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Sun Sep 29 21:37:49 2013
@@ -559,10 +559,7 @@
new File(project.build.directory,
'tmp').mkdirs()
<!-- Skip Jacoco if necessary -->
- if (project.packaging == 'pom') {
- println 'Disabling JaCoCo for project with
packaging "pom"'
- project.properties['skipJacoco'] = 'true'
- } else if (project.properties['skipTests'] ==
'true') {
+ if (project.properties['skipTests'] == 'true')
{
println 'Disabling JaCoCo because tests
are skipped'
project.properties['skipJacoco'] = 'true'
} else if
(System.properties['java.specification.version'] == '1.8') {
Modified: webservices/axiom/trunk/systests/eclipse-tests/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/eclipse-tests/pom.xml?rev=1527411&r1=1527410&r2=1527411&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/eclipse-tests/pom.xml (original)
+++ webservices/axiom/trunk/systests/eclipse-tests/pom.xml Sun Sep 29 21:37:49
2013
@@ -120,6 +120,30 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-jacoco-exec</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <inherited>false</inherited>
+ <configuration>
+ <skipAttach>${skipJacoco}</skipAttach>
+ <artifacts>
+ <artifact>
+
<file>${project.build.directory}/it/project/target/jacoco.exec</file>
+ <classifier>jacoco</classifier>
+ <type>exec</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
Modified: webservices/axiom/trunk/systests/eclipse-tests/src/it/project/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/eclipse-tests/src/it/project/pom.xml?rev=1527411&r1=1527410&r2=1527411&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/eclipse-tests/src/it/project/pom.xml
(original)
+++ webservices/axiom/trunk/systests/eclipse-tests/src/it/project/pom.xml Sun
Sep 29 21:37:49 2013
@@ -82,6 +82,7 @@
<artifactId>org.apache.ws.commons.axiom.axiom-dom</artifactId>
</dependency>
</dependencies>
+ <argLine>${jacoco.surefireArgLine}</argLine>
</configuration>
</plugin>
</plugins>
