Author: veithen
Date: Sun Dec 6 11:40:41 2015
New Revision: 1718164
URL: http://svn.apache.org/viewvc?rev=1718164&view=rev
Log:
Merge r1455319 to the 1.6 branch.
Added:
axis/axis2/java/rampart/branches/1_6/code-coverage/ (props changed)
- copied from r1455319, axis/axis2/java/rampart/trunk/code-coverage/
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/code-coverage/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/pom.xml
axis/axis2/java/rampart/branches/1_6/pom.xml
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 6 11:40:41 2015
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1090533,1090540,1090570,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1180718,1186491,1190533,1190600,1194848,1194994,1220915,1221926,1221937,1221940,1222136,1222418,1235059,1240337,1240373,1299342,1299389-1299390,1303198,1327863,1327890,1327893,1329145-1329146,1330675,1330682,1330695,1338876,1350592,1353719,1355738,1357818,1377230,1383060,1409175,1455337,1455697,1456067,1478156,1479069-1479070,1479160,1479183,1479188,1479299,1566329,1610243,1610817,1611122,1612072,1612138,1718154,1718156
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1090533,1090540,1090570,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1180718,1186491,1190533,1190600,1194848,1194994,1220915,1221926,1221937,1221940,1222136,1222418,1235059,1240337,1240373,1299342,1299389-1299390,1303198,1327863,1327890,1327893,1329145-1329146,1330675,1330682,1330695,1338876,1350592,1353719,1355738,1357818,1377230,1383060,1409175,1455319,1455337,1455697,1456067,1478156,1479069-1479070,1479160,1479183,1479188,1479299,1566329,1610243,1610817,1611122,1612072,1612138,1718154,1718156
Propchange: axis/axis2/java/rampart/branches/1_6/code-coverage/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Dec 6 11:40:41 2015
@@ -0,0 +1 @@
+target
Modified: axis/axis2/java/rampart/branches/1_6/code-coverage/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/code-coverage/pom.xml?rev=1718164&r1=1455319&r2=1718164&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/code-coverage/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/code-coverage/pom.xml Sun Dec 6
11:40:41 2015
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-project</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.6.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>code-coverage</artifactId>
Modified: axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml?rev=1718164&r1=1718163&r2=1718164&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml Sun Dec
6 11:40:41 2015
@@ -38,7 +38,6 @@
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
- <version>1.2</version>
<executions>
<execution>
<id>generate-timestamp</id>
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml?rev=1718164&r1=1718163&r2=1718164&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml
Sun Dec 6 11:40:41 2015
@@ -397,7 +397,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
<executions>
<execution>
<id>generate-source</id>
@@ -734,7 +733,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- Add the Xerces/Xalan versions expected by OpenSAML to
the boot classpath so that the build succeeds on older 1.5 JDKs -->
-
<argLine>-Xbootclasspath/p:${project.build.directory}/endorsed/xml-apis.jar${path.separator}${project.build.directory}/endorsed/xercesImpl.jar${path.separator}${project.build.directory}/endorsed/resolver.jar${path.separator}${project.build.directory}/endorsed/serializer.jar${path.separator}${project.build.directory}/endorsed/xalan.jar</argLine>
+ <argLine>${jacoco.surefireArgLine}
-Xbootclasspath/p:${project.build.directory}/endorsed/xml-apis.jar${path.separator}${project.build.directory}/endorsed/xercesImpl.jar${path.separator}${project.build.directory}/endorsed/resolver.jar${path.separator}${project.build.directory}/endorsed/serializer.jar${path.separator}${project.build.directory}/endorsed/xalan.jar</argLine>
</configuration>
</plugin>
<plugin>
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml?rev=1718164&r1=1718163&r2=1718164&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml Sun Dec 6
11:40:41 2015
@@ -70,7 +70,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.0</version>
<executions>
<execution>
<id>aar</id>
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/pom.xml?rev=1718164&r1=1718163&r2=1718164&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/pom.xml Sun
Dec 6 11:40:41 2015
@@ -47,7 +47,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: axis/axis2/java/rampart/branches/1_6/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/pom.xml?rev=1718164&r1=1718163&r2=1718164&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/pom.xml Sun Dec 6 11:40:41 2015
@@ -143,6 +143,9 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.10</version>
+ <configuration>
+ <argLine>${jacoco.surefireArgLine}</argLine>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
@@ -152,6 +155,24 @@
<skipDeploy>true</skipDeploy>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.2</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -178,6 +199,89 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>initialize</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>
+ <!-- Skip Jacoco if necessary -->
+ if (project.packaging == 'pom' ||
project.properties['skipTests'] == 'true') {
+ project.properties['skipJacoco'] = 'true'
+ }
+ </source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco.version}</version>
+ <executions>
+ <execution>
+ <id>prepare-agent-for-surefire</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <propertyName>jacoco.surefireArgLine</propertyName>
+ <!-- Anonymize the session ID (by default it
contains the name of the host executing the build) -->
+
<sessionId>mvn:${project.groupId}:${project.artifactId}:${project.version}:surefire</sessionId>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <skip>${skipJacoco}</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-jacoco-exec</id>
+ <phase>test</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <skipAttach>${skipJacoco}</skipAttach>
+ <artifacts>
+ <artifact>
+
<file>${project.build.directory}/jacoco.exec</file>
+ <classifier>jacoco</classifier>
+ <type>exec</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <!-- We need (some of) the source JARs for the code coverage
analysis. -->
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- Use the same ID as in org.apache:apache;
otherwise, the goal
+ will be executed twice when the apache-release
profile is
+ activated -->
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <attach>true</attach>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -404,6 +508,7 @@
<module>modules/rampart-integration</module>
<!-- Compile sample codes -->
<module>modules/rampart-samples</module>
+ <module>code-coverage</module>
</modules>
<properties>
@@ -419,5 +524,6 @@
<dist.dir>rampart-${project.version}</dist.dir>
<failIfNoTests>false</failIfNoTests>
+ <jacoco.version>0.6.1.201212231917</jacoco.version>
</properties>
</project>
