Author: musachy
Date: Fri Nov 14 09:25:00 2008
New Revision: 714077
URL: http://svn.apache.org/viewvc?rev=714077&view=rev
Log:
Remove profiles and move all their config into default build. Comment RAT out
Modified:
struts/struts2/branches/release_process/assembly/pom.xml
struts/struts2/branches/release_process/pom.xml
Modified: struts/struts2/branches/release_process/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/release_process/assembly/pom.xml?rev=714077&r1=714076&r2=714077&view=diff
==============================================================================
--- struts/struts2/branches/release_process/assembly/pom.xml (original)
+++ struts/struts2/branches/release_process/assembly/pom.xml Fri Nov 14
09:25:00 2008
@@ -142,6 +142,15 @@
<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>
Modified: struts/struts2/branches/release_process/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/release_process/pom.xml?rev=714077&r1=714076&r2=714077&view=diff
==============================================================================
--- struts/struts2/branches/release_process/pom.xml (original)
+++ struts/struts2/branches/release_process/pom.xml Fri Nov 14 09:25:00 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>
@@ -113,120 +91,6 @@
<module>../maven/struts-annotations</module>
</modules>
</profile>
- <profile>
- <id>j4</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>retrotranslator-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>translate-project</goal>
- </goals>
- <configuration>
- <verify>false</verify>
- <failonwarning>true</failonwarning>
- <lazy>true</lazy>
- <advanced>true</advanced>
- <verbose>false</verbose>
-
<destdir>${project.build.directory}/classes-retro</destdir>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </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>
- <name>release</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <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>
- </plugins>
- </build>
- </profile>
</profiles>
@@ -308,7 +172,97 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!--
+ <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>
+ <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>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>retrotranslator-maven-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>translate-project</goal>
+ </goals>
+ <configuration>
+ <verify>false</verify>
+ <failonwarning>true</failonwarning>
+ <lazy>true</lazy>
+ <advanced>true</advanced>
+ <verbose>false</verbose>
+
<destdir>${project.build.directory}/classes-retro</destdir>
+ </configuration>
+ </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.
@@ -383,6 +337,7 @@
<artifactId>maven-pmd-plugin</artifactId>
</plugin>
-->
+ <!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
@@ -392,8 +347,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>
