Author: veithen
Date: Tue Mar 6 20:25:35 2018
New Revision: 1826037
URL: http://svn.apache.org/viewvc?rev=1826037&view=rev
Log:
Merge r1826036 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/pom.xml (contents, props changed)
axis/axis2/java/core/branches/1_7/src/site/markdown/download.md.vm
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 6 20:25:35 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,1820601,1823604,1823614,1823712
+/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,1823604,1823614,1823712,1826036
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=1826037&r1=1826036&r2=1826037&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/etc/dist.py (original)
+++ axis/axis2/java/core/branches/1_7/etc/dist.py Tue Mar 6 20:25:35 2018
@@ -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", "zip.sha512" ]:
+for suffix in [ "zip", "zip.asc", "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/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/pom.xml?rev=1826037&r1=1826036&r2=1826037&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/pom.xml Tue Mar 6 20:25:35 2018
@@ -1199,8 +1199,6 @@
<version>1.5</version>
<configuration>
<algorithms>
- <algorithm>MD5</algorithm>
- <algorithm>SHA-1</algorithm>
<algorithm>SHA-512</algorithm>
</algorithms>
</configuration>
Propchange: axis/axis2/java/core/branches/1_7/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 6 20:25:35 2018
@@ -1,4 +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,1823712
+/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,1823712,1826036
Modified: axis/axis2/java/core/branches/1_7/src/site/markdown/download.md.vm
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/src/site/markdown/download.md.vm?rev=1826037&r1=1826036&r2=1826037&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/src/site/markdown/download.md.vm
(original)
+++ axis/axis2/java/core/branches/1_7/src/site/markdown/download.md.vm Tue Mar
6 20:25:35 2018
@@ -26,13 +26,13 @@ release can be found [here](release-note
The following distributions are available for download:
| Link
| Checksums and signatures
------------------------------------|-----------------------------------------------------------|-------------------------------
-Binary distribution | [axis2-${release_version}-bin.zip][1]
| [MD5][2] [SHA1][3] [PGP][4]
-Source distribution | [axis2-${release_version}-src.zip][5]
| [MD5][6] [SHA1][7] [PGP][8]
-WAR distribution | [axis2-${release_version}-war.zip][9]
| [MD5][10] [SHA1][11] [PGP][12]
-Service Archive plugin for Eclipse |
[axis2-eclipse-service-plugin-${release_version}.zip][13] | [MD5][14]
[SHA1][15] [PGP][16]
-Code Generator plugin for Eclipse |
[axis2-eclipse-codegen-plugin-${release_version}.zip][17] | [MD5][18]
[SHA1][19] [PGP][20]
-Axis2 plugin for IntelliJ IDEA |
[axis2-idea-plugin-${release_version}.zip][21] | [MD5][22]
[SHA1][23] [PGP][24]
+-----------------------------------|-----------------------------------------------------------|-------------------------
+Binary distribution | [axis2-${release_version}-bin.zip][1]
| [SHA512][3] [PGP][4]
+Source distribution | [axis2-${release_version}-src.zip][5]
| [SHA512][7] [PGP][8]
+WAR distribution | [axis2-${release_version}-war.zip][9]
| [SHA512][11] [PGP][12]
+Service Archive plugin for Eclipse |
[axis2-eclipse-service-plugin-${release_version}.zip][13] | [SHA512][15]
[PGP][16]
+Code Generator plugin for Eclipse |
[axis2-eclipse-codegen-plugin-${release_version}.zip][17] | [SHA512][19]
[PGP][20]
+Axis2 plugin for IntelliJ IDEA |
[axis2-idea-plugin-${release_version}.zip][21] | [SHA512][23]
[PGP][24]
The binary distribution contains all the Axis2 libraries and modules, except
for [Apache Rampart](../rampart/)
(WS-Security implementation) which must be downloaded separately. It also
contains command line tools,
@@ -48,28 +48,22 @@ Distributions for older releases can be
All releases are also available as Maven artifacts in the [central
repository][29].
[1]:
http://www.apache.org/dyn/closer.lua/axis/axis2/java/core/${release_version}/axis2-${release_version}-bin.zip
-[2]:
https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-bin.zip.md5
-[3]:
https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-bin.zip.sha1
+[3]:
https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-bin.zip.sha512
[4]:
https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-bin.zip.asc
[5]:
http://www.apache.org/dyn/closer.lua/axis/axis2/java/core/${release_version}/axis2-${release_version}-src.zip
-[6]:
https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-src.zip.md5
-[7]:
https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-src.zip.sha1
+[7]:
https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-src.zip.sha512
[8]:
https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-src.zip.asc
[9]:
http://www.apache.org/dyn/closer.lua/axis/axis2/java/core/${release_version}/axis2-${release_version}-war.zip
-[10]:
https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-war.zip.md5
-[11]:
https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-war.zip.sha1
+[11]:
https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-war.zip.sha512
[12]:
https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-war.zip.asc
[13]:
http://www.apache.org/dyn/closer.lua/axis/axis2/java/core/${release_version}/axis2-eclipse-service-plugin-${release_version}.zip
-[14]:
https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-eclipse-service-plugin-${release_version}.zip.md5
-[15]:
https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-eclipse-service-plugin-${release_version}.zip.sha1
+[15]:
https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-eclipse-service-plugin-${release_version}.zip.sha512
[16]:
https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-eclipse-service-plugin-${release_version}.zip.asc
[17]:
http://www.apache.org/dyn/closer.lua/axis/axis2/java/core/${release_version}/axis2-eclipse-codegen-plugin-${release_version}.zip
-[18]:
https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-eclipse-codegen-plugin-${release_version}.zip.md5
-[19]:
https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-eclipse-codegen-plugin-${release_version}.zip.sha1
+[19]:
https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-eclipse-codegen-plugin-${release_version}.zip.sha512
[20]:
https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-eclipse-codegen-plugin-${release_version}.zip.asc
[21]:
http://www.apache.org/dyn/closer.lua/axis/axis2/java/core/${release_version}/axis2-idea-plugin-${release_version}.zip
-[22]:
https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-idea-plugin-${release_version}.zip.md5
-[23]:
https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-idea-plugin-${release_version}.zip.sha1
+[23]:
https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-idea-plugin-${release_version}.zip.sha512
[24]:
https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-idea-plugin-${release_version}.zip.asc
[25]: http://www.apache.org/dev/release-signing#verifying-signature
[26]: https://www.apache.org/dist/axis/axis2/java/core/KEYS
