`svn merge -c1810179 ^/tiles/framework/branches/TILES_3_0_X`
fix log and release docs (svnpub)
git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/trunk@1810180 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/site/apt/dev/release.apt b/src/site/apt/dev/release.apt
index 2bf6768..fe4b4ce 100644
--- a/src/site/apt/dev/release.apt
+++ b/src/site/apt/dev/release.apt
@@ -58,28 +58,6 @@
Publish your GPG key in a PGP key server, such as
{{{http://pgp.mit.edu/} MIT Keyserver}}.
-* Create and upload yout SSH key
-
- * Generate your SSH key (in this case we will use DSA encryption):
-
----------------------------------
-ssh-keygen -t rsa
----------------------------------
-
- * Copy your public key to the server:
-
---------------------------------------
-scp ~/.ssh/id_rsa.pub user@people.apache.org:.ssh/authorized_keys
---------------------------------------
-
- * Try to login:
-
----------------------------------
-ssh user@people.apache.org
----------------------------------
-
- If it does not ask you a password, everything is ok.
-
* Modify <<<settings.xml>>>
Your <<<settings.xml>>> must be modified to allow deployment.
@@ -151,6 +129,17 @@
It should compile and test everything, build and upload the artifacts and the website for the project.
+ Upload the assemblies manually with
+
+-----------------------------------
+cd target/
+svn co https://dist.apache.org/repos/dist/dev/tiles tiles-dist-dev
+mkdir tiles-dist-dev/request/${version}
+cp checkout/assembly/target/assemblies/* tiles-dist-dev/${version}/
+svn add tiles-dist-dev/${version}
+svn ci tiles-dist-dev/${version}
+-----------------------------------
+
* Close the staging repository
Login to {{{https://repository.apache.org} Nexus repository}} using your Apache LDAP credentials.
@@ -207,7 +196,7 @@
Distribution:
- * http://people.apache.org/builds/tiles/${version}/
+ * https://dist.apache.org/repos/dist/dev/tiles/${version}/
Maven 2 staging repository:
@@ -233,7 +222,7 @@
Distribution:
- * http://people.apache.org/builds/tiles/${version}/
+ * https://dist.apache.org/repos/dist/dev/tiles/${version}/
Maven 2 staging repository:
@@ -275,11 +264,9 @@
* Move assemblies to the Apache distribution mirrors:
-------------------------------------------
-ssh user@people.apache.org
-cd /www/people.apache.org/builds/tiles/${version}
-mkdir /www/www.apache.org/dist/tiles/v${version}/
-cp * /www/www.apache.org/dist/tiles/v${version}/
+svn mv https://dist.apache.org/repos/dist/dev/tiles/${version} https://dist.apache.org/repos/dist/release/tiles/
+
-------------------------------------------
** Update the site
@@ -321,7 +308,7 @@
requirement of the following specification versions:
* Java Servlet 2.5 and JavaServer Pages (JSP) 2.1
-* Java Standard Edition (Java SE) 1.6
+* Java Standard Edition (Java SE) 1.7
The release notes are available online at:
diff --git a/src/site/site.xml b/src/site/site.xml
index 2d5065b..9cd30e5 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -46,8 +46,8 @@
</bannerLeft>
<bannerRight>
<name>Apache Software Foundation</name>
- <src>http://www.apache.org/images/asf-logo.gif</src>
<href>http://www.apache.org</href>
+ <src>https://tiles.apache.org/images/logos/asf_logo_url.svg</src>
</bannerRight>
<body>
