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 2016/02/14 21:20:51 UTC
svn commit: r1730395 - in /axis/axis2/java/core/branches/1_7: ./
modules/adb-tests/ modules/adb-tests/pom.xml pom.xml
Author: veithen
Date: Sun Feb 14 20:20:51 2016
New Revision: 1730395
URL: http://svn.apache.org/viewvc?rev=1730395&view=rev
Log:
AXIS2-5694: Merge r1730180 to the 1.7 branch.
Added:
axis/axis2/java/core/branches/1_7/modules/adb-tests/ (props changed)
- copied from r1730180, axis/axis2/java/core/trunk/modules/adb-tests/
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/adb-tests/pom.xml
axis/axis2/java/core/branches/1_7/pom.xml
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 20:20:51 2016
@@ -1,4 +1,4 @@
/axis/axis2/java/core/branches/1_6:1295540
/axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335
Propchange: axis/axis2/java/core/branches/1_7/modules/adb-tests/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Feb 14 20:20:51 2016
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Modified: axis/axis2/java/core/branches/1_7/modules/adb-tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/adb-tests/pom.xml?rev=1730395&r1=1730180&r2=1730395&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/adb-tests/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/adb-tests/pom.xml Sun Feb 14 20:20:51 2016
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.7.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -78,8 +78,9 @@
<version>${project.version}</version>
<executions>
<execution>
+ <phase>generate-test-sources</phase>
<goals>
- <goal>generate-test-sources</goal>
+ <goal>wsdl2code</goal>
</goals>
<configuration>
<wsdlFile>src/test/wsdl/MTOMService.wsdl</wsdlFile>
@@ -116,6 +117,23 @@
</dependencies>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${project.build.directory}/generated-sources/axis2/wsdl2code/src</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
Modified: axis/axis2/java/core/branches/1_7/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/pom.xml?rev=1730395&r1=1730394&r2=1730395&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/pom.xml Sun Feb 14 20:20:51 2016
@@ -42,6 +42,7 @@
<module>apidocs</module>
<module>modules/adb</module>
<module>modules/adb-codegen</module>
+ <module>modules/adb-tests</module>
<module>modules/addressing</module>
<module>modules/codegen</module>
<module>modules/fastinfoset</module>