diff --git a/assembly/pom.xml b/assembly/pom.xml
index a9209ac1a..53ff030b9 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -58,13 +58,6 @@
-
-
- org.apache.maven.wagon
- wagon-ssh
- 2.5
-
-
@@ -74,12 +67,12 @@
org.apache.maven.plugins
maven-assembly-plugin
- 2.2-beta-4
+ 3.1.0
make-assembly
- attached
+ single
package
@@ -100,10 +93,32 @@
true
+
+ net.nicoulaj.maven.plugins
+ checksum-maven-plugin
+ 1.6
+
+
+
+ artifacts
+
+
+
+
+ true
+
+
+
+ org.apache.maven.plugins
+ maven-gpg-plugin
+
+ ${project.build.directory}/..
+
+
org.apache.maven.plugins
maven-antrun-plugin
- 1.3
+ 1.8
deploy
@@ -127,26 +142,6 @@
-
- org.codehaus.mojo
- wagon-maven-plugin
- 1.0-beta-4
-
-
- deploy
-
- upload
-
-
- ${project.build.directory}/assemblies
- **
- ${project.version}
- tiles.build
- scp://people.apache.org/www/people.apache.org/builds/tiles
-
-
-
-
@@ -158,19 +153,16 @@
org.apache.tiles
tiles-api
- ${project.version}
org.apache.tiles
tiles-core
- ${project.version}
org.apache.tiles
tiles-servlet
- ${project.version}
@@ -203,7 +195,6 @@
org.slf4j
slf4j-jdk14
- 1.7.6
runtime
diff --git a/pom.xml b/pom.xml
index 0a00de293..f023ddc35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -171,7 +171,7 @@
org.mvel
mvel2
- 2.0.11
+ 2.3.2.Final
javax.servlet
@@ -311,6 +311,7 @@
+ false
org.apache.${project.artifactId}
org.apache.tiles.*;version=${project.version}
*
diff --git a/src/site/apt/dev/release.apt b/src/site/apt/dev/release.apt
index fe4b4ce65..5c5341a0c 100644
--- a/src/site/apt/dev/release.apt
+++ b/src/site/apt/dev/release.apt
@@ -29,11 +29,11 @@ Prerequisites
To create a release you have to install:
- * {{{http://www.oracle.com/technetwork/java/javase/overview/index.html}Java 7}}. If you are using a newer
+ * {{{http://www.oracle.com/technetwork/java/javase/overview/index.html}Java 9}}. If you are using a newer
version of Java <>
- when calling Maven, so it points to an instance of Java 7;
+ when calling Maven, so it points to an instance of Java 9;
- * {{{http://maven.apache.org/}Maven 3.0.5+}};
+ * {{{http://maven.apache.org/}Maven 3.2.2+}};
* {{{http://www.gnupg.org/}GnuPG}};
@@ -135,7 +135,7 @@ mvn release:perform -Duser.name=YOUR_PEOPLE_APACHE_SSH_USER -Darguments="-Duser.
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}/
+cp checkout/assembly/target/assembly/* tiles-dist-dev/${version}/
svn add tiles-dist-dev/${version}
svn ci tiles-dist-dev/${version}
-----------------------------------
@@ -308,7 +308,7 @@ The 3.0.x series of the Apache Tiles framework has a minimum
requirement of the following specification versions:
* Java Servlet 2.5 and JavaServer Pages (JSP) 2.1
-* Java Standard Edition (Java SE) 1.7
+* Java Standard Edition (Java SE) 1.8
The release notes are available online at:
diff --git a/tiles-api/pom.xml b/tiles-api/pom.xml
index 59e3b520a..5d1749d45 100644
--- a/tiles-api/pom.xml
+++ b/tiles-api/pom.xml
@@ -38,6 +38,8 @@
org.apache.tiles.api
+
+ 5
diff --git a/tiles-core/pom.xml b/tiles-core/pom.xml
index eed5636cd..8c376b10b 100644
--- a/tiles-core/pom.xml
+++ b/tiles-core/pom.xml
@@ -38,6 +38,8 @@
org.apache.tiles.core
+
+ 25
diff --git a/tiles-extras/pom.xml b/tiles-extras/pom.xml
index 1b820c7c3..1d471d6d4 100644
--- a/tiles-extras/pom.xml
+++ b/tiles-extras/pom.xml
@@ -38,6 +38,8 @@
org.apache.tiles.extras
+
+ 21
diff --git a/tiles-mvel/pom.xml b/tiles-mvel/pom.xml
index edc227d5f..8169292f2 100644
--- a/tiles-mvel/pom.xml
+++ b/tiles-mvel/pom.xml
@@ -37,6 +37,8 @@
org.apache.tiles.mvel
+
+ 4
diff --git a/tiles-template/pom.xml b/tiles-template/pom.xml
index 742e693f9..016f59980 100644
--- a/tiles-template/pom.xml
+++ b/tiles-template/pom.xml
@@ -32,6 +32,10 @@
org.apache.tiles
3.1-SNAPSHOT
+
+
+ 2
+
diff --git a/tiles-test-pom/tiles-test-alt/pom.xml b/tiles-test-pom/tiles-test-alt/pom.xml
index 6e96d1a97..3c0275d4c 100644
--- a/tiles-test-pom/tiles-test-alt/pom.xml
+++ b/tiles-test-pom/tiles-test-alt/pom.xml
@@ -31,6 +31,10 @@
tiles-test-alt
Tiles - Test webapp alternate configuration
Alternate configuration for the test webapp.
+
+
+ 3
+
diff --git a/tiles-test-pom/tiles-test-common/pom.xml b/tiles-test-pom/tiles-test-common/pom.xml
index 1df96001b..94c4c67a4 100644
--- a/tiles-test-pom/tiles-test-common/pom.xml
+++ b/tiles-test-pom/tiles-test-common/pom.xml
@@ -33,6 +33,10 @@
3.1-SNAPSHOT
Tiles - Test webapp common classes
Common classes between modules of the test webapp.
+
+
+ 2
+
${project.groupId}
diff --git a/tiles-test-pom/tiles-test-db/pom.xml b/tiles-test-pom/tiles-test-db/pom.xml
index c49ccc0a6..7d7e0e9f2 100644
--- a/tiles-test-pom/tiles-test-db/pom.xml
+++ b/tiles-test-pom/tiles-test-db/pom.xml
@@ -31,6 +31,10 @@
tiles-test-db
Tiles - Test webapp database configuration
Tiles configuration that uses a database.
+
+
+ 2
+
org.apache.tiles
diff --git a/tiles-test-pom/tiles-test/pom.xml b/tiles-test-pom/tiles-test/pom.xml
index 8ce1ac889..437d5f759 100644
--- a/tiles-test-pom/tiles-test/pom.xml
+++ b/tiles-test-pom/tiles-test/pom.xml
@@ -35,6 +35,10 @@
Tiles - Apps - Test
Tiles Test web application: tests Tiles functionality.
+
+
+ 8
+
diff --git a/tiles-velocity/pom.xml b/tiles-velocity/pom.xml
index efc4be7ec..ad5a1e6ad 100644
--- a/tiles-velocity/pom.xml
+++ b/tiles-velocity/pom.xml
@@ -33,6 +33,10 @@
jar
Velocity Support in Tiles
Tiles - Velocity Support
+
+
+ 1
+