You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ve...@apache.org on 2010/01/30 14:49:00 UTC
svn commit: r904780 - in /webservices/axis2/trunk/java/modules: adb-codegen/
adb/ addressing/ clustering/ codegen/ corba/ fastinfoset/ integration/
java2wsdl/ jaxbri/ jaxws-integration/ jaxws-mar/ jaxws/ jibx/ json/ kernel/
metadata/ mex/ mtompolicy-ma...
Author: veithen
Date: Sat Jan 30 13:48:59 2010
New Revision: 904780
URL: http://svn.apache.org/viewvc?rev=904780&view=rev
Log:
AXIS2-3290: Changed the POMs so that maven.test.skip=true can be used and has the expected effect of skipping test compilation (including execution of any ant scripts related to tests) and test execution.
Skipping the ant executions is achieved by using <tasks unless="maven.test.skip">, a feature that was introduced in version 1.2 of the antrun plugin.
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/pom.xml
webservices/axis2/trunk/java/modules/adb/pom.xml
webservices/axis2/trunk/java/modules/addressing/pom.xml
webservices/axis2/trunk/java/modules/clustering/pom.xml
webservices/axis2/trunk/java/modules/codegen/pom.xml
webservices/axis2/trunk/java/modules/corba/pom.xml
webservices/axis2/trunk/java/modules/fastinfoset/pom.xml
webservices/axis2/trunk/java/modules/integration/pom.xml
webservices/axis2/trunk/java/modules/java2wsdl/pom.xml
webservices/axis2/trunk/java/modules/jaxbri/pom.xml
webservices/axis2/trunk/java/modules/jaxws-integration/pom.xml
webservices/axis2/trunk/java/modules/jaxws-mar/pom.xml
webservices/axis2/trunk/java/modules/jaxws/pom.xml
webservices/axis2/trunk/java/modules/jibx/pom.xml
webservices/axis2/trunk/java/modules/json/pom.xml
webservices/axis2/trunk/java/modules/kernel/pom.xml
webservices/axis2/trunk/java/modules/metadata/pom.xml
webservices/axis2/trunk/java/modules/mex/pom.xml
webservices/axis2/trunk/java/modules/mtompolicy-mar/pom.xml
webservices/axis2/trunk/java/modules/mtompolicy/pom.xml
webservices/axis2/trunk/java/modules/parent/pom.xml
webservices/axis2/trunk/java/modules/ping/pom.xml
webservices/axis2/trunk/java/modules/saaj/pom.xml
webservices/axis2/trunk/java/modules/samples/pom.xml
webservices/axis2/trunk/java/modules/scripting/pom.xml
webservices/axis2/trunk/java/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
webservices/axis2/trunk/java/modules/xmlbeans/pom.xml
Modified: webservices/axis2/trunk/java/modules/adb-codegen/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/pom.xml Sat Jan 30 13:48:59 2010
@@ -95,7 +95,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
<excludes>
<exclude>**/*Abstract*.java</exclude>
<exclude>**/*Util*.java</exclude>
@@ -145,7 +144,7 @@
<id>generate-test-sources</id>
<phase>generate-test-sources</phase>
<configuration>
- <tasks>
+ <tasks unless="maven.test.skip">
<property name="maven.junit.jvmargs" value=""/>
<path id="maven.dependency.classpath">
<path refid="maven.compile.classpath"/>
Modified: webservices/axis2/trunk/java/modules/adb/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/adb/pom.xml Sat Jan 30 13:48:59 2010
@@ -102,7 +102,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
<excludes>
<exclude>**/*Abstract*.java</exclude>
<exclude>**/*PhaseResolvingTest.java</exclude>
Modified: webservices/axis2/trunk/java/modules/addressing/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/pom.xml Sat Jan 30 13:48:59 2010
@@ -71,7 +71,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
<excludes>
<exclude>**/*Util.java</exclude>
</excludes>
Modified: webservices/axis2/trunk/java/modules/clustering/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/clustering/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/clustering/pom.xml Sat Jan 30 13:48:59 2010
@@ -98,7 +98,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
<systemProperties>
<property>
<name>maven.test.haltafterfailure</name>
Modified: webservices/axis2/trunk/java/modules/codegen/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/codegen/pom.xml Sat Jan 30 13:48:59 2010
@@ -127,7 +127,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
<includes>
<include>**/*Test.java</include>
</includes>
@@ -142,7 +141,7 @@
<id>generate-test-sources</id>
<phase>generate-test-sources</phase>
<configuration>
- <tasks>
+ <tasks unless="maven.test.skip">
<!-- Set a property that can be picked up from the ant build.xml's -->
<property name="maven.class.path" refid="maven.test.classpath"/>
<echo>Building WSDLs...</echo>
Modified: webservices/axis2/trunk/java/modules/corba/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/corba/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/corba/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/corba/pom.xml Sat Jan 30 13:48:59 2010
@@ -82,13 +82,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
Modified: webservices/axis2/trunk/java/modules/fastinfoset/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/fastinfoset/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/fastinfoset/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/fastinfoset/pom.xml Sat Jan 30 13:48:59 2010
@@ -161,7 +161,7 @@
<id>gen-ts</id>
<phase>generate-test-sources</phase>
<configuration>
- <tasks>
+ <tasks unless="maven.test.skip">
<!-- Set a property that can be picked up from the ant build.xml's -->
<property name="maven.class.path" refid="maven.runtime.classpath"/>
<property name="maven.test.path" refid="maven.compile.classpath"/>
@@ -220,8 +220,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
-
<!-- The pertest forkMode is not ideal but seems to be necessary
because the test server doesn't shut down properly :-(
Should be removed if possible -->
Modified: webservices/axis2/trunk/java/modules/integration/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/pom.xml Sat Jan 30 13:48:59 2010
@@ -155,8 +155,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
-
<!-- The pertest forkMode is not ideal but seems to be necessary
because the test server doesn't shut down properly :-(
Should be removed if possible -->
@@ -204,8 +202,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
-
<!-- The pertest forkMode is not ideal but seems to be necessary
because the test server doesn't shut down properly :-(
Should be removed if possible -->
@@ -256,7 +252,7 @@
<id>gen-enterprise-ts</id>
<phase>generate-test-sources</phase>
<configuration>
- <tasks>
+ <tasks unless="maven.test.skip">
<!-- Set a property that can be picked up from the ant build.xml's -->
<property name="maven.class.path" refid="maven.runtime.classpath"/>
<echo>Building enterprise WSDLs...</echo>
@@ -330,7 +326,7 @@
<id>gen-ts</id>
<phase>generate-test-sources</phase>
<configuration>
- <tasks>
+ <tasks unless="maven.test.skip">
<condition property="test.skip">
<equals arg1="true" arg2="${maven.test.skip}"/>
</condition>
@@ -350,7 +346,7 @@
<id>build-repo</id>
<phase>test-compile</phase>
<configuration>
- <tasks>
+ <tasks unless="maven.test.skip">
<condition property="test.skip">
<equals arg1="true" arg2="${maven.test.skip}"/>
</condition>
Modified: webservices/axis2/trunk/java/modules/java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/java2wsdl/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/java2wsdl/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/java2wsdl/pom.xml Sat Jan 30 13:48:59 2010
@@ -111,7 +111,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
<excludes>
<exclude>**/*Abstract*.java</exclude>
</excludes>
Modified: webservices/axis2/trunk/java/modules/jaxbri/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxbri/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxbri/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxbri/pom.xml Sat Jan 30 13:48:59 2010
@@ -120,7 +120,7 @@
<id>gen-ts</id>
<phase>generate-test-sources</phase>
<configuration>
- <tasks>
+ <tasks unless="maven.test.skip">
<property name="axis2.home" value="${basedir}/target"/>
<property name="maven.class.path" refid="maven.runtime.classpath"/>
<!-- Theres got to be a better way to do this -->
@@ -178,7 +178,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
<forkMode>once</forkMode>
<includes>
<include>**/*Test.java</include>
Modified: webservices/axis2/trunk/java/modules/jaxws-integration/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/pom.xml Sat Jan 30 13:48:59 2010
@@ -133,7 +133,7 @@
<id>gen-ts</id>
<phase>generate-test-sources</phase>
<configuration>
- <tasks>
+ <tasks unless="maven.test.skip">
<!-- Theres got to be a better way to do this -->
<property name="schema.source.dir" value="test-resources/xsd"/>
<property name="wsdl.source.dir" value="test-resources/wsdl"/>
@@ -379,7 +379,7 @@
<id>build-repo</id>
<phase>test-compile</phase>
<configuration>
- <tasks>
+ <tasks unless="maven.test.skip">
<!-- Enable Addressing on the client side -->
<mkdir dir="./target/client-repo/modules/"/>
@@ -1337,7 +1337,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
<forkMode>pertest</forkMode>
<argLine>-Xms256m -Xmx512m</argLine>
<!-- Enable the next 2 lines if you want to attach a debugger
Modified: webservices/axis2/trunk/java/modules/jaxws-mar/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-mar/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-mar/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws-mar/pom.xml Sat Jan 30 13:48:59 2010
@@ -92,7 +92,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
<excludes>
<exclude>**/*Util.java</exclude>
</excludes>
Modified: webservices/axis2/trunk/java/modules/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws/pom.xml Sat Jan 30 13:48:59 2010
@@ -174,7 +174,7 @@
<id>gen-ts</id>
<phase>generate-test-sources</phase>
<configuration>
- <tasks>
+ <tasks unless="maven.test.skip">
<!-- Theres got to be a better way to do this -->
<property name="schema.source.dir" value="test-resources/xsd"/>
<property name="wsdl.source.dir" value="test-resources/wsdl"/>
@@ -238,7 +238,7 @@
<id>build-repo</id>
<phase>test-compile</phase>
<configuration>
- <tasks>
+ <tasks unless="maven.test.skip">
<copy toDir="target/test-classes/">
<fileset dir="test-resources/">
<include name="**/*.properties"/>
@@ -278,7 +278,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
<forkMode>once</forkMode>
<argLine>-Xms256m -Xmx512m</argLine>
<!-- Enable the next 2 lines if you want to attach a debugger
Modified: webservices/axis2/trunk/java/modules/jibx/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jibx/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jibx/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/jibx/pom.xml Sat Jan 30 13:48:59 2010
@@ -111,13 +111,6 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -125,7 +118,7 @@
<id>compile</id>
<phase>test-compile</phase>
<configuration>
- <tasks>
+ <tasks unless="maven.test.skip">
<java classname="org.jibx.binding.Compile" fork="true">
<classpath refid="maven.runtime.classpath"/>
<classpath location="target/test-classes"/>
@@ -143,7 +136,7 @@
<id>gen-cp</id>
<phase>generate-test-sources</phase>
<configuration>
- <tasks>
+ <tasks unless="maven.test.skip">
<property name="cp" refid="maven.runtime.classpath"/>
<echo message="${cp}" file="target/cp.txt"/>
</tasks>
Modified: webservices/axis2/trunk/java/modules/json/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/json/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/json/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/json/pom.xml Sat Jan 30 13:48:59 2010
@@ -78,13 +78,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
Modified: webservices/axis2/trunk/java/modules/kernel/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/pom.xml Sat Jan 30 13:48:59 2010
@@ -159,7 +159,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
<excludes>
<exclude>**/*Abstract*.java</exclude>
<exclude>**/UtilsParseRequestTest.java</exclude> <!-- Was excluded by **/*Util*.java and currently fails -->
@@ -198,7 +197,7 @@
<id>process-test-resources</id>
<phase>process-test-resources</phase>
<configuration>
- <tasks>
+ <tasks unless="maven.test.skip">
<ant antfile="build.xml" inheritall="true" inheritrefs="true"
dir="test-resources/deployment/service2"/>
<ant antfile="build.xml" inheritall="true" inheritrefs="true"
@@ -221,7 +220,7 @@
<id>test-compile</id>
<phase>test-compile</phase>
<configuration>
- <tasks>
+ <tasks unless="maven.test.skip">
<property name="maven.build.dir" location="${basedir}/target"/>
<ant antfile="j2secbuild.xml" inheritall="true" inheritrefs="true"
dir="test-resources/"/>
Modified: webservices/axis2/trunk/java/modules/metadata/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/metadata/pom.xml Sat Jan 30 13:48:59 2010
@@ -162,7 +162,7 @@
<id>gen-ts</id>
<phase>generate-test-sources</phase>
<configuration>
- <tasks>
+ <tasks unless="maven.test.skip">
<!-- Theres got to be a better way to do this -->
<property name="schema.source.dir" value="test-resources/xsd"/>
<property name="wsdl.source.dir" value="test-resources/wsdl"/>
@@ -192,7 +192,7 @@
<id>build-repo</id>
<phase>test-compile</phase>
<configuration>
- <tasks>
+ <tasks unless="maven.test.skip">
<copy toDir="target/test-classes/">
<fileset dir="test-resources/">
<include name="**/*.properties"/>
@@ -235,7 +235,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
<includes>
<include>**/*Tests.java</include>
</includes>
Modified: webservices/axis2/trunk/java/modules/mex/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/mex/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/mex/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/mex/pom.xml Sat Jan 30 13:48:59 2010
@@ -116,13 +116,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
Modified: webservices/axis2/trunk/java/modules/mtompolicy-mar/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/mtompolicy-mar/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/mtompolicy-mar/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/mtompolicy-mar/pom.xml Sat Jan 30 13:48:59 2010
@@ -82,13 +82,6 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-mar-maven-plugin</artifactId>
<version>${mar.plugin.version}</version>
Modified: webservices/axis2/trunk/java/modules/mtompolicy/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/mtompolicy/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/mtompolicy/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/mtompolicy/pom.xml Sat Jan 30 13:48:59 2010
@@ -75,13 +75,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
Modified: webservices/axis2/trunk/java/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/parent/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/parent/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/parent/pom.xml Sat Jan 30 13:48:59 2010
@@ -1195,7 +1195,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
+ <version>1.2</version>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
@@ -1295,13 +1295,6 @@
<version>${maven.plugin.version}</version>
</plugin>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<failOnError>false</failOnError>
Modified: webservices/axis2/trunk/java/modules/ping/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/ping/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/ping/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/ping/pom.xml Sat Jan 30 13:48:59 2010
@@ -84,13 +84,6 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-mar-maven-plugin</artifactId>
<version>${mar.plugin.version}</version>
Modified: webservices/axis2/trunk/java/modules/saaj/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/saaj/pom.xml Sat Jan 30 13:48:59 2010
@@ -148,7 +148,6 @@
<includes>
<include>**/*Test.java</include>
</includes>
- <skip>false</skip>
<forkMode>once</forkMode>
<!-- Notes:
* The Xerces related property fixes an issue on Sun JDKs caused by the
Modified: webservices/axis2/trunk/java/modules/samples/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/pom.xml Sat Jan 30 13:48:59 2010
@@ -121,7 +121,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
<excludes>
<exclude>**/*Abstract*.java</exclude>
<exclude>**/*Util*.java</exclude>
@@ -140,7 +139,7 @@
<id>process-test-resources</id>
<phase>process-test-resources</phase>
<configuration>
- <tasks>
+ <tasks unless="maven.test.skip">
<mkdir dir="target/version"/>
<jar destfile="target/version/version.jar">
<fileset dir="version/target/classes">
@@ -163,7 +162,7 @@
<id>test-compile</id>
<phase>test-compile</phase>
<configuration>
- <tasks>
+ <tasks unless="maven.test.skip">
<property name="maven.build.dir" location="${basedir}/target"/>
</tasks>
</configuration>
Modified: webservices/axis2/trunk/java/modules/scripting/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/scripting/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/scripting/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/scripting/pom.xml Sat Jan 30 13:48:59 2010
@@ -99,7 +99,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
<includes>
<include>**/*Test.java</include>
</includes>
Modified: webservices/axis2/trunk/java/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml Sat Jan 30 13:48:59 2010
@@ -54,13 +54,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
</plugins>
</build>
<dependencies>
Modified: webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml Sat Jan 30 13:48:59 2010
@@ -103,13 +103,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
</plugins>
</build>
<distributionManagement>
Modified: webservices/axis2/trunk/java/modules/xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/xmlbeans/pom.xml?rev=904780&r1=904779&r2=904780&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xmlbeans/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/xmlbeans/pom.xml Sat Jan 30 13:48:59 2010
@@ -91,7 +91,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
<excludes>
<exclude>**/*Util.java</exclude>
<exclude>**/*Constants.java</exclude>
@@ -106,7 +105,7 @@
<id>gen-cp</id>
<phase>generate-test-sources</phase>
<configuration>
- <tasks>
+ <tasks unless="maven.test.skip">
<property name="cp" refid="maven.runtime.classpath"/>
<echo message="${cp}" file="target/cp.txt"/>
</tasks>