`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
git-svn-id: https://svn.apache.org/repos/asf/tiles/request/trunk@1810172 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 4ecde5c..89d2db1 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -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>
@@ -121,26 +114,6 @@
</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>
</profile>
diff --git a/src/site/apt/dev/release.apt b/src/site/apt/dev/release.apt
index 2a11726..2fe8843 100644
--- a/src/site/apt/dev/release.apt
+++ b/src/site/apt/dev/release.apt
@@ -77,13 +77,13 @@
* Copy your public key to the server:
--------------------------------------
-scp ~/.ssh/id_rsa.pub user@people.apache.org:.ssh/authorized_keys
+scp ~/.ssh/id_rsa.pub user@minotaur.apache.org:.ssh/authorized_keys
--------------------------------------
* Try to login:
---------------------------------
-ssh user@people.apache.org
+ssh user@minotaur.apache.org
---------------------------------
If it does not ask you a password, everything is ok.
@@ -124,12 +124,16 @@
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 user@people.apache.org mkdir /www/people.apache.org/builds/tiles/request/${version}/
-scp * user@people.apache.org:/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 @@
* 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 @@
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 @@
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 @@
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 user@people.apache.org:/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
