Author: mck
Date: Tue Nov 7 11:39:03 2017
New Revision: 1814487
URL: http://svn.apache.org/viewvc?rev=1814487&view=rev
Log:
svn merge -c1814481 ^/tiles/request/branches/TREQ_1_0_X
Modified:
tiles/request/trunk/ (props changed)
tiles/request/trunk/assembly/pom.xml
tiles/request/trunk/pom.xml
tiles/request/trunk/src/site/apt/dev/release.apt
tiles/request/trunk/tiles-request-api/pom.xml
tiles/request/trunk/tiles-request-api/src/test/java/org/apache/tiles/request/osgi/URLBundleApplicationResourceTest.java
tiles/request/trunk/tiles-request-freemarker/pom.xml
tiles/request/trunk/tiles-request-jsp/pom.xml
tiles/request/trunk/tiles-request-mustache/pom.xml
tiles/request/trunk/tiles-request-portlet/pom.xml
tiles/request/trunk/tiles-request-servlet/pom.xml
tiles/request/trunk/tiles-request-velocity/pom.xml
Propchange: tiles/request/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 7 11:39:03 2017
@@ -1 +1 @@
-/tiles/request/branches/TREQ_1_0_X:1489378,1538332,1583141-1583206,1591714,1598227,1598381,1598921,1602363-1625207,1799289,1807304,1807467,1810170-1810171,1810176
+/tiles/request/branches/TREQ_1_0_X:1489378,1538332,1583141-1583206,1591714,1598227,1598381,1598921,1602363-1625207,1799289,1807304,1807467,1810170-1810171,1810176,1814481
Modified: tiles/request/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/request/trunk/assembly/pom.xml?rev=1814487&r1=1814486&r2=1814487&view=diff
==============================================================================
--- tiles/request/trunk/assembly/pom.xml (original)
+++ tiles/request/trunk/assembly/pom.xml Tue Nov 7 11:39:03 2017
@@ -38,7 +38,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-4</version>
+ <version>3.1.0</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
@@ -61,12 +61,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>
@@ -88,9 +88,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>
@@ -124,7 +146,6 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-request-api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
@@ -148,7 +169,6 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-request-portlet</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
@@ -160,7 +180,6 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-request-servlet</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
Modified: tiles/request/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/request/trunk/pom.xml?rev=1814487&r1=1814486&r2=1814487&view=diff
==============================================================================
--- tiles/request/trunk/pom.xml (original)
+++ tiles/request/trunk/pom.xml Tue Nov 7 11:39:03 2017
@@ -135,6 +135,7 @@ under the License.
</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/request/trunk/src/site/apt/dev/release.apt
URL:
http://svn.apache.org/viewvc/tiles/request/trunk/src/site/apt/dev/release.apt?rev=1814487&r1=1814486&r2=1814487&view=diff
==============================================================================
--- tiles/request/trunk/src/site/apt/dev/release.apt (original)
+++ tiles/request/trunk/src/site/apt/dev/release.apt Tue Nov 7 11:39:03 2017
@@ -37,11 +37,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}};
@@ -109,7 +109,7 @@ mvn release:perform
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/request/${version}/
+cp checkout/assembly/target/assembly/* tiles-dist-dev/request/${version}/
svn add tiles-dist-dev/request/${version}
svn ci tiles-dist-dev/request/${version}
-----------------------------------
@@ -286,7 +286,7 @@ The 1.0.x series of the Apache Tiles Req
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/request/trunk/tiles-request-api/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/request/trunk/tiles-request-api/pom.xml?rev=1814487&r1=1814486&r2=1814487&view=diff
==============================================================================
--- tiles/request/trunk/tiles-request-api/pom.xml (original)
+++ tiles/request/trunk/tiles-request-api/pom.xml Tue Nov 7 11:39:03 2017
@@ -32,6 +32,11 @@ under the License.
<name>Tiles request - API</name>
<description>API for the Tiles Request framework.</description>
+ <properties>
+ <!-- decrease this whenever possible -->
+ <checkstyle.maxAllowedViolations>97</checkstyle.maxAllowedViolations>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
@@ -75,7 +80,7 @@ under the License.
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>5.6.4</version>
+ <version>5.6.8</version>
<scope>test</scope>
</dependency>
<dependency>
Modified:
tiles/request/trunk/tiles-request-api/src/test/java/org/apache/tiles/request/osgi/URLBundleApplicationResourceTest.java
URL:
http://svn.apache.org/viewvc/tiles/request/trunk/tiles-request-api/src/test/java/org/apache/tiles/request/osgi/URLBundleApplicationResourceTest.java?rev=1814487&r1=1814486&r2=1814487&view=diff
==============================================================================
---
tiles/request/trunk/tiles-request-api/src/test/java/org/apache/tiles/request/osgi/URLBundleApplicationResourceTest.java
(original)
+++
tiles/request/trunk/tiles-request-api/src/test/java/org/apache/tiles/request/osgi/URLBundleApplicationResourceTest.java
Tue Nov 7 11:39:03 2017
@@ -32,7 +32,6 @@ import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
-import static org.junit.Assert.fail;
import static org.ops4j.pax.exam.CoreOptions.bootDelegationPackage;
import static org.ops4j.pax.exam.CoreOptions.frameworkProperty;
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
Modified: tiles/request/trunk/tiles-request-freemarker/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/request/trunk/tiles-request-freemarker/pom.xml?rev=1814487&r1=1814486&r2=1814487&view=diff
==============================================================================
--- tiles/request/trunk/tiles-request-freemarker/pom.xml (original)
+++ tiles/request/trunk/tiles-request-freemarker/pom.xml Tue Nov 7 11:39:03
2017
@@ -31,6 +31,10 @@ under the License.
<version>1.1-SNAPSHOT</version>
<name>Tiles Request - Freemarker support</name>
<description>Freemarker implementation of the Tiles request
framework</description>
+ <properties>
+ <!-- decrease this whenever possible -->
+ <checkstyle.maxAllowedViolations>10</checkstyle.maxAllowedViolations>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.tiles</groupId>
Modified: tiles/request/trunk/tiles-request-jsp/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/request/trunk/tiles-request-jsp/pom.xml?rev=1814487&r1=1814486&r2=1814487&view=diff
==============================================================================
--- tiles/request/trunk/tiles-request-jsp/pom.xml (original)
+++ tiles/request/trunk/tiles-request-jsp/pom.xml Tue Nov 7 11:39:03 2017
@@ -31,6 +31,10 @@ under the License.
<version>1.1-SNAPSHOT</version>
<name>Tiles Request - JSP support</name>
<description>JSP implementation of the Tiles Request
framework.</description>
+ <properties>
+ <!-- decrease this whenever possible -->
+ <checkstyle.maxAllowedViolations>16</checkstyle.maxAllowedViolations>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.tiles</groupId>
Modified: tiles/request/trunk/tiles-request-mustache/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/request/trunk/tiles-request-mustache/pom.xml?rev=1814487&r1=1814486&r2=1814487&view=diff
==============================================================================
--- tiles/request/trunk/tiles-request-mustache/pom.xml (original)
+++ tiles/request/trunk/tiles-request-mustache/pom.xml Tue Nov 7 11:39:03 2017
@@ -30,6 +30,10 @@ under the License.
<artifactId>tiles-request-mustache</artifactId>
<name>Tiles request - Mustache support</name>
<description>Tiles request implementation for Mustache
templates.</description>
+ <properties>
+ <!-- decrease this whenever possible -->
+ <checkstyle.maxAllowedViolations>21</checkstyle.maxAllowedViolations>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.tiles</groupId>
Modified: tiles/request/trunk/tiles-request-portlet/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/request/trunk/tiles-request-portlet/pom.xml?rev=1814487&r1=1814486&r2=1814487&view=diff
==============================================================================
--- tiles/request/trunk/tiles-request-portlet/pom.xml (original)
+++ tiles/request/trunk/tiles-request-portlet/pom.xml Tue Nov 7 11:39:03 2017
@@ -39,6 +39,8 @@
<properties>
<tiles.osgi.symbolicName>org.apache.tiles.portlet</tiles.osgi.symbolicName>
+ <!-- decrease this whenever possible -->
+ <checkstyle.maxAllowedViolations>15</checkstyle.maxAllowedViolations>
</properties>
<build>
Modified: tiles/request/trunk/tiles-request-servlet/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/request/trunk/tiles-request-servlet/pom.xml?rev=1814487&r1=1814486&r2=1814487&view=diff
==============================================================================
--- tiles/request/trunk/tiles-request-servlet/pom.xml (original)
+++ tiles/request/trunk/tiles-request-servlet/pom.xml Tue Nov 7 11:39:03 2017
@@ -31,6 +31,10 @@ under the License.
<version>1.1-SNAPSHOT</version>
<name>Tiles request - Servlet support</name>
<description>Tiles request implementation for Servlet
technology.</description>
+ <properties>
+ <!-- decrease this whenever possible -->
+ <checkstyle.maxAllowedViolations>14</checkstyle.maxAllowedViolations>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.tiles</groupId>
Modified: tiles/request/trunk/tiles-request-velocity/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/request/trunk/tiles-request-velocity/pom.xml?rev=1814487&r1=1814486&r2=1814487&view=diff
==============================================================================
--- tiles/request/trunk/tiles-request-velocity/pom.xml (original)
+++ tiles/request/trunk/tiles-request-velocity/pom.xml Tue Nov 7 11:39:03 2017
@@ -31,6 +31,10 @@ under the License.
<version>1.1-SNAPSHOT</version>
<name>Tiles Request - Velocity support</name>
<description>Velocity implementation of the Tiles request
framework</description>
+ <properties>
+ <!-- decrease this whenever possible -->
+ <checkstyle.maxAllowedViolations>6</checkstyle.maxAllowedViolations>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.velocity</groupId>
