Author: musachy
Date: Tue Dec 23 13:52:06 2008
New Revision: 729136
URL: http://svn.apache.org/viewvc?rev=729136&view=rev
Log:
WW-2872 Merge release enhancement branch into trunk
Modified:
struts/struts2/trunk/assembly/pom.xml
struts/struts2/trunk/assembly/src/main/assembly/all.xml
struts/struts2/trunk/assembly/src/main/assembly/docs.xml
struts/struts2/trunk/pom.xml
Modified: struts/struts2/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?rev=729136&r1=729135&r2=729136&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/pom.xml (original)
+++ struts/struts2/trunk/assembly/pom.xml Tue Dec 23 13:52:06 2008
@@ -42,7 +42,43 @@
scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/assembly</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/assembly</url>
</scm>
-
+
+ <profiles>
+ <profile>
+ <id>j4</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-1</version>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/assembly/all.xml</descriptor>
+
<descriptor>src/main/assembly/lib.xml</descriptor>
+
<descriptor>src/main/assembly/lib-jdk14.xml</descriptor>
+
<descriptor>src/main/assembly/apps.xml</descriptor>
+
<descriptor>src/main/assembly/src.xml</descriptor>
+
<descriptor>src/main/assembly/docs.xml</descriptor>
+ </descriptors>
+ <finalName>struts-${version}</finalName>
+
<outputDirectory>target/assembly/out</outputDirectory>
+ <workDirectory>target/assembly/work</workDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<build>
<plugins>
<plugin>
@@ -142,11 +178,19 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-1</version>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<descriptors>
<descriptor>src/main/assembly/all.xml</descriptor>
<descriptor>src/main/assembly/lib.xml</descriptor>
-
<descriptor>src/main/assembly/lib-jdk14.xml</descriptor>
<descriptor>src/main/assembly/apps.xml</descriptor>
<descriptor>src/main/assembly/src.xml</descriptor>
<descriptor>src/main/assembly/docs.xml</descriptor>
Modified: struts/struts2/trunk/assembly/src/main/assembly/all.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/all.xml?rev=729136&r1=729135&r2=729136&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/all.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/all.xml Tue Dec 23 13:52:06
2008
@@ -160,7 +160,7 @@
<outputDirectory>docs/struts2-plugins/struts2-jsf-plugin</outputDirectory>
</fileSet>
<fileSet>
- <directory>../plugins/jsf/target/site</directory>
+ <directory>../plugins/junit/target/site</directory>
<outputDirectory>docs/struts2-plugins/struts2-junit-plugin</outputDirectory>
</fileSet>
<fileSet>
@@ -196,7 +196,7 @@
<outputDirectory>docs/struts2-plugins/struts2-sitemesh-plugin</outputDirectory>
</fileSet>
<fileSet>
- <directory>../plugins/tiles/target/site</directory>
+ <directory>../plugins/testng/target/site</directory>
<outputDirectory>docs/struts2-plugins/struts2-testng-plugin</outputDirectory>
</fileSet>
<fileSet>
Modified: struts/struts2/trunk/assembly/src/main/assembly/docs.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/docs.xml?rev=729136&r1=729135&r2=729136&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/docs.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/docs.xml Tue Dec 23
13:52:06 2008
@@ -84,7 +84,7 @@
<outputDirectory>docs/struts2-plugins/struts2-jsf-plugin</outputDirectory>
</fileSet>
<fileSet>
- <directory>../plugins/jsf/target/site</directory>
+ <directory>../plugins/junit/target/site</directory>
<outputDirectory>docs/struts2-plugins/struts2-junit-plugin</outputDirectory>
</fileSet>
<fileSet>
@@ -120,7 +120,7 @@
<outputDirectory>docs/struts2-plugins/struts2-sitemesh-plugin</outputDirectory>
</fileSet>
<fileSet>
- <directory>../plugins/tiles/target/site</directory>
+ <directory>../plugins/testng/target/site</directory>
<outputDirectory>docs/struts2-plugins/struts2-testng-plugin</outputDirectory>
</fileSet>
<fileSet>
Modified: struts/struts2/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=729136&r1=729135&r2=729136&view=diff
==============================================================================
--- struts/struts2/trunk/pom.xml (original)
+++ struts/struts2/trunk/pom.xml Tue Dec 23 13:52:06 2008
@@ -59,7 +59,9 @@
<modules>
<module>core</module>
- <!--<module>assembly</module>-->
+ <module>apps</module>
+ <module>plugins</module>
+ <module>assembly</module>
</modules>
<licenses>
@@ -78,30 +80,6 @@
<profiles>
<profile>
- <id>apps</id>
- <activation>
- <property>
- <name>apps</name>
- </property>
- </activation>
- <modules>
- <module>apps</module>
- </modules>
- </profile>
- <profile>
- <id>plugins</id>
- <modules>
- <module>plugins</module>
- </modules>
- </profile>
- <profile>
- <id>all</id>
- <modules>
- <module>plugins</module>
- <module>apps</module>
- </modules>
- </profile>
- <profile>
<id>xwork</id>
<modules>
<module>../xwork</module>
@@ -142,42 +120,6 @@
</build>
</profile>
<profile>
- <id>alljars</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
- <!--
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- -->
- <executions>
- <execution>
- <id>attach-source</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-source</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>release</id>
<activation>
<property>
@@ -200,27 +142,19 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-2</version>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.2</version>
+ <!--
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ -->
<executions>
<execution>
- <phase>verify</phase>
+ <id>attach-source</id>
<goals>
- <goal>check</goal>
+ <goal>jar</goal>
</goals>
- <configuration>
-
<addDefaultLicenseMatchers>false</addDefaultLicenseMatchers>
- <licenseMatchers>
- <classNames>
-
<className>rat.analysis.license.ApacheSoftwareLicense20</className>
- </classNames>
- </licenseMatchers>
- <includes>
- <include>pom.xml</include>
- <include>src/**</include>
- </includes>
- </configuration>
</execution>
</executions>
</plugin>
@@ -280,10 +214,12 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <useReleaseProfile>false</useReleaseProfile>
- </configuration>
+ <artifactId>maven-release-plugin</artifactId>
+ <!--
+ <configuration>
+ <preparationGoals>clean verify
install</preparationGoals>
+ </configuration>
+ -->
</plugin>
</plugins>
</pluginManagement>
@@ -309,23 +245,49 @@
</execution>
</executions>
</plugin>
+ <!--
<plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <version>1.0-alpha-2</version>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+
<addDefaultLicenseMatchers>false</addDefaultLicenseMatchers>
+ <licenseMatchers>
+ <classNames>
+
<className>rat.analysis.license.ApacheSoftwareLicense20</className>
+ </classNames>
+ </licenseMatchers>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/**</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-source</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<!-- Commenting out the license plugin, until it works like we
want.
To use the "license:format" goal, remove the "core" module before
running,
otherwise it will ignore the file exclusions.
-
+
<plugin>
<groupId>com.google.code.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
@@ -396,6 +358,7 @@
<artifactId>maven-pmd-plugin</artifactId>
</plugin>
-->
+ <!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
@@ -405,8 +368,12 @@
<include>pom.xml</include>
<include>src/**</include>
</includes>
+ <excludes>
+
<exclude>assembly/src/main/resources/backport/RETROTRANSLATOR-LICENSE.txt</exclude>
+ </excludes>
</configuration>
</plugin>
+ -->
</plugins>
</reporting>
