Author: gmazza
Date: Sat Aug 3 00:25:43 2013
New Revision: 1509918
URL: http://svn.apache.org/r1509918
Log:
Removed no longer needed sign-release.sh (it's in the assembly-release pom
already) and simplified the assembly release configuration
Removed:
roller/trunk/sign-release.sh
Modified:
roller/trunk/assembly-release/pom.xml
roller/trunk/assembly-release/src/main/assembly/source.xml
roller/trunk/assembly-release/src/main/assembly/standard.xml
Modified: roller/trunk/assembly-release/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/assembly-release/pom.xml?rev=1509918&r1=1509917&r2=1509918&view=diff
==============================================================================
--- roller/trunk/assembly-release/pom.xml (original)
+++ roller/trunk/assembly-release/pom.xml Sat Aug 3 00:25:43 2013
@@ -33,15 +33,17 @@
<description>Assembles Roller into a distribution package</description>
<build>
-
<plugins>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
-
- <!-- See profiles below for configuration -->
-
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/standard.xml</descriptor>
+ <descriptor>src/main/assembly/source.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
<executions>
<execution>
<id>make-assembly</id>
@@ -51,36 +53,12 @@
</goals>
</execution>
</executions>
-
</plugin>
-
</plugins>
</build>
<profiles>
-
- <profile>
- <id>standard-assembly</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
-
<descriptor>src/main/assembly/standard.xml</descriptor>
-
<descriptor>src/main/assembly/source.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
+ <!-- sign via "mvn clean install -Prelease-sign-artifacts" -->
<profile>
<id>release-sign-artifacts</id>
<activation>
@@ -94,7 +72,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.0-alpha-4</version>
+ <version>1.4</version>
<executions>
<execution>
<id>sign-artifacts</id>
Modified: roller/trunk/assembly-release/src/main/assembly/source.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/assembly-release/src/main/assembly/source.xml?rev=1509918&r1=1509917&r2=1509918&view=diff
==============================================================================
--- roller/trunk/assembly-release/src/main/assembly/source.xml (original)
+++ roller/trunk/assembly-release/src/main/assembly/source.xml Sat Aug 3
00:25:43 2013
@@ -33,9 +33,7 @@
<include>**</include>
</includes>
<excludes>
- <exclude>tomcat/**</exclude>
- <exclude>dist/**</exclude>
- <exclude>site/**</exclude>
+ <exclude>it-selenium/**</exclude>
<exclude>**/target/**</exclude>
<exclude>**/samples/create.sql</exclude>
<exclude>**/samples/drop.sql</exclude>
Modified: roller/trunk/assembly-release/src/main/assembly/standard.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/assembly-release/src/main/assembly/standard.xml?rev=1509918&r1=1509917&r2=1509918&view=diff
==============================================================================
--- roller/trunk/assembly-release/src/main/assembly/standard.xml (original)
+++ roller/trunk/assembly-release/src/main/assembly/standard.xml Sat Aug 3
00:25:43 2013
@@ -29,6 +29,8 @@
<files>
<file>
<source>../assembly-war/target/roller-war-${artifact.version}-standard.war</source>
+ <!-- To grab directly from the app submodule: -->
+ <!--source>../app/target/roller.war</source-->
<outputDirectory>${artifact.artifactId}-${artifact.version}-standard/webapp</outputDirectory>
</file>
<file>
