fix generation of digests and signatures in assembly subproject
git-svn-id: https://svn.apache.org/repos/asf/tiles/autotag/trunk@1814492 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/assembly/pom.xml b/assembly/pom.xml
index ac7fc84..7aceb6b 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -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>
diff --git a/pom.xml b/pom.xml
index d03cdbb..1e9437a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>tiles-master</artifactId>
<groupId>org.apache.tiles</groupId>
- <version>8-SNAPSHOT</version>
+ <version>7</version>
</parent>
<!-- temporary only while parent pom is snapshot -->
@@ -125,6 +125,11 @@
</plugin>
</plugins>
</build>
+
+ <properties>
+ <maven.javadoc.failOnError>false</maven.javadoc.failOnError> <!-- remove with master-8 -->
+ </properties>
+
<profiles>
<profile>
<id>apache-release</id>
diff --git a/src/site/apt/dev/release.apt b/src/site/apt/dev/release.apt
index 659f2c5..c781712 100644
--- a/src/site/apt/dev/release.apt
+++ b/src/site/apt/dev/release.apt
@@ -37,11 +37,11 @@
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}};
@@ -108,7 +108,7 @@
cd target/
svn co https://dist.apache.org/repos/dist/dev/tiles tiles-dist-dev
mkdir tiles-dist-dev/autotag/${version}
-cp checkout/assembly/target/assemblies/* tiles-dist-dev/autotag/${version}/
+cp checkout/assembly/target/assembly/* tiles-dist-dev/autotag/${version}/
svn add tiles-dist-dev/autotag/${version}
svn ci tiles-dist-dev/autotag/${version}
-----------------------------------
@@ -284,7 +284,7 @@
The 1.x series of the Apache Tiles Autotag framework has a minimum
requirement of the following specification versions:
-* Java Standard Edition (Java SE) 1.7
+* Java Standard Edition (Java SE) 1.8
The release notes are available online at:
