Author: veithen
Date: Mon May 30 12:43:46 2016
New Revision: 1746119
URL: http://svn.apache.org/viewvc?rev=1746119&view=rev
Log:
Merge r1746109 to the 1.7 branch.
Added:
axis/axis2/java/core/branches/1_7/systests/
- copied from r1746109, axis/axis2/java/core/trunk/systests/
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/webapp/pom.xml
axis/axis2/java/core/branches/1_7/pom.xml
axis/axis2/java/core/branches/1_7/systests/pom.xml
axis/axis2/java/core/branches/1_7/systests/webapp-tests/ (props changed)
axis/axis2/java/core/branches/1_7/systests/webapp-tests/pom.xml
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 30 12:43:46 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,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739815,1739826,1740693-1740694,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028
+/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,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739815,1739826,1740693-1740694,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109
Modified: axis/axis2/java/core/branches/1_7/modules/webapp/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/webapp/pom.xml?rev=1746119&r1=1746118&r2=1746119&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/webapp/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/webapp/pom.xml Mon May 30
12:43:46 2016
@@ -309,7 +309,6 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>8.1.16.v20140903</version>
<configuration>
<webXml>conf/web.xml</webXml>
<contextXml>conf/jetty.xml</contextXml>
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=1746119&r1=1746118&r2=1746119&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/pom.xml Mon May 30 12:43:46 2016
@@ -96,6 +96,7 @@
<module>modules/transport/xmpp</module>
<module>modules/distribution</module>
<module>modules/samples</module>
+ <module>systests</module>
</modules>
<profiles>
<profile>
@@ -1198,6 +1199,11 @@
<artifactId>alta-maven-plugin</artifactId>
<version>0.4</version>
</plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>8.1.16.v20140903</version>
+ </plugin>
<!-- Use 1.5.2 versions of the aar and mar plugins in order to
avoid
the chicken and egg problem. -->
Modified: axis/axis2/java/core/branches/1_7/systests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/systests/pom.xml?rev=1746119&r1=1746109&r2=1746119&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/systests/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/systests/pom.xml Mon May 30 12:43:46 2016
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.7.3-SNAPSHOT</version>
</parent>
<artifactId>systests</artifactId>
Modified: axis/axis2/java/core/branches/1_7/systests/webapp-tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/systests/webapp-tests/pom.xml?rev=1746119&r1=1746109&r2=1746119&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/systests/webapp-tests/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/systests/webapp-tests/pom.xml Mon May 30
12:43:46 2016
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.axis2</groupId>
<artifactId>systests</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.7.3-SNAPSHOT</version>
</parent>
<artifactId>webapp-tests</artifactId>
<url>http://axis.apache.org/axis2/java/core/</url>
