Author: veithen
Date: Sat Aug 26 19:22:28 2017
New Revision: 1806322
URL: http://svn.apache.org/viewvc?rev=1806322&view=rev
Log:
Merge r1806319 to the 1.7 branch.
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/etc/dist.py
axis/axis2/java/core/branches/1_7/modules/distribution/pom.xml
axis/axis2/java/core/branches/1_7/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
axis/axis2/java/core/branches/1_7/modules/tool/axis2-eclipse-service-plugin/pom.xml
axis/axis2/java/core/branches/1_7/pom.xml
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 26 19:22:28 2017
@@ -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,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,1800495,1
803414,1805563,1806088,1806292,1806303-1806305,1806309
+/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,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,1800495,1
803414,1805563,1806088,1806292,1806303-1806305,1806309,1806319
Modified: axis/axis2/java/core/branches/1_7/etc/dist.py
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/etc/dist.py?rev=1806322&r1=1806321&r2=1806322&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/etc/dist.py (original)
+++ axis/axis2/java/core/branches/1_7/etc/dist.py Sat Aug 26 19:22:28 2017
@@ -34,7 +34,7 @@ if exists(dist_root):
rmtree(dist_root)
call(["svn", "checkout",
"https://dist.apache.org/repos/dist/dev/axis/axis2/java/core/";, dist_root])
mkdir(dist_dir)
-for suffix in [ "zip", "zip.asc", "zip.md5", "zip.sha1" ]:
+for suffix in [ "zip", "zip.asc", "zip.md5", "zip.sha1", "zip.sha512" ]:
for classifier in [ "bin", "src", "war" ]:
file = "axis2-" + release + "-" + classifier + "." + suffix
copyfile(join(root_dir, "modules", "distribution", "target", file),
join(dist_dir, file))
Modified: axis/axis2/java/core/branches/1_7/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/distribution/pom.xml?rev=1806322&r1=1806321&r2=1806322&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/distribution/pom.xml Sat Aug 26
19:22:28 2017
@@ -483,7 +483,7 @@
<build>
<plugins>
<plugin>
- <groupId>net.ju-n.maven.plugins</groupId>
+ <groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
<executions>
<execution>
Modified:
axis/axis2/java/core/branches/1_7/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?rev=1806322&r1=1806321&r2=1806322&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
(original)
+++
axis/axis2/java/core/branches/1_7/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
Sat Aug 26 19:22:28 2017
@@ -256,7 +256,7 @@
<build>
<plugins>
<plugin>
- <groupId>net.ju-n.maven.plugins</groupId>
+ <groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
<executions>
<execution>
Modified:
axis/axis2/java/core/branches/1_7/modules/tool/axis2-eclipse-service-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/tool/axis2-eclipse-service-plugin/pom.xml?rev=1806322&r1=1806321&r2=1806322&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/tool/axis2-eclipse-service-plugin/pom.xml
(original)
+++
axis/axis2/java/core/branches/1_7/modules/tool/axis2-eclipse-service-plugin/pom.xml
Sat Aug 26 19:22:28 2017
@@ -233,7 +233,7 @@
<build>
<plugins>
<plugin>
- <groupId>net.ju-n.maven.plugins</groupId>
+ <groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
<executions>
<execution>
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=1806322&r1=1806321&r2=1806322&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/pom.xml Sat Aug 26 19:22:28 2017
@@ -1197,9 +1197,16 @@
<version>2.1.0</version>
</plugin>
<plugin>
- <groupId>net.ju-n.maven.plugins</groupId>
+ <groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
- <version>1.2</version>
+ <version>1.5</version>
+ <configuration>
+ <algorithms>
+ <algorithm>MD5</algorithm>
+ <algorithm>SHA-1</algorithm>
+ <algorithm>SHA-512</algorithm>
+ </algorithms>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
