Author: mck Date: Sat Sep 30 06:58:27 2017 New Revision: 1810172 URL: http://svn.apache.org/viewvc?rev=1810172&view=rev Log: `svn merge -c1807304 ^/tiles/request/branches/TREQ_1_0_X`
Upgrade procedure for uploading assemblies to https://dist.apache.org/repos/dist/dev as per http://www.apache.org/legal/release-policy.html#host-rc Modified: tiles/request/trunk/ (props changed) tiles/request/trunk/assembly/pom.xml tiles/request/trunk/src/site/apt/dev/release.apt Propchange: tiles/request/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 30 06:58:27 2017 @@ -1 +1 @@ -/tiles/request/branches/TREQ_1_0_X:1489378,1538332,1583141-1583206,1591714,1598227,1598381,1598921,1602363-1625207,1799289 +/tiles/request/branches/TREQ_1_0_X:1489378,1538332,1583141-1583206,1591714,1598227,1598381,1598921,1602363-1625207,1799289,1807304 Modified: tiles/request/trunk/assembly/pom.xml URL: http://svn.apache.org/viewvc/tiles/request/trunk/assembly/pom.xml?rev=1810172&r1=1810171&r2=1810172&view=diff ============================================================================== --- tiles/request/trunk/assembly/pom.xml (original) +++ tiles/request/trunk/assembly/pom.xml Sat Sep 30 06:58:27 2017 @@ -52,13 +52,6 @@ </configuration> </plugin> </plugins> - <extensions> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh</artifactId> - <version>2.5</version> - </extension> - </extensions> </build> <profiles> <profile> @@ -120,26 +113,6 @@ </configuration> </execution> </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>wagon-maven-plugin</artifactId> - <version>1.0-beta-4</version> - <executions> - <execution> - <phase>deploy</phase> - <goals> - <goal>upload</goal> - </goals> - <configuration> - <fromDir>${project.build.directory}/assemblies</fromDir> - <includes>**</includes> - <toDir>${project.version}</toDir> - <serverId>tiles.build</serverId> - <url>scp://people.apache.org/www/people.apache.org/builds/tiles/request</url> - </configuration> - </execution> - </executions> </plugin> </plugins> </build> Modified: tiles/request/trunk/src/site/apt/dev/release.apt URL: http://svn.apache.org/viewvc/tiles/request/trunk/src/site/apt/dev/release.apt?rev=1810172&r1=1810171&r2=1810172&view=diff ============================================================================== --- tiles/request/trunk/src/site/apt/dev/release.apt (original) +++ tiles/request/trunk/src/site/apt/dev/release.apt Sat Sep 30 06:58:27 2017 @@ -77,13 +77,13 @@ ssh-keygen -t rsa * Copy your public key to the server: -------------------------------------- -scp ~/.ssh/id_rsa.pub [email protected]:.ssh/authorized_keys +scp ~/.ssh/id_rsa.pub [email protected]:.ssh/authorized_keys -------------------------------------- * Try to login: --------------------------------- -ssh [email protected] +ssh [email protected] --------------------------------- If it does not ask you a password, everything is ok. @@ -124,12 +124,16 @@ mvn release:perform It should compile and test everything, build and upload the artifacts and the website for the project. - <<Troubleshooting>>: if upload of assemblies fails it can be done manually with + Upload the assemblies manually with ----------------------------------- -cd target/checkout/assembly/target/assemblies/ -ssh [email protected] mkdir /www/people.apache.org/builds/tiles/request/${version}/ -scp * [email protected]:/www/people.apache.org/builds/tiles/request/${version}/ +cd target/ +svn co https://dist.apache.org/repos/dist/dev/tiles tiles-dist-dev +mkdir tiles-request-dist-releases/request/${version} +cd tiles-request-dist-releases/request/${version} +cp checkout/assembly/target/assemblies/* tiles-request-dist-releases/request/${version}/ +svn add tiles-request-dist-releases/request/${version} +svn ci tiles-request-dist-releases/request/${version} ----------------------------------- * Close the staging repository @@ -157,7 +161,7 @@ scp * [email protected]:/www/people * Verify the uploaded assemblies - * go to the destination directory on people.apache.org (cd /www/people.apache.org/builds/tiles/request/${version}). + * go to the destination directory on dist.apache.org ( https://dist.apache.org/repos/dist/dev/tiles/request/${version} ). * check the presence of the 3 distributions (bin, doc and src), and their signature files (*.asc, *.md5, *sha1). @@ -190,7 +194,7 @@ Release notes: Distribution: - * http://people.apache.org/builds/tiles/request/${version}/ + * https://dist.apache.org/repos/dist/dev/tiles/request/${version}/ Maven 2 staging repository: @@ -216,7 +220,7 @@ Release notes: Distribution: - * http://people.apache.org/builds/tiles/request/${version}/ + * https://dist.apache.org/repos/dist/dev/tiles/request/${version}/ Maven 2 staging repository: @@ -258,12 +262,7 @@ three binding +1s and more +1s than -1s. Move assemblies into the Apache {{{http://www.apache.org/dev/release#when-to-archive}dist}} repository: ------------------------------------------- -svn co https://dist.apache.org/repos/dist/release/tiles tiles-request-dist-releases -mkdir tiles-request-dist-releases/v${version} -cd tiles-request-dist-releases/v${version} -scp [email protected]:/www/people.apache.org/builds/tiles/request/${version}/* . -svn add . -svn ci +svn mv https://dist.apache.org/repos/dist/dev/tiles/request/${version} https://dist.apache.org/repos/dist/release/tiles/request/ ------------------------------------------- ** Update the site
