Author: veithen
Date: Sun Jun 27 12:26:12 2010
New Revision: 958375
URL: http://svn.apache.org/viewvc?rev=958375&view=rev
Log:
AXIS2-3290: Merged r904780 to the 1.5 branch, so that people who build the
branch with maven.test.skip=true stop complaining about build failures.
Modified:
axis/axis2/java/core/branches/java/1_5/ (props changed)
axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/adb/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/addressing/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/clustering/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/codegen/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/corba/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/fastinfoset/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/integration/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/java2wsdl/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/jaxbri/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/jaxws-integration/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/jaxws-mar/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/jaxws/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/jibx/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/json/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/kernel/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/metadata/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/mex/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/mtompolicy-mar/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/mtompolicy/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/ping/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/saaj/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/samples/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/scripting/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/local/ (props
changed)
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/xmlbeans/pom.xml
Propchange: axis/axis2/java/core/branches/java/1_5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 27 12:26:12 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk:944347,944915,951385
-/webservices/axis2/trunk/java:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,801630,803725,834058
+/webservices/axis2/trunk/java:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,801630,803725,834058,904780
Modified: axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/pom.xml
(original)
+++ axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/pom.xml Sun Jun
27 12:26:12 2010
@@ -83,7 +83,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
<excludes>
<exclude>**/*Abstract*.java</exclude>
<exclude>**/*Util*.java</exclude>
@@ -124,7 +123,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: axis/axis2/java/core/branches/java/1_5/modules/adb/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/adb/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/adb/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/adb/pom.xml Sun Jun 27
12:26:12 2010
@@ -94,7 +94,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
<excludes>
<exclude>**/*Abstract*.java</exclude>
<exclude>**/*Util*.java</exclude>
Modified: axis/axis2/java/core/branches/java/1_5/modules/addressing/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/addressing/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/addressing/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/addressing/pom.xml Sun Jun
27 12:26:12 2010
@@ -71,7 +71,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
<excludes>
<exclude>**/*Util.java</exclude>
</excludes>
Modified: axis/axis2/java/core/branches/java/1_5/modules/clustering/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/clustering/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/clustering/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/clustering/pom.xml Sun Jun
27 12:26:12 2010
@@ -90,7 +90,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
<systemProperties>
<property>
<name>maven.test.haltafterfailure</name>
Modified: axis/axis2/java/core/branches/java/1_5/modules/codegen/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/codegen/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/codegen/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/codegen/pom.xml Sun Jun 27
12:26:12 2010
@@ -119,7 +119,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
<includes>
<include>**/*Test.java</include>
</includes>
@@ -134,7 +133,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: axis/axis2/java/core/branches/java/1_5/modules/corba/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/corba/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/corba/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/corba/pom.xml Sun Jun 27
12:26:12 2010
@@ -75,14 +75,5 @@
<directory>test-resources</directory>
</testResource>
</testResources>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
Modified: axis/axis2/java/core/branches/java/1_5/modules/fastinfoset/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/fastinfoset/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/fastinfoset/pom.xml
(original)
+++ axis/axis2/java/core/branches/java/1_5/modules/fastinfoset/pom.xml Sun Jun
27 12:26:12 2010
@@ -153,7 +153,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"/>
@@ -212,8 +212,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: axis/axis2/java/core/branches/java/1_5/modules/integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/integration/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/integration/pom.xml
(original)
+++ axis/axis2/java/core/branches/java/1_5/modules/integration/pom.xml Sun Jun
27 12:26:12 2010
@@ -321,8 +321,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 -->
@@ -370,8 +368,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 -->
@@ -422,7 +418,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>
@@ -496,7 +492,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>
@@ -516,7 +512,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: axis/axis2/java/core/branches/java/1_5/modules/java2wsdl/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/java2wsdl/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/java2wsdl/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/java2wsdl/pom.xml Sun Jun 27
12:26:12 2010
@@ -107,7 +107,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
<excludes>
<exclude>**/*Abstract*.java</exclude>
</excludes>
Modified: axis/axis2/java/core/branches/java/1_5/modules/jaxbri/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/jaxbri/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/jaxbri/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/jaxbri/pom.xml Sun Jun 27
12:26:12 2010
@@ -112,7 +112,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
-->
@@ -170,7 +170,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
<forkMode>once</forkMode>
<includes>
<include>**/*Test.java</include>
Modified:
axis/axis2/java/core/branches/java/1_5/modules/jaxws-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/jaxws-integration/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/jaxws-integration/pom.xml
(original)
+++ axis/axis2/java/core/branches/java/1_5/modules/jaxws-integration/pom.xml
Sun Jun 27 12:26:12 2010
@@ -169,7 +169,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"/>
@@ -415,7 +415,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/"/>
@@ -1320,7 +1320,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: axis/axis2/java/core/branches/java/1_5/modules/jaxws-mar/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/jaxws-mar/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/jaxws-mar/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/jaxws-mar/pom.xml Sun Jun 27
12:26:12 2010
@@ -84,7 +84,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
<excludes>
<exclude>**/*Util.java</exclude>
</excludes>
Modified: axis/axis2/java/core/branches/java/1_5/modules/jaxws/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/jaxws/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/jaxws/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/jaxws/pom.xml Sun Jun 27
12:26:12 2010
@@ -170,7 +170,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"/>
@@ -234,7 +234,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"/>
@@ -274,7 +274,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: axis/axis2/java/core/branches/java/1_5/modules/jibx/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/jibx/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/jibx/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/jibx/pom.xml Sun Jun 27
12:26:12 2010
@@ -103,13 +103,6 @@
</testResources>
<plugins>
<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>
@@ -117,7 +110,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"/>
@@ -134,7 +127,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: axis/axis2/java/core/branches/java/1_5/modules/json/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/json/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/json/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/json/pom.xml Sun Jun 27
12:26:12 2010
@@ -71,14 +71,5 @@
<directory>test-resources</directory>
</testResource>
</testResources>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
Modified: axis/axis2/java/core/branches/java/1_5/modules/kernel/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/kernel/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/kernel/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/kernel/pom.xml Sun Jun 27
12:26:12 2010
@@ -166,7 +166,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
<excludes>
<exclude>**/*Abstract*.java</exclude>
<exclude>**/*Util*.java</exclude>
@@ -204,7 +203,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"
@@ -227,7 +226,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/"/>
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 27 12:26:12 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:944347,944915,951385
-/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:761709,771051,801630,803725,834058
+/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:761709,771051,801630,803725,834058,904780
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 27 12:26:12 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:944347,944915,951385
-/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:761709,771051,801630,803725,834058
+/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:761709,771051,801630,803725,834058,904780
Modified: axis/axis2/java/core/branches/java/1_5/modules/metadata/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/metadata/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/metadata/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/metadata/pom.xml Sun Jun 27
12:26:12 2010
@@ -139,7 +139,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"/>
@@ -169,7 +169,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"/>
@@ -212,7 +212,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
<includes>
<include>**/*Tests.java</include>
</includes>
Modified: axis/axis2/java/core/branches/java/1_5/modules/mex/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/mex/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/mex/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/mex/pom.xml Sun Jun 27
12:26:12 2010
@@ -108,13 +108,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
Modified: axis/axis2/java/core/branches/java/1_5/modules/mtompolicy-mar/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/mtompolicy-mar/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/mtompolicy-mar/pom.xml
(original)
+++ axis/axis2/java/core/branches/java/1_5/modules/mtompolicy-mar/pom.xml Sun
Jun 27 12:26:12 2010
@@ -74,13 +74,6 @@
</testResources>
<plugins>
<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>1.5.1</version>
Modified: axis/axis2/java/core/branches/java/1_5/modules/mtompolicy/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/mtompolicy/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/mtompolicy/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/mtompolicy/pom.xml Sun Jun
27 12:26:12 2010
@@ -66,14 +66,5 @@
<directory>test-resources</directory>
</testResource>
</testResources>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
Modified: axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml Sun Jun 27
12:26:12 2010
@@ -1234,7 +1234,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
+ <version>1.2</version>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
@@ -1325,13 +1325,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: axis/axis2/java/core/branches/java/1_5/modules/ping/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/ping/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/ping/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/ping/pom.xml Sun Jun 27
12:26:12 2010
@@ -76,13 +76,6 @@
</testResources>
<plugins>
<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>1.5.1</version>
Modified: axis/axis2/java/core/branches/java/1_5/modules/saaj/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/saaj/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/saaj/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/saaj/pom.xml Sun Jun 27
12:26:12 2010
@@ -135,7 +135,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <skip>false</skip>
<forkMode>once</forkMode>
<argLine>-Djava.endorsed.dirs=${m2Repository}/org/apache/geronimo/specs/geronimo-saaj_1.3_spec/${geronimo.spec.saaj.version}/</argLine>
<systemProperties>
Modified: axis/axis2/java/core/branches/java/1_5/modules/samples/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/samples/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/samples/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/samples/pom.xml Sun Jun 27
12:26:12 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: axis/axis2/java/core/branches/java/1_5/modules/scripting/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/scripting/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/scripting/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/scripting/pom.xml Sun Jun 27
12:26:12 2010
@@ -91,7 +91,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
<includes>
<include>**/*Test.java</include>
</includes>
Modified:
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
Sun Jun 27 12:26:12 2010
@@ -47,15 +47,6 @@
<filtering>false</filtering>
</resource>
</resources>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
- </plugins>
</build>
<dependencies>
<dependency>
Modified:
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
---
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
(original)
+++
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
Sun Jun 27 12:26:12 2010
@@ -96,15 +96,6 @@
<filtering>false</filtering>
</resource>
</resources>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
- </plugins>
</build>
<distributionManagement>
<repository>
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 27 12:26:12 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:944347,944915,951385
-/webservices/axis2/trunk/java/modules/transport/http/pom.xml:771051,801630,803725,834058
+/webservices/axis2/trunk/java/modules/transport/http/pom.xml:771051,801630,803725,834058,904780
Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 27 12:26:12 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/transport/http/src:944347,944915,951385
-/webservices/axis2/trunk/java/modules/transport/http/src:771051,801630,803725,834058
+/webservices/axis2/trunk/java/modules/transport/http/src:771051,801630,803725,834058,904780
Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/local/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 27 12:26:12 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/transport/local:944347,944915,951385
-/webservices/axis2/trunk/java/modules/transport/local:771051,801630,803725,834058
+/webservices/axis2/trunk/java/modules/transport/local:771051,801630,803725,834058,904780
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 27 12:26:12 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:944347,944915,951385
-/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:761709,771051,801630,803725,834058
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:761709,771051,801630,803725,834058,904780
Propchange:
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 27 12:26:12 2010
@@ -1,2 +1,2 @@
/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:944347,944915,951385
-/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:761709,771051,801630,803725,834058
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:761709,771051,801630,803725,834058,904780
Modified: axis/axis2/java/core/branches/java/1_5/modules/xmlbeans/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/xmlbeans/pom.xml?rev=958375&r1=958374&r2=958375&view=diff
==============================================================================
--- axis/axis2/java/core/branches/java/1_5/modules/xmlbeans/pom.xml (original)
+++ axis/axis2/java/core/branches/java/1_5/modules/xmlbeans/pom.xml Sun Jun 27
12:26:12 2010
@@ -83,7 +83,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <skip>false</skip>
<excludes>
<exclude>**/*Util.java</exclude>
<exclude>**/*Constants.java</exclude>
@@ -98,7 +97,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>
