Author: mck
Date: Tue Nov 7 11:32:17 2017
New Revision: 1814486
URL: http://svn.apache.org/viewvc?rev=1814486&view=rev
Log:
svn merge -c1814484 ^/tiles/framework/branches/TILES_3_0_X
Modified:
tiles/framework/trunk/ (props changed)
tiles/framework/trunk/assembly/pom.xml
tiles/framework/trunk/pom.xml
tiles/framework/trunk/src/site/apt/dev/release.apt
tiles/framework/trunk/tiles-api/pom.xml
tiles/framework/trunk/tiles-core/pom.xml
tiles/framework/trunk/tiles-extras/pom.xml
tiles/framework/trunk/tiles-mvel/pom.xml
tiles/framework/trunk/tiles-template/pom.xml
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/pom.xml
tiles/framework/trunk/tiles-test-pom/tiles-test-common/pom.xml
tiles/framework/trunk/tiles-test-pom/tiles-test-db/pom.xml
tiles/framework/trunk/tiles-test-pom/tiles-test/pom.xml
tiles/framework/trunk/tiles-velocity/pom.xml
Propchange: tiles/framework/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 7 11:32:17 2017
@@ -1,2 +1,3 @@
-/tiles/framework/branches/TILES_3_0_X:1486577,1538333,1539385,1539481-1541580,1543135,1571643,1594481-1626663,1706314,1752405,1810179,1810188
+/tiles/framework/branches/TILES_3_0_X:1486577,1538333,1539385,1539481-1541580,1543135,1571643,1594481-1626663,1706314,1752405,1810179,1810188,1814482,1814484
+/tiles/framework/tags/tiles-parent-3.0.8:1814482
/tiles/framework/trunk:829356,836356,880940,880948,887758,900938-902966,904552,921998,931637,949559,950449,982366-982367,989864-990230,996297,1042419,1061995,1080544,1080580-1081105
Modified: tiles/framework/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/pom.xml?rev=1814486&r1=1814485&r2=1814486&view=diff
==============================================================================
--- tiles/framework/trunk/assembly/pom.xml (original)
+++ tiles/framework/trunk/assembly/pom.xml Tue Nov 7 11:32:17 2017
@@ -58,13 +58,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>
@@ -74,12 +67,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-4</version>
+ <version>3.1.0</version>
<executions>
<execution>
<id>make-assembly</id>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
<phase>package</phase>
</execution>
@@ -101,9 +94,31 @@
</configuration>
</plugin>
<plugin>
+ <groupId>net.nicoulaj.maven.plugins</groupId>
+ <artifactId>checksum-maven-plugin</artifactId>
+ <version>1.6</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>artifacts</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <attachChecksums>true</attachChecksums>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <configuration>
+ <ascDirectory>${project.build.directory}/..</ascDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
+ <version>1.8</version>
<executions>
<execution>
<phase>deploy</phase>
@@ -127,26 +142,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</url>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</profile>
@@ -158,19 +153,16 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-servlet</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
@@ -203,7 +195,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <version>1.7.6</version>
<scope>runtime</scope>
</dependency>
Modified: tiles/framework/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/pom.xml?rev=1814486&r1=1814485&r2=1814486&view=diff
==============================================================================
--- tiles/framework/trunk/pom.xml (original)
+++ tiles/framework/trunk/pom.xml Tue Nov 7 11:32:17 2017
@@ -171,7 +171,7 @@
<dependency>
<groupId>org.mvel</groupId>
<artifactId>mvel2</artifactId>
- <version>2.0.11</version>
+ <version>2.3.2.Final</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -311,6 +311,7 @@
</build>
<properties>
+ <maven.javadoc.failOnError>false</maven.javadoc.failOnError> <!--
remove with master-8 -->
<tiles.osgi.symbolicName>org.apache.${project.artifactId}</tiles.osgi.symbolicName>
<tiles.osgi.export>org.apache.tiles.*;version=${project.version}</tiles.osgi.export>
<tiles.osgi.import>*</tiles.osgi.import>
Modified: tiles/framework/trunk/src/site/apt/dev/release.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/dev/release.apt?rev=1814486&r1=1814485&r2=1814486&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/apt/dev/release.apt (original)
+++ tiles/framework/trunk/src/site/apt/dev/release.apt Tue Nov 7 11:32:17 2017
@@ -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 <<change JAVA_HOME environment variable>>
- 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_PEO
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 fra
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:
Modified: tiles/framework/trunk/tiles-api/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/pom.xml?rev=1814486&r1=1814485&r2=1814486&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-api/pom.xml (original)
+++ tiles/framework/trunk/tiles-api/pom.xml Tue Nov 7 11:32:17 2017
@@ -38,6 +38,8 @@
<properties>
<tiles.osgi.symbolicName>org.apache.tiles.api</tiles.osgi.symbolicName>
+ <!-- decrease this whenever possible -->
+ <checkstyle.maxAllowedViolations>5</checkstyle.maxAllowedViolations>
</properties>
<build>
Modified: tiles/framework/trunk/tiles-core/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/pom.xml?rev=1814486&r1=1814485&r2=1814486&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/pom.xml (original)
+++ tiles/framework/trunk/tiles-core/pom.xml Tue Nov 7 11:32:17 2017
@@ -38,6 +38,8 @@
<properties>
<tiles.osgi.symbolicName>org.apache.tiles.core</tiles.osgi.symbolicName>
+ <!-- decrease this whenever possible -->
+ <checkstyle.maxAllowedViolations>25</checkstyle.maxAllowedViolations>
</properties>
<build>
Modified: tiles/framework/trunk/tiles-extras/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-extras/pom.xml?rev=1814486&r1=1814485&r2=1814486&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-extras/pom.xml (original)
+++ tiles/framework/trunk/tiles-extras/pom.xml Tue Nov 7 11:32:17 2017
@@ -38,6 +38,8 @@
<properties>
<tiles.osgi.symbolicName>org.apache.tiles.extras</tiles.osgi.symbolicName>
+ <!-- decrease this whenever possible -->
+ <checkstyle.maxAllowedViolations>21</checkstyle.maxAllowedViolations>
</properties>
<build>
Modified: tiles/framework/trunk/tiles-mvel/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-mvel/pom.xml?rev=1814486&r1=1814485&r2=1814486&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-mvel/pom.xml (original)
+++ tiles/framework/trunk/tiles-mvel/pom.xml Tue Nov 7 11:32:17 2017
@@ -37,6 +37,8 @@
<properties>
<tiles.osgi.symbolicName>org.apache.tiles.mvel</tiles.osgi.symbolicName>
+ <!-- decrease this whenever possible -->
+ <checkstyle.maxAllowedViolations>4</checkstyle.maxAllowedViolations>
</properties>
<build>
Modified: tiles/framework/trunk/tiles-template/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/pom.xml?rev=1814486&r1=1814485&r2=1814486&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-template/pom.xml (original)
+++ tiles/framework/trunk/tiles-template/pom.xml Tue Nov 7 11:32:17 2017
@@ -32,6 +32,10 @@
<groupId>org.apache.tiles</groupId>
<version>3.1-SNAPSHOT</version>
</parent>
+ <properties>
+ <!-- decrease this whenever possible -->
+ <checkstyle.maxAllowedViolations>2</checkstyle.maxAllowedViolations>
+ </properties>
<build>
<plugins>
<plugin>
Modified: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test-alt/pom.xml?rev=1814486&r1=1814485&r2=1814486&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test-pom/tiles-test-alt/pom.xml (original)
+++ tiles/framework/trunk/tiles-test-pom/tiles-test-alt/pom.xml Tue Nov 7
11:32:17 2017
@@ -31,6 +31,10 @@
<artifactId>tiles-test-alt</artifactId>
<name>Tiles - Test webapp alternate configuration</name>
<description>Alternate configuration for the test webapp.</description>
+ <properties>
+ <!-- decrease this whenever possible -->
+ <checkstyle.maxAllowedViolations>3</checkstyle.maxAllowedViolations>
+ </properties>
<build>
<plugins>
Modified: tiles/framework/trunk/tiles-test-pom/tiles-test-common/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test-common/pom.xml?rev=1814486&r1=1814485&r2=1814486&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test-pom/tiles-test-common/pom.xml (original)
+++ tiles/framework/trunk/tiles-test-pom/tiles-test-common/pom.xml Tue Nov 7
11:32:17 2017
@@ -33,6 +33,10 @@
<version>3.1-SNAPSHOT</version>
<name>Tiles - Test webapp common classes</name>
<description>Common classes between modules of the test webapp.</description>
+ <properties>
+ <!-- decrease this whenever possible -->
+ <checkstyle.maxAllowedViolations>2</checkstyle.maxAllowedViolations>
+ </properties>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: tiles/framework/trunk/tiles-test-pom/tiles-test-db/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test-db/pom.xml?rev=1814486&r1=1814485&r2=1814486&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test-pom/tiles-test-db/pom.xml (original)
+++ tiles/framework/trunk/tiles-test-pom/tiles-test-db/pom.xml Tue Nov 7
11:32:17 2017
@@ -31,6 +31,10 @@
<artifactId>tiles-test-db</artifactId>
<name>Tiles - Test webapp database configuration</name>
<description>Tiles configuration that uses a database.</description>
+ <properties>
+ <!-- decrease this whenever possible -->
+ <checkstyle.maxAllowedViolations>2</checkstyle.maxAllowedViolations>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.tiles</groupId>
Modified: tiles/framework/trunk/tiles-test-pom/tiles-test/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test/pom.xml?rev=1814486&r1=1814485&r2=1814486&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test-pom/tiles-test/pom.xml (original)
+++ tiles/framework/trunk/tiles-test-pom/tiles-test/pom.xml Tue Nov 7 11:32:17
2017
@@ -35,6 +35,10 @@
<name>Tiles - Apps - Test</name>
<description>Tiles Test web application: tests Tiles functionality.
</description>
+ <properties>
+ <!-- decrease this whenever possible -->
+ <checkstyle.maxAllowedViolations>8</checkstyle.maxAllowedViolations>
+ </properties>
<dependencies>
<dependency>
Modified: tiles/framework/trunk/tiles-velocity/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/pom.xml?rev=1814486&r1=1814485&r2=1814486&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/pom.xml (original)
+++ tiles/framework/trunk/tiles-velocity/pom.xml Tue Nov 7 11:32:17 2017
@@ -33,6 +33,10 @@
<packaging>jar</packaging>
<description>Velocity Support in Tiles</description>
<name>Tiles - Velocity Support</name>
+ <properties>
+ <!-- decrease this whenever possible -->
+ <checkstyle.maxAllowedViolations>1</checkstyle.maxAllowedViolations>
+ </properties>
<build>
<plugins>
<plugin>
