Author: veithen
Date: Sun Apr 24 16:52:57 2016
New Revision: 1740713
URL: http://svn.apache.org/viewvc?rev=1740713&view=rev
Log:
AXIS2-4743: Merge r1740712 to the 1.7 branch.
Modified:
axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/
(props changed)
axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
Propchange:
axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Apr 24 16:52:57 2016
@@ -0,0 +1,4 @@
+/axis/axis2/java/core/branches/1_6/modules/tool/axis2-wsdl2code-maven-plugin:1295540
+/axis/axis2/java/core/branches/AXIOM-420/modules/tool/axis2-wsdl2code-maven-plugin:1334386-1336397
+/axis/axis2/java/core/branches/AXIS2-4318/modules/tool/axis2-wsdl2code-maven-plugin:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
+/axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin: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,1740712
Modified:
axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml?rev=1740713&r1=1740712&r2=1740713&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
(original)
+++
axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
Sun Apr 24 16:52:57 2016
@@ -87,6 +87,12 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-jaxbri</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>jalopy</groupId>
<artifactId>jalopy</artifactId>
</dependency>
