Adding release information for archiva 2.2.3
diff --git a/pom.xml b/pom.xml
index f7b00ad..88df9be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-parent</artifactId>
- <version>17-SNAPSHOT</version>
+ <version>18</version>
</parent>
<name>Archiva</name>
<artifactId>archiva-site</artifactId>
@@ -38,16 +38,15 @@
<archivaLastSerieVersion>1.3.9</archivaLastSerieVersion>
<archivaLastSerieVersionDate>1 July 2014</archivaLastSerieVersionDate>
-->
- <archivaReleaseVersion>2.2.2</archivaReleaseVersion>
- <archivaReleaseDate>15th April 2017</archivaReleaseDate>
+ <archivaReleaseVersion>2.2.3</archivaReleaseVersion>
+ <archivaReleaseDate>16th May 2017</archivaReleaseDate>
+ <archivaCurrentDevVersion>3.0.0-SNAPSHOT</archivaCurrentDevVersion>
<supportedVersions></supportedVersions>
- <!-- Dropped 1.2.x support in December 2010. 1.3 - 1.3.6 unsupported due to sec. vulnerability -->
<unsupportedVersions>1.X</unsupportedVersions>
<siteUrl>http://archiva.apache.org/</siteUrl>
<site.cache.path>${user.home}</site.cache.path>
<scmPubCheckoutDirectory>site-content</scmPubCheckoutDirectory>
- <archivaCurrentDevVersion>3.0.0-SNAPSHOT</archivaCurrentDevVersion>
<newUiDocVersion>${archivaReleaseVersion}</newUiDocVersion>
<svnUrl>https://svn.apache.org/repos/asf/archiva/site-content</svnUrl>
</properties>
diff --git a/src/site/apt/developers/building.apt b/src/site/apt/developers/building.apt
index a89de65..e2ac9f7 100644
--- a/src/site/apt/developers/building.apt
+++ b/src/site/apt/developers/building.apt
@@ -59,9 +59,9 @@
git clone
+--
-git clone git://github.com/apache/archiva.git; cd archiva ; sh ./init-git-svn.sh
+git clone git://github.com/apache/archiva.git
or trough https
-git clone https://github.com/apache/archiva.git; cd archiva ; sh ./init-git-svn.sh
+git clone https://github.com/apache/archiva.git
+--
Running Javascript webapp with tomcat-maven-plugin
diff --git a/src/site/apt/developers/releasing.apt b/src/site/apt/developers/releasing.apt
index 6ba9a50..528e677 100644
--- a/src/site/apt/developers/releasing.apt
+++ b/src/site/apt/developers/releasing.apt
@@ -80,33 +80,68 @@
Download the uploaded files via wget:
+-------------
-ex.
-wget http://archiva-repository.apache.org/archiva/repository/archiva-releases-stage/org/apache/archiva/archiva-jetty/1.3/archiva-jetty-1.3-bin.tar.gz
-Verify the signatures:
-ex.
-gpg -v archiva-jetty-1.3-bin.zip.asc
+ARCHV="2.2.3" # Enter the new archiva version
+RELEASE_URL="http://archiva-repository.apache.org/archiva/repository/archiva-releases-stage"
+wget ${RELEASE_URL}/org/apache/archiva/archiva-jetty/${ARCHV}/archiva-jetty-${ARCHV}-bin.tar.gz
+# Verify the signatures:
+gpg -v archiva-jetty-${ARCHV}-bin.zip.asc
+-------------
- The documentation is deployed as part of the process to the final location for review in the vote: http://archiva.apache.org/docs/1.3/. If the vote doesn't pass, the documentation will need to be removed from the server for redeployment.
- Commit the sources and binaries from org/apache/archiva/archiva-jetty, and org/apache/archiva/archiva to the svn distribution tree.
- First in dev tree: https://dist.apache.org/repos/dist/dev/archiva/ (if the vote pass they will be copied to release tree) https://dist.apache.org/repos/dist/release/archiva
+ The documentation is deployed as part of the process to the final location for review in the vote:
+
++-------------
+git checkout archiva-${ARCHV} # Checkout the release version of archiva
+cd archiva-doc
+mvn site-deploy
++-------------
+
+ If the vote doesn't pass, the documentation will need to be removed from the server for redeployment.
+
+ Commit the sources and binaries from <<<org/apache/archiva/archiva-jetty>>> and <<<org/apache/archiva/archiva>>> to the svn distribution tree.
+ First in dev tree: <<<https://dist.apache.org/repos/dist/dev/archiva/>>>
+-------------
svn co https://dist.apache.org/repos/dist/dev/archiva/ archiva-dev-release
cd archiva-dev-release
-sh ./release-script-svn.sh VERSION STAGING_URL
+sh ./release-script-svn.sh $ARCHV ${RELEASE_URL}/
+
+# For parent pom or redback:
+POMV=18 # New Parent POM version
+sh ./release-script-parent-pom.sh $POMV ${RELEASE_URL}/
+REDBV=2.6 # New redback version
+sh ./release-script-redback-svn.sh $REDBV ${RELEASE_URL}/
+-------------
- Call for a vote in the dev list and wait for 72 hrs. for the vote results. 3 binding votes are necessary for the release to be finalized. example
+ If the vote pass they will be copied to release tree: <<<https://dist.apache.org/repos/dist/release/archiva>>>
+
+
+ Call for a vote in the dev list and wait for 72 hrs. for the vote results. 3 binding votes are necessary for the release to be finalized.
If the vote fails or needs to be canceled, the version number should not be re-used if the version was made available for public download.
- After the vote has passed, move the files from dist dev to dist release: svn mv https://dist.apache.org/repos/dist/dev/archiva/ to https://dist.apache.org/repos/dist/relase/archiva/
+ After the vote has passed, move the files from dist dev to dist release:
+
++-------------
+svn mv https://dist.apache.org/repos/dist/dev/archiva/${ARCHV} https://dist.apache.org/repos/dist/relase/archiva/
+
+# Move also the POM and Redback and Redback Component releases, if there are new ones.
++-------------
+
+ To sync the jars to Maven Central, you need to merge the repository archiva-releases-stage to "Central Rsync Repository"
+
+ Mark the appropriate release version in JIRA as complete.
- To sync the jars to Maven Central, you need to merge the repository archiva-releases-stage to rsync-central
+ Update the archiva site (https://svn.apache.org/repos/asf/archiva/site/) for the versions and release notes URL:
+ Mostly these properties of the pom.xml should be edited:
- mark the appropriate release version in JIRA as complete
- Update the archiva site (https://svn.apache.org/repos/asf/archiva/site/) for the versions and release notes URL and run mvn site-deploy. The 3 properties to change are at the bottom of pom.xml before generating the site.
++-------------
+ <archivaReleaseVersion>2.2.3</archivaReleaseVersion>
+ <archivaReleaseDate>16th May 2017</archivaReleaseDate>
+ <archivaCurrentDevVersion>3.0.0-SNAPSHOT</archivaCurrentDevVersion>
++-------------
+
+ Run <<<mvn site:run>>> and verify the changes. Commit your changes. Then run <<<mvn site-deploy>>>.
+
Once mirroring done (can be 24H): remove previous versions from https://dist.apache.org/repos/dist/release/archiva/
Publish the reference docs (sh ./deploySite.sh in the archiva-modules directory) from the release tag.
diff --git a/src/site/apt/security.apt b/src/site/apt/security.apt
index 6dded6e..cd2c6c9 100644
--- a/src/site/apt/security.apt
+++ b/src/site/apt/security.apt
@@ -46,11 +46,11 @@
Versions Affected:
- * All versions before 2.2.2
+ * All versions before 2.2.3
Mitigation:
- * Upgrade to {{{./download.cgi} Archiva 2.2.2 or higher}}, where additional measures are taken to verify
+ * Upgrade to {{{./download.html} Archiva 2.2.3 or higher}}, where additional measures are taken to verify
the origin of REST requests.
diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm
index 8026209..78ea489 100644
--- a/src/site/xdoc/download.xml.vm
+++ b/src/site/xdoc/download.xml.vm
@@ -107,7 +107,8 @@
<tr>
<th>Archiva ${archivaReleaseVersion} </th>
<th>Mirrors</th>
- <th>Checksum</th>
+ <th>MD5 Checksum</th>
+ <th>SHA1 Checksum</th>
<th>Signature</th>
</tr>
</thead>
@@ -116,24 +117,28 @@
<td>Archiva ${archivaReleaseVersion} Standalone</td>
<td><a href="[preferred]archiva/${archivaReleaseVersion}/binaries/apache-archiva-${archivaReleaseVersion}-bin.tar.gz">tar.gz</a></td>
<td><a href="http://www.apache.org/dist/archiva/${archivaReleaseVersion}/binaries/apache-archiva-${archivaReleaseVersion}-bin.tar.gz.md5">md5</a></td>
+ <td><a href="http://www.apache.org/dist/archiva/${archivaReleaseVersion}/binaries/apache-archiva-${archivaReleaseVersion}-bin.tar.gz.sha1">sha1</a></td>
<td><a href="http://www.apache.org/dyn/closer.cgi/archiva/${archivaReleaseVersion}/binaries/apache-archiva-${archivaReleaseVersion}-bin.tar.gz.asc">asc</a></td>
</tr>
<tr>
<td></td>
<td><a href="[preferred]archiva/${archivaReleaseVersion}/binaries/apache-archiva-${archivaReleaseVersion}-bin.zip">zip</a></td>
<td><a href="http://www.apache.org/dist/archiva/${archivaReleaseVersion}/binaries/apache-archiva-${archivaReleaseVersion}-bin.zip.md5">md5</a></td>
+ <td><a href="http://www.apache.org/dist/archiva/${archivaReleaseVersion}/binaries/apache-archiva-${archivaReleaseVersion}-bin.zip.sha1">sha1</a></td>
<td><a href="http://www.apache.org/dist/archiva/${archivaReleaseVersion}/binaries/apache-archiva-${archivaReleaseVersion}-bin.zip.asc">asc</a></td>
</tr>
<tr>
<td>Archiva ${archivaReleaseVersion} WAR</td>
<td><a href="[preferred]archiva/${archivaReleaseVersion}/binaries/apache-archiva-${archivaReleaseVersion}.war">war</a></td>
<td><a href="http://www.apache.org/dist/archiva/${archivaReleaseVersion}/binaries/apache-archiva-${archivaReleaseVersion}.war.md5">md5</a></td>
+ <td><a href="http://www.apache.org/dist/archiva/${archivaReleaseVersion}/binaries/apache-archiva-${archivaReleaseVersion}.war.sha1">sha1</a></td>
<td><a href="http://www.apache.org/dist/archiva/${archivaReleaseVersion}/binaries/apache-archiva-${archivaReleaseVersion}.war.asc">asc</a></td>
</tr>
<tr>
<td>Archiva ${archivaReleaseVersion} Sources</td>
<td><a href="[preferred]archiva/${archivaReleaseVersion}/src/apache-archiva-${archivaReleaseVersion}-src.zip">source zip</a></td>
<td><a href="http://www.apache.org/dist/archiva/${archivaReleaseVersion}/src/apache-archiva-${archivaReleaseVersion}-src.zip.md5">md5</a></td>
+ <td><a href="http://www.apache.org/dist/archiva/${archivaReleaseVersion}/src/apache-archiva-${archivaReleaseVersion}-src.zip.sha1">sha1</a></td>
<td><a href="http://www.apache.org/dist/archiva/${archivaReleaseVersion}/src/apache-archiva-${archivaReleaseVersion}-src.zip.asc">asc</a></td>
</tr>
</tbody>
diff --git a/src/site/xdoc/index.xml.vm b/src/site/xdoc/index.xml.vm
index 782c147..cc89113 100644
--- a/src/site/xdoc/index.xml.vm
+++ b/src/site/xdoc/index.xml.vm
@@ -40,7 +40,7 @@
<div class="hero-unit">
<span class="bignumber badge badge-warning">NEW</span>
<p><strong>Our code source is now using git, so you can propose pull requests using <a href="https://github.com/apache/archiva">github mirror</a></strong></p>
- <p><strong>30th May 2016 release of 2.2.1 See <a href="http://archiva.apache.org/docs/${archivaReleaseVersion}/tour/index.html">Quick Tour</a></strong></p>
+ <p><strong>${archivaReleaseDate} release of ${archivaReleaseVersion} See <a href="http://archiva.apache.org/docs/${archivaReleaseVersion}/tour/index.html">Quick Tour</a></strong></p>
</div>
</div>
</div>
