Author: veithen
Date: Tue Mar  6 20:35:08 2018
New Revision: 1826042

URL: http://svn.apache.org/viewvc?rev=1826042&view=rev
Log:
Merge r1806321 and r1826041 to the 1.2 branch.

Modified:
    webservices/axiom/branches/1.2.x/   (props changed)
    webservices/axiom/branches/1.2.x/distribution/pom.xml
    webservices/axiom/branches/1.2.x/etc/dist.py
    webservices/axiom/branches/1.2.x/src/site/markdown/download.md.vm

Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  6 20:35:08 2018
@@ -14,4 +14,4 @@
 /webservices/axiom/branches/maven-site-plugin-3.5:1731125-1732708
 /webservices/axiom/branches/namespaceURIInterning:1293148-1293587
 /webservices/axiom/branches/osgi-redesign:1180368-1180596
-/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1758113,1762239,1762241,1762243,1777898,1781319,1781488,1787644,1791831,1795059,1795067,1795081,1796558,1815009,1817725,1817727,1817735
+/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1758113,1762239,1762241,1762243,1777898,1781319,1781488,1787644,1791831,1795059,1795067,1795081,1796558,1806321,1815009,1817725,1817727,1817735,1826041

Modified: webservices/axiom/branches/1.2.x/distribution/pom.xml
URL: 
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/distribution/pom.xml?rev=1826042&r1=1826041&r2=1826042&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/distribution/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/distribution/pom.xml Tue Mar  6 20:35:08 
2018
@@ -183,14 +183,19 @@
                 </executions>
             </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>
                 <executions>
                     <execution>
                         <goals>
                             <goal>artifacts</goal>
                         </goals>
+                        <configuration>
+                            <algorithms>
+                                <algorithm>SHA-512</algorithm>
+                            </algorithms>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: webservices/axiom/branches/1.2.x/etc/dist.py
URL: 
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/etc/dist.py?rev=1826042&r1=1826041&r2=1826042&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/etc/dist.py (original)
+++ webservices/axiom/branches/1.2.x/etc/dist.py Tue Mar  6 20:35:08 2018
@@ -35,7 +35,7 @@ if exists(dist_root):
 call(["svn", "checkout", "https://dist.apache.org/repos/dist/dev/ws/axiom/";, 
dist_root])
 mkdir(dist_dir)
 for classifier in [ "bin", "src" ]:
-    for suffix in [ "zip", "zip.asc", "zip.md5", "zip.sha1"]:
+    for suffix in [ "zip", "zip.asc", "zip.sha512"]:
         file = "axiom-" + release + "-" + classifier + "." + suffix
         copyfile(join(axiom_dir, "distribution", "target", file), 
join(dist_dir, file))
 call(["svn", "add", dist_dir])

Modified: webservices/axiom/branches/1.2.x/src/site/markdown/download.md.vm
URL: 
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/src/site/markdown/download.md.vm?rev=1826042&r1=1826041&r2=1826042&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/src/site/markdown/download.md.vm (original)
+++ webservices/axiom/branches/1.2.x/src/site/markdown/download.md.vm Tue Mar  
6 20:35:08 2018
@@ -26,9 +26,9 @@ release can be found [here](release-note
 The following distributions are available for download:
 
 &nbsp;              | Link                                  | Checksums and 
signatures
---------------------|---------------------------------------|----------------------------
-Binary distribution | [axiom-${release_version}-bin.zip][1] | [MD5][2] 
[SHA1][3] [PGP][4]
-Source distribution | [axiom-${release_version}-src.zip][5] | [MD5][6] 
[SHA1][7] [PGP][8]
+--------------------|---------------------------------------|-------------------------
+Binary distribution | [axiom-${release_version}-bin.zip][1] | [SHA512][3] 
[PGP][4]
+Source distribution | [axiom-${release_version}-src.zip][5] | [SHA512][7] 
[PGP][8]
 
 The signatures of the distributions can be [verified][9] against the public 
keys in the [KEYS][10] file.
 
@@ -37,12 +37,10 @@ Distributions for older releases can be
 All releases are also available as Maven artifacts in the [central 
repository][13].
 
 [1]: 
http://www.apache.org/dyn/closer.lua/ws/axiom/${release_version}/axiom-${release_version}-bin.zip
-[2]: 
https://www.apache.org/dist/ws/axiom/${release_version}/axiom-${release_version}-bin.zip.md5
-[3]: 
https://www.apache.org/dist/ws/axiom/${release_version}/axiom-${release_version}-bin.zip.sha1
+[3]: 
https://www.apache.org/dist/ws/axiom/${release_version}/axiom-${release_version}-bin.zip.sha512
 [4]: 
https://www.apache.org/dist/ws/axiom/${release_version}/axiom-${release_version}-bin.zip.asc
 [5]: 
http://www.apache.org/dyn/closer.lua/ws/axiom/${release_version}/axiom-${release_version}-src.zip
-[6]: 
https://www.apache.org/dist/ws/axiom/${release_version}/axiom-${release_version}-src.zip.md5
-[7]: 
https://www.apache.org/dist/ws/axiom/${release_version}/axiom-${release_version}-src.zip.sha1
+[7]: 
https://www.apache.org/dist/ws/axiom/${release_version}/axiom-${release_version}-src.zip.sha512
 [8]: 
https://www.apache.org/dist/ws/axiom/${release_version}/axiom-${release_version}-src.zip.asc
 [9]: http://www.apache.org/dev/release-signing#verifying-signature
 [10]: https://www.apache.org/dist/ws/axiom/KEYS


Reply via email to