Author: veithen
Date: Fri Feb  9 21:29:48 2018
New Revision: 1823704

URL: http://svn.apache.org/viewvc?rev=1823704&view=rev
Log:
Partially merge r1823386 to the 1.7 branch.

Modified:
    axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/   
(props changed)
    
axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/pom.xml
    axis/axis2/java/core/branches/1_7/pom.xml   (contents, props changed)

Propchange: 
axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Feb  9 21:29:48 2018
@@ -0,0 +1,4 @@
+/axis/axis2/java/core/branches/1_6/modules/tool/axis2-repo-maven-plugin:1295540
+/axis/axis2/java/core/branches/AXIOM-420/modules/tool/axis2-repo-maven-plugin:1334386-1336397
+/axis/axis2/java/core/branches/AXIS2-4318/modules/tool/axis2-repo-maven-plugin:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
+/axis/axis2/java/core/trunk/modules/tool/axis2-repo-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,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,1794
 
114,1794192,1797821,1797823,1799068,1800495,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,1819211,1819265,1820601,1823386

Modified: 
axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/pom.xml?rev=1823704&r1=1823703&r2=1823704&view=diff
==============================================================================
--- 
axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/pom.xml 
(original)
+++ 
axis/axis2/java/core/branches/1_7/modules/tool/axis2-repo-maven-plugin/pom.xml 
Fri Feb  9 21:29:48 2018
@@ -104,11 +104,22 @@
                 </configuration>
             </plugin>
             <plugin>
+                <groupId>com.github.veithen.invoker</groupId>
+                <artifactId>resolver-proxy-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>start</goal>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <artifactId>maven-invoker-plugin</artifactId>
                 <executions>
                     <execution>
                         <goals>
-                            <goal>install</goal>
                             <goal>integration-test</goal>
                             <goal>verify</goal>
                         </goals>

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=1823704&r1=1823703&r2=1823704&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/pom.xml Fri Feb  9 21:29:48 2018
@@ -1226,6 +1226,11 @@
                     <version>8.1.16.v20140903</version>
                 </plugin>
                 <plugin>
+                    <groupId>com.github.veithen.invoker</groupId>
+                    <artifactId>resolver-proxy-maven-plugin</artifactId>
+                    <version>0.1</version>
+                </plugin>
+                <plugin>
                     <artifactId>maven-invoker-plugin</artifactId>
                     <version>2.0.0</version>
                     <configuration>

Propchange: axis/axis2/java/core/branches/1_7/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Feb  9 21:29:48 2018
@@ -0,0 +1,4 @@
+/axis/axis2/java/core/branches/1_6/pom.xml:1295540
+/axis/axis2/java/core/branches/AXIOM-420/pom.xml:1334386-1336397
+/axis/axis2/java/core/branches/AXIS2-4318/pom.xml:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
+/axis/axis2/java/core/trunk/pom.xml: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,1
 
799068,1800495,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,1823386


Reply via email to