You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2018/08/06 20:31:33 UTC
svn commit: r1837561 - in /axis/axis2/java/rampart/branches/1_7: ./
modules/rampart-integration/pom.xml modules/rampart-tests/pom.xml
modules/rampart-testutils/ modules/rampart-testutils/pom.xml pom.xml
Author: veithen
Date: Mon Aug 6 20:31:33 2018
New Revision: 1837561
URL: http://svn.apache.org/viewvc?rev=1837561&view=rev
Log:
Merge r1837550 and r1837559 to the 1.7 branch.
Added:
axis/axis2/java/rampart/branches/1_7/modules/rampart-testutils/
- copied from r1837559, axis/axis2/java/rampart/trunk/modules/rampart-testutils/
Modified:
axis/axis2/java/rampart/branches/1_7/ (props changed)
axis/axis2/java/rampart/branches/1_7/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/branches/1_7/modules/rampart-tests/pom.xml
axis/axis2/java/rampart/branches/1_7/modules/rampart-testutils/pom.xml
axis/axis2/java/rampart/branches/1_7/pom.xml
Propchange: axis/axis2/java/rampart/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 6 20:31:33 2018
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1726516,1726520,1726559,1727871,1777916,1803424,1806320,1826038
+/axis/axis2/java/rampart/trunk:1726516,1726520,1726559,1727871,1777916,1803424,1806320,1826038,1837550,1837559
Modified: axis/axis2/java/rampart/branches/1_7/modules/rampart-integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_7/modules/rampart-integration/pom.xml?rev=1837561&r1=1837560&r2=1837561&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_7/modules/rampart-integration/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_7/modules/rampart-integration/pom.xml Mon Aug 6 20:31:33 2018
@@ -464,10 +464,31 @@
</executions>
</plugin-->
<plugin>
+ <groupId>com.github.veithen.alta</groupId>
+ <artifactId>alta-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-properties</goal>
+ </goals>
+ <configuration>
+ <name>aspectjweaver</name>
+ <value>%file%</value>
+ <artifacts>
+ <artifact>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<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>${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>
+ <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 -javaagent:${aspectjweaver}</argLine>
</configuration>
</plugin>
<plugin>
@@ -517,6 +538,12 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-testutils</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-http</artifactId>
<version>${axis2.version}</version>
Modified: axis/axis2/java/rampart/branches/1_7/modules/rampart-tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_7/modules/rampart-tests/pom.xml?rev=1837561&r1=1837560&r2=1837561&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_7/modules/rampart-tests/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_7/modules/rampart-tests/pom.xml Mon Aug 6 20:31:33 2018
@@ -53,6 +53,33 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>com.github.veithen.alta</groupId>
+ <artifactId>alta-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-properties</goal>
+ </goals>
+ <configuration>
+ <name>aspectjweaver</name>
+ <value>%file%</value>
+ <artifacts>
+ <artifact>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${jacoco.surefireArgLine} -javaagent:${aspectjweaver}</argLine>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -73,6 +100,12 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart-testutils</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
Modified: axis/axis2/java/rampart/branches/1_7/modules/rampart-testutils/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_7/modules/rampart-testutils/pom.xml?rev=1837561&r1=1837559&r2=1837561&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_7/modules/rampart-testutils/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_7/modules/rampart-testutils/pom.xml Mon Aug 6 20:31:33 2018
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-project</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.7.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: axis/axis2/java/rampart/branches/1_7/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_7/pom.xml?rev=1837561&r1=1837560&r2=1837561&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_7/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_7/pom.xml Mon Aug 6 20:31:33 2018
@@ -194,6 +194,11 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
</plugin>
+ <plugin>
+ <groupId>com.github.veithen.alta</groupId>
+ <artifactId>alta-maven-plugin</artifactId>
+ <version>0.6.2</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -545,6 +550,17 @@
<artifactId>junit</artifactId>
<version>3.8.2</version>
</dependency>
+
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.8.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>1.8.2</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -599,6 +615,7 @@
<module>modules/rampart-trust-mar</module>
<module>modules/rampart-integration</module>
<module>modules/rampart-samples</module> <!-- Compile sample codes -->
+ <module>modules/rampart-testutils</module>
<module>modules/distribution</module>
<module>code-coverage</module>
</modules>