Author: mck
Date: Tue Nov 7 11:22:47 2017
New Revision: 1814484
URL: http://svn.apache.org/viewvc?rev=1814484&view=rev
Log:
svn merge -c1814482 ^/tiles/framework/tags/tiles-parent-3.0.8
Modified:
tiles/framework/branches/TILES_3_0_X/ (props changed)
tiles/framework/branches/TILES_3_0_X/assembly/pom.xml
tiles/framework/branches/TILES_3_0_X/src/site/apt/dev/release.apt
Propchange: tiles/framework/branches/TILES_3_0_X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 7 11:22:47 2017
@@ -1,2 +1,3 @@
/tiles/framework/branches/TILES_3_0_X:1484307
+/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,1427572,1427704
Modified: tiles/framework/branches/TILES_3_0_X/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X/assembly/pom.xml?rev=1814484&r1=1814483&r2=1814484&view=diff
==============================================================================
--- tiles/framework/branches/TILES_3_0_X/assembly/pom.xml (original)
+++ tiles/framework/branches/TILES_3_0_X/assembly/pom.xml Tue Nov 7 11:22:47
2017
@@ -74,12 +74,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,6 +101,28 @@
</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>
Modified: tiles/framework/branches/TILES_3_0_X/src/site/apt/dev/release.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_3_0_X/src/site/apt/dev/release.apt?rev=1814484&r1=1814483&r2=1814484&view=diff
==============================================================================
--- tiles/framework/branches/TILES_3_0_X/src/site/apt/dev/release.apt (original)
+++ tiles/framework/branches/TILES_3_0_X/src/site/apt/dev/release.apt Tue Nov
7 11:22:47 2017
@@ -108,7 +108,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}
-----------------------------------
