forward-port of r1538333
plus lessons learnt from tiles-3.0.2 release
git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/trunk@1538391 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 4c968f9..c8b8f89 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -62,7 +62,7 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
- <version>1.0</version>
+ <version>2.5</version>
</extension>
</extensions>
</build>
diff --git a/src/site/apt/dev/release.apt b/src/site/apt/dev/release.apt
index d99e3be..6c8750c 100644
--- a/src/site/apt/dev/release.apt
+++ b/src/site/apt/dev/release.apt
@@ -29,11 +29,11 @@
To create a release you have to install:
- * {{{http://java.sun.com/javase/6}Java 6.0}}. If you are using a newer
- version of Java, it is suggested to <<change JAVA_HOME environment variable>>
- when calling Maven, so it points to an instance of Java 6.0;
+ * {{{http://www.oracle.com/technetwork/java/javase/overview/index.html}Java 7}}. If you are using a newer
+ version of Java <<change JAVA_HOME environment variable>>
+ when calling Maven, so it points to an instance of Java 7;
- * {{{http://maven.apache.org/}Maven 2.2 or 3}};
+ * {{{http://maven.apache.org/}Maven 3.0.5+}};
* {{{http://www.gnupg.org/}GnuPG}};
@@ -138,7 +138,7 @@
The plugin interactively will ask you the version to release, the Subversion
tag to use and the next snapshot version. It is recommended to use the tag:
<<tiles-X.X.X>>.
-
+
See also {{{http://www.apache.org/dev/publishing-maven-artifacts.html}the recommendations of the ASF}}.
* Perform the Release
@@ -148,8 +148,8 @@
-----------------------------------
mvn release:perform
-----------------------------------
-
- It should compile and test everything, build and upload the artifacts and the website for the project.
+
+ It should compile and test everything, build and upload the artifacts and the website for the project.
* Close the staging repository
@@ -175,8 +175,8 @@
* Verify the uploaded assemblies
* go to the destination directory on people.apache.org (cd /www/people.apache.org/builds/tiles/${version}).
-
- * check the presence of the 3 distributions (bin, doc and src), and their signature files (*.asc, *.md5, *sha1).
+
+ * check the presence of the 3 distributions (bin, doc and src), and their signature files (*.asc, *.md5, *sha1).
* Release the JIRA version
diff --git a/tiles-test-pom/tiles-test/pom.xml b/tiles-test-pom/tiles-test/pom.xml
index 1c0baa8..c9ed561 100644
--- a/tiles-test-pom/tiles-test/pom.xml
+++ b/tiles-test-pom/tiles-test/pom.xml
@@ -127,7 +127,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1-beta-1</version>
+ <version>2.4</version>
<configuration>
<webResources>
<resource>
