Author: veithen
Date: Mon Jan 8 20:52:41 2018
New Revision: 1820603
URL: http://svn.apache.org/viewvc?rev=1820603&view=rev
Log:
AXIS2-5730: Merge r1820601 to the 1.7 branch.
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java
axis/axis2/java/core/branches/1_7/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/DeployAarMojo.java
axis/axis2/java/core/branches/1_7/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
axis/axis2/java/core/branches/1_7/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarExplodedMojo.java
axis/axis2/java/core/branches/1_7/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarInPlaceMojo.java
axis/axis2/java/core/branches/1_7/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java
axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateRepositoryMojo.java
axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateTestRepositoryMojo.java
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/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java
axis/axis2/java/core/branches/1_7/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/SimpleHttpServerMojo.java
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 8 20:52:41 2018
@@ -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,1733225,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1735801,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594-1739595,1739815,1739826,1740693-1740694,1741976,1742201,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747466,1747503,1747575,1747578,1747601,1747773,1747920,1751057,1752039,1765132,1765183,1765188,1765193,1775081,1775102,1776253,1776585,1776594,1778204,1779069,1779074,1780290,1787632,1787676,1789029,1792353,1792376,1792650,1792655,1792802,1792804,1793723-1793724,1793728,1794114,1794192,1797821,1797823,1799068,1
800495,1803414,1805563,1806088,1806292,1806303-1806305,1806309,1806319,1806344,1806349-1806350,1806577,1806581,1806719,1807643,1807837,1807941,1807943,1808789,1809384-1809385,1809411,1809504,1809507,1809514,1809517,1810596,1810600,1810603,1815035,1815137,1815139,1817866,1817872,1819265
+/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,1733225,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1735801,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594-1739595,1739815,1739826,1740693-1740694,1741976,1742201,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747466,1747503,1747575,1747578,1747601,1747773,1747920,1751057,1752039,1765132,1765183,1765188,1765193,1775081,1775102,1776253,1776585,1776594,1778204,1779069,1779074,1780290,1787632,1787676,1789029,1792353,1792376,1792650,1792655,1792802,1792804,1793723-1793724,1793728,1794114,1794192,1797821,1797823,1799068,1
800495,1803414,1805563,1806088,1806292,1806303-1806305,1806309,1806319,1806344,1806349-1806350,1806577,1806581,1806719,1807643,1807837,1807941,1807943,1808789,1809384-1809385,1809411,1809504,1809507,1809514,1809517,1810596,1810600,1810603,1815035,1815137,1815139,1817866,1817872,1819265,1820601
Modified:
axis/axis2/java/core/branches/1_7/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java?rev=1820603&r1=1820602&r2=1820603&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java
Mon Jan 8 20:52:41 2018
@@ -39,6 +39,7 @@ import java.io.IOException;
* @goal aar
* @phase package
* @requiresDependencyResolution runtime
+ * @threadSafe
*/
public class AarMojo extends AbstractAarMojo {
/**
Modified:
axis/axis2/java/core/branches/1_7/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/DeployAarMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/DeployAarMojo.java?rev=1820603&r1=1820602&r2=1820603&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/DeployAarMojo.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/DeployAarMojo.java
Mon Jan 8 20:52:41 2018
@@ -40,6 +40,7 @@ import java.net.URL;
*
* @goal deployaar
* @phase install
+ * @threadSafe
*/
public class DeployAarMojo extends AbstractAarMojo {
Modified:
axis/axis2/java/core/branches/1_7/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java?rev=1820603&r1=1820602&r2=1820603&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
Mon Jan 8 20:52:41 2018
@@ -44,6 +44,7 @@ import java.util.Set;
* @goal java2wsdl
* @phase process-classes
* @requiresDependencyResolution compile
+ * @threadSafe
*/
public class Java2WSDLMojo extends AbstractMojo {
public static final String OPEN_BRACKET = "[";
Modified:
axis/axis2/java/core/branches/1_7/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarExplodedMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarExplodedMojo.java?rev=1820603&r1=1820602&r2=1820603&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarExplodedMojo.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarExplodedMojo.java
Mon Jan 8 20:52:41 2018
@@ -27,6 +27,7 @@ import org.apache.maven.plugin.MojoExecu
* @goal exploded
* @phase package
* @requiresDependencyResolution runtime
+ * @threadSafe
*/
public class MarExplodedMojo
extends AbstractMarMojo
Modified:
axis/axis2/java/core/branches/1_7/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarInPlaceMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarInPlaceMojo.java?rev=1820603&r1=1820602&r2=1820603&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarInPlaceMojo.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarInPlaceMojo.java
Mon Jan 8 20:52:41 2018
@@ -26,6 +26,7 @@ import org.apache.maven.plugin.MojoExecu
*
* @goal inplace
* @requiresDependencyResolution runtime
+ * @threadSafe
*/
public class MarInPlaceMojo
extends AbstractMarMojo
Modified:
axis/axis2/java/core/branches/1_7/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java?rev=1820603&r1=1820602&r2=1820603&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java
Mon Jan 8 20:52:41 2018
@@ -39,6 +39,7 @@ import java.io.IOException;
* @goal mar
* @phase package
* @requiresDependencyResolution runtime
+ * @threadSafe
*/
public class MarMojo extends AbstractMarMojo
{
Modified:
axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateRepositoryMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateRepositoryMojo.java?rev=1820603&r1=1820602&r2=1820603&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateRepositoryMojo.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateRepositoryMojo.java
Mon Jan 8 20:52:41 2018
@@ -30,6 +30,7 @@ import org.apache.maven.artifact.Artifac
* @goal create-repository
* @phase package
* @requiresDependencyResolution runtime
+ * @threadSafe
*/
public class CreateRepositoryMojo extends AbstractCreateRepositoryMojo {
/**
Modified:
axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateTestRepositoryMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateTestRepositoryMojo.java?rev=1820603&r1=1820602&r2=1820603&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateTestRepositoryMojo.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/CreateTestRepositoryMojo.java
Mon Jan 8 20:52:41 2018
@@ -33,6 +33,7 @@ import org.apache.maven.plugin.MojoFailu
* @goal create-test-repository
* @phase generate-test-resources
* @requiresDependencyResolution test
+ * @threadSafe
*/
public class CreateTestRepositoryMojo extends AbstractCreateRepositoryMojo {
/**
Propchange:
axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 8 20:52:41 2018
@@ -1,4 +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,1787676,1794192
+/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,1787676,1794192,1820601
Modified:
axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java?rev=1820603&r1=1820602&r2=1820603&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java
Mon Jan 8 20:52:41 2018
@@ -44,6 +44,7 @@ import java.util.Properties;
* @goal wsdl2code
* @phase generate-sources
* @requiresDependencyResolution test
+ * @threadSafe
*/
public class WSDL2CodeMojo extends AbstractMojo {
/**
Modified:
axis/axis2/java/core/branches/1_7/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/SimpleHttpServerMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/SimpleHttpServerMojo.java?rev=1820603&r1=1820602&r2=1820603&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/SimpleHttpServerMojo.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/SimpleHttpServerMojo.java
Mon Jan 8 20:52:41 2018
@@ -42,6 +42,7 @@ import static org.apache.axis2.maven2.se
* @goal run
* @execute phase="compile" // TODO - check this again.
* @requiresDependencyResolution runtime
+ * @threadSafe
*/
public class SimpleHttpServerMojo extends AbstractMojo {
