You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by rg...@apache.org on 2008/11/15 18:05:41 UTC
svn commit: r717880 - in /struts/struts2/branches/STRUTS_2_0_X: ./ assembly/
assembly/src/main/assembly/ assembly/src/main/resources/backport/ core/
Author: rgielen
Date: Sat Nov 15 09:05:40 2008
New Revision: 717880
URL: http://svn.apache.org/viewvc?rev=717880&view=rev
Log:
WW-2872:
Release Process Enhancements
Added:
struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/assembly/docs.xml
struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/assembly/lib-jdk14.xml
struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/resources/backport/
struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/resources/backport/NOTICE.txt
struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/resources/backport/RETROTRANSLATOR-LICENSE.txt
Modified:
struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml
struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/assembly/all.xml
struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/assembly/lib.xml
struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/assembly/src.xml
struts/struts2/branches/STRUTS_2_0_X/core/pom.xml
struts/struts2/branches/STRUTS_2_0_X/pom.xml
Modified: struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml?rev=717880&r1=717879&r2=717880&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml Sat Nov 15 09:05:40 2008
@@ -135,13 +135,24 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.0.1</version>
+ <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>
Modified: struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/assembly/all.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/assembly/all.xml?rev=717880&r1=717879&r2=717880&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/assembly/all.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/assembly/all.xml Sat Nov 15 09:05:40 2008
@@ -27,6 +27,12 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<scope>runtime</scope>
+ <excludes>
+ <exclude>net.sf.retrotranslator:retrotranslator-runtime</exclude>
+ <exclude>backport-util-concurrent:backport-util-concurrent</exclude>
+ <exclude>junit:junit</exclude>
+ <exclude>*:jdk14</exclude>
+ </excludes>
</dependencySet>
</dependencySets>
<fileSets>
@@ -81,6 +87,10 @@
</fileSet>
-->
<fileSet>
+ <directory>../plugins/codebehind/target/site</directory>
+ <outputDirectory>docs/struts2-plugins/struts2-codebehind-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
<directory>../plugins/config-browser/target/site</directory>
<outputDirectory>docs/struts2-plugins/struts2-config-browser-plugin</outputDirectory>
</fileSet>
@@ -113,6 +123,10 @@
<outputDirectory>docs/struts2-plugins/struts2-sitegraph-plugin</outputDirectory>
</fileSet>
<fileSet>
+ <directory>../plugins/spring/target/site</directory>
+ <outputDirectory>docs/struts2-plugins/struts2-spring-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
<directory>../plugins/sitemesh/target/site</directory>
<outputDirectory>docs/struts2-plugins/struts2-sitemesh-plugin</outputDirectory>
</fileSet>
@@ -186,5 +200,13 @@
<include>src/</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>../plugins</directory>
+ <outputDirectory>src/plugins</outputDirectory>
+ <excludes>
+ <exclude>*/target/**</exclude>
+ <exclude>target/**</exclude>
+ </excludes>
+ </fileSet>
</fileSets>
</assembly>
Added: struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/assembly/docs.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/assembly/docs.xml?rev=717880&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/assembly/docs.xml (added)
+++ struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/assembly/docs.xml Sat Nov 15 09:05:40 2008
@@ -0,0 +1,116 @@
+<!--
+/*
+ * $Id: docs.xml 651587 2008-04-25 12:15:09Z hermanns $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
+
+<assembly>
+ <id>docs</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+
+ <!-- Include the XWork Javadoc in the assembly -->
+ <fileSet>
+ <directory>target/xwork-apidocs</directory>
+ <outputDirectory>docs/xwork-apidocs</outputDirectory>
+ </fileSet>
+
+ <!-- Include the website in the assembly -->
+ <fileSet>
+ <directory>../target/site</directory>
+ <outputDirectory>docs</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../api/target/site</directory>
+ <outputDirectory>docs/struts2-api</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../core/target/site</directory>
+ <outputDirectory>docs/struts2-core</outputDirectory>
+ </fileSet>
+
+ <!-- Include the Confluence docs in the assembly -->
+ <fileSet>
+ <directory>target/cwiki</directory>
+ <outputDirectory>docs</outputDirectory>
+ </fileSet>
+
+ <!-- Plugins -->
+ <fileSet>
+ <directory>../plugins/codebehind/target/site</directory>
+ <outputDirectory>docs/struts2-plugins/struts2-codebehind-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/config-browser/target/site</directory>
+ <outputDirectory>docs/struts2-plugins/struts2-config-browser-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/jasperreports/target/site</directory>
+ <outputDirectory>docs/struts2-plugins/struts2-jasperreports-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/jfreechart/target/site</directory>
+ <outputDirectory>docs/struts2-plugins/struts2-jfreechart-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/jsf/target/site</directory>
+ <outputDirectory>docs/struts2-plugins/struts2-jsf-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/jsf/target/site</directory>
+ <outputDirectory>docs/struts2-plugins/struts2-junit-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/pell-multipart/target/site</directory>
+ <outputDirectory>docs/struts2-plugins/struts2-pell-multipart-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/plexus/target/site</directory>
+ <outputDirectory>docs/struts2-plugins/struts2-plexus-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/sitegraph/target/site</directory>
+ <outputDirectory>docs/struts2-plugins/struts2-sitegraph-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/sitemesh/target/site</directory>
+ <outputDirectory>docs/struts2-plugins/struts2-sitemesh-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/spring/target/site</directory>
+ <outputDirectory>docs/struts2-plugins/struts2-spring-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/struts1/target/site</directory>
+ <outputDirectory>docs/struts2-plugins/struts2-struts1-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/tiles/target/site</directory>
+ <outputDirectory>docs/struts2-plugins/struts2-testng-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/tiles/target/site</directory>
+ <outputDirectory>docs/struts2-plugins/struts2-tiles-plugin</outputDirectory>
+ </fileSet>
+
+ </fileSets>
+</assembly>
Added: struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/assembly/lib-jdk14.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/assembly/lib-jdk14.xml?rev=717880&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/assembly/lib-jdk14.xml (added)
+++ struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/assembly/lib-jdk14.xml Sat Nov 15 09:05:40 2008
@@ -0,0 +1,58 @@
+<!--
+/*
+ * $Id: lib-jdk14.xml 615299 2008-01-25 18:26:44Z apetrelli $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
+
+<assembly>
+ <id>lib-jdk14</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <dependencySets>
+ <dependencySet useTransitiveFiltering="true">
+ <outputDirectory>jdk14</outputDirectory>
+ <outputFileNameMapping>${artifactId}-${version}.${extension}</outputFileNameMapping>
+ <includes>
+ <include>net.sf.retrotranslator:retrotranslator-runtime</include>
+ <include>backport-util-concurrent:backport-util-concurrent</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
+ <outputDirectory>jdk14</outputDirectory>
+ <outputFileNameMapping>${artifactId}-${version}-jdk14.${extension}</outputFileNameMapping>
+ <includes>
+ <include>org.apache.struts:*:jar:jdk14</include>
+ <include>com.opensymphony:xwork:jar:jdk14</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/resources/backport</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>*LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Modified: struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/assembly/lib.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/assembly/lib.xml?rev=717880&r1=717879&r2=717880&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/assembly/lib.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/assembly/lib.xml Sat Nov 15 09:05:40 2008
@@ -27,6 +27,12 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<scope>runtime</scope>
+ <excludes>
+ <exclude>net.sf.retrotranslator:retrotranslator-runtime</exclude>
+ <exclude>backport-util-concurrent:backport-util-concurrent</exclude>
+ <exclude>junit:junit</exclude>
+ <exclude>*:jdk14</exclude>
+ </excludes>
</dependencySet>
</dependencySets>
<fileSets>
Modified: struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/assembly/src.xml?rev=717880&r1=717879&r2=717880&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/assembly/src.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/assembly/src.xml Sat Nov 15 09:05:40 2008
@@ -47,7 +47,6 @@
<include>README*</include>
<include>LICENSE*</include>
<include>NOTICE*</include>
- <include>build.xml</include>
</includes>
</fileSet>
Added: struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/resources/backport/NOTICE.txt
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/resources/backport/NOTICE.txt?rev=717880&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/resources/backport/NOTICE.txt (added)
+++ struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/resources/backport/NOTICE.txt Sat Nov 15 09:05:40 2008
@@ -0,0 +1,7 @@
+Apache Struts
+Copyright 2000-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+Retrotranslator (http://retrotranslator.sourceforge.net/).
+
Added: struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/resources/backport/RETROTRANSLATOR-LICENSE.txt
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/resources/backport/RETROTRANSLATOR-LICENSE.txt?rev=717880&view=auto
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/resources/backport/RETROTRANSLATOR-LICENSE.txt (added)
+++ struts/struts2/branches/STRUTS_2_0_X/assembly/src/main/resources/backport/RETROTRANSLATOR-LICENSE.txt Sat Nov 15 09:05:40 2008
@@ -0,0 +1,29 @@
+ Retrotranslator: a Java bytecode transformer that translates Java classes
+ compiled with JDK 5.0 into classes that can be run on JVM 1.4.
+
+ Copyright (c) 2005, 2006 Taras Puchko
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGE.
Modified: struts/struts2/branches/STRUTS_2_0_X/core/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/pom.xml?rev=717880&r1=717879&r2=717880&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/pom.xml Sat Nov 15 09:05:40 2008
@@ -153,70 +153,6 @@
<profiles>
<profile>
- <!--
- Run the translator for Java 1.4 compatiblity
-
- Samples:
- $ cd struts/struts2/
- $ mvn clean install -Papps,j4 -Djava14.jar=$JAVA_HOME/../Classes/classes.jar
- $ mvn clean install -Papps,j4 -Djava14.jar="$JAVA_HOME/jre/lib/rt.jar"
-
- -->
- <id>j4</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>retrotranslator-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>retrotranslate</id>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>create-j4-jar</id>
- <goals><goal>jar</goal></goals>
- <configuration>
- <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
- <classifier>j4</classifier>
- <archive>
- <manifestEntries>
- <Extension-Name>${project.artifactId}-j4</Extension-Name>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Title>${project.description}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Revision>${scm.revision}</Revision>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>rt</artifactId>
- <version>1.4.0</version>
- <scope>system</scope>
- <!-- path to rt.jar (on OSX, it's classes.jar) -->
- <systemPath>${java14.jar}</systemPath>
- </dependency>
- <dependency>
- <groupId>net.sf.retrotranslator</groupId>
- <artifactId>retrotranslator-runtime</artifactId>
- <version>1.0.8</version>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
<id>alljars</id>
<build>
<plugins>
@@ -503,7 +439,7 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts-annotations</artifactId>
- <version>1.0.2</version>
+ <scope>compile</scope>
<optional>true</optional>
</dependency>
Modified: struts/struts2/branches/STRUTS_2_0_X/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/pom.xml?rev=717880&r1=717879&r2=717880&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/pom.xml Sat Nov 15 09:05:40 2008
@@ -59,8 +59,9 @@
<modules>
<module>core</module>
- <!--<module>assembly</module>-->
- <!-- <module>api</module> -->
+ <module>apps</module>
+ <module>plugins</module>
+ <module>assembly</module>
</modules>
<licenses>
@@ -79,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>
@@ -114,77 +91,6 @@
<module>../maven/struts-annotations</module>
</modules>
</profile>
- <profile>
- <id>1.4-backport</id>
- <activation>
- <jdk>1.4</jdk>
- </activation>
- <dependencies>
- <!-- should have the org.w3c.dom dependency here -->
- </dependencies>
- </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>
- </plugins>
- </build>
- </profile>
</profiles>
@@ -233,48 +139,161 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <useReleaseProfile>false</useReleaseProfile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </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>retrotranslator-maven-plugin</artifactId>
+ <artifactId>rat-maven-plugin</artifactId>
<version>1.0-alpha-2</version>
<executions>
<execution>
- <phase>process-classes</phase>
+ <phase>verify</phase>
<goals>
- <goal>translate</goal>
+ <goal>check</goal>
</goals>
<configuration>
+ <addDefaultLicenseMatchers>false</addDefaultLicenseMatchers>
+ <licenseMatchers>
+ <classNames>
+ <className>rat.analysis.license.ApacheSoftwareLicense20</className>
+ </classNames>
+ </licenseMatchers>
<includes>
- <include>
- <directory>${pom.basedir}/target/classes</directory>
- </include>
+ <include>pom.xml</include>
+ <include>src/**</include>
</includes>
</configuration>
</execution>
</executions>
</plugin>
+ -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.2</version>
+ <!--
<configuration>
- <useReleaseProfile>false</useReleaseProfile>
+ <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-gpg-plugin</artifactId>
+ <artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
+ <id>attach-source</id>
<goals>
- <goal>sign</goal>
+ <goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
- </plugins>
- </pluginManagement>
+ <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.
+ <plugin>
+ <groupId>com.google.code.maven-license-plugin</groupId>
+ <artifactId>maven-license-plugin</artifactId>
+ <version>1.2.7-SNAPSHOT</version>
+ <configuration>
+ <header>src/etc/header.txt</header>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/**</include>
+ <include>core/pom.xml</include>
+ <include>core/src/**</include>
+ <include>plugins/**/pom.xml</include>
+ <include>plugins/**/src/**</include>
+ <include>apps/**/pom.xml</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.txt</exclude>
+ <exclude>core/src/test/resources/org/apache/struts2/views/jsp/ui/*</exclude>
+ <exclude>core/src/main/resources/org/apache/struts2/static/domTT.js</exclude>
+ <exclude>core/src/test/resources/org/apache/struts2/interceptor/validation/*</exclude>
+ <exclude>core/src/site/resources/tags/**</exclude>
+ <exclude>plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/nls/**</exclude>
+ <exclude>plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/src/**</exclude>
+ <exclude>plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/*</exclude>
+ <exclude>plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/**</exclude>
+ <exclude>apps/**/src/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin> -->
+
+ </plugins>
<defaultGoal>install</defaultGoal>
</build>
@@ -314,6 +333,7 @@
<artifactId>maven-pmd-plugin</artifactId>
</plugin>
-->
+ <!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
@@ -323,11 +343,27 @@
<include>pom.xml</include>
<include>src/**</include>
</includes>
+ <excludes>
+ <exclude>assembly/src/main/resources/backport/RETROTRANSLATOR-LICENSE.txt</exclude>
+ </excludes>
</configuration>
</plugin>
+ -->
</plugins>
</reporting>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts-annotations</artifactId>
+ <version>1.0.4-20080729.133507-4</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<repositories>
<repository>
<id>snapshots-maven-codehaus</id>
@@ -365,20 +401,6 @@
<url>http://maven2.opensymphony.com</url>
</repository>
<repository>
- <id>opensymphony</id>
- <name>opensymphony</name>
- <layout>legacy</layout>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- <url>http://maven.opensymphony.com</url>
- </repository>
- <repository>
<id>Maven Snapshots</id>
<url>http://snapshots.maven.codehaus.org/maven2/</url>
<snapshots>