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 2012/01/03 22:39:34 UTC
svn commit: r1226957 - in /axis/axis1/java/trunk: axis-war/pom.xml
integration/pom.xml
Author: veithen
Date: Tue Jan 3 21:39:33 2012
New Revision: 1226957
URL: http://svn.apache.org/viewvc?rev=1226957&view=rev
Log:
Make consistent usage of the surefire and failsafe plugins.
Modified:
axis/axis1/java/trunk/axis-war/pom.xml
axis/axis1/java/trunk/integration/pom.xml
Modified: axis/axis1/java/trunk/axis-war/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-war/pom.xml?rev=1226957&r1=1226956&r2=1226957&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-war/pom.xml (original)
+++ axis/axis1/java/trunk/axis-war/pom.xml Tue Jan 3 21:39:33 2012
@@ -96,13 +96,20 @@
<skip>true</skip>
</configuration>
</execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
<execution>
- <id>surefire-it</id>
- <phase>integration-test</phase>
<goals>
- <goal>test</goal>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
</goals>
<configuration>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
<systemPropertyVariables>
<test.functional.webapp.url>http://localhost:8080/axis</test.functional.webapp.url>
</systemPropertyVariables>
Modified: axis/axis1/java/trunk/integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/pom.xml?rev=1226957&r1=1226956&r2=1226957&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/pom.xml (original)
+++ axis/axis1/java/trunk/integration/pom.xml Tue Jan 3 21:39:33 2012
@@ -235,23 +235,14 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/Test*.java</include>
- <include>**/*Test.java</include>
- <!-- TODO: test doesn't follow standard naming convention -->
- <include>test/dynamic/ServiceGetPort.java</include>
- </includes>
- <excludes>
- <!-- Quote:
- // FIX BUILD 05/27/03 : "junit" tests should NOT be accessing the
- // network at all - these tests should move to test.wsdl.dynamic
- // and should not reference services which might go down. ~~gdaniels
- -->
- <exclude>test/dynamic/TestDynamicInvoker.java</exclude>
- <exclude>test/dynamic/TestJAXRPCDII.java</exclude>
- </excludes>
- </configuration>
+ <executions>
+ <execution>
+ <id>default-test</id>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
@@ -263,8 +254,21 @@
</goals>
<configuration>
<includes>
+ <include>**/Test*.java</include>
+ <include>**/*Test.java</include>
<include>**/*TestCase.java</include>
+ <!-- TODO: test doesn't follow standard naming convention -->
+ <include>test/dynamic/ServiceGetPort.java</include>
</includes>
+ <excludes>
+ <!-- Quote:
+ // FIX BUILD 05/27/03 : "junit" tests should NOT be accessing the
+ // network at all - these tests should move to test.wsdl.dynamic
+ // and should not reference services which might go down. ~~gdaniels
+ -->
+ <exclude>test/dynamic/TestDynamicInvoker.java</exclude>
+ <exclude>test/dynamic/TestJAXRPCDII.java</exclude>
+ </excludes>
</configuration>
</execution>
</executions>