Author: husted Date: Wed Feb 7 05:23:42 2007 New Revision: 504540 URL: http://svn.apache.org/viewvc?view=rev&rev=504540 Log: WW-1715 Update POMs for the 2.1.0 snapshot.
Modified: struts/struts2/trunk/api/pom.xml struts/struts2/trunk/apps/blank/pom.xml struts/struts2/trunk/apps/mailreader/pom.xml struts/struts2/trunk/apps/pom.xml struts/struts2/trunk/apps/portlet/pom.xml struts/struts2/trunk/apps/showcase/pom.xml struts/struts2/trunk/assembly/pom.xml struts/struts2/trunk/core/pom.xml struts/struts2/trunk/plugins/codebehind/pom.xml struts/struts2/trunk/plugins/config-browser/pom.xml struts/struts2/trunk/plugins/continuations/pom.xml struts/struts2/trunk/plugins/jasperreports/pom.xml struts/struts2/trunk/plugins/jfreechart/pom.xml struts/struts2/trunk/plugins/jsf/pom.xml struts/struts2/trunk/plugins/pell-multipart/pom.xml struts/struts2/trunk/plugins/plexus/pom.xml struts/struts2/trunk/plugins/pom.xml struts/struts2/trunk/plugins/sitegraph/pom.xml struts/struts2/trunk/plugins/sitemesh/pom.xml struts/struts2/trunk/plugins/spring/pom.xml struts/struts2/trunk/plugins/struts1/pom.xml struts/struts2/trunk/plugins/tiles/pom.xml struts/struts2/trunk/pom.xml Modified: struts/struts2/trunk/api/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/api/pom.xml?view=diff&rev=504540&r1=504539&r2=504540 ============================================================================== --- struts/struts2/trunk/api/pom.xml (original) +++ struts/struts2/trunk/api/pom.xml Wed Feb 7 05:23:42 2007 @@ -5,7 +5,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-parent</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-api</artifactId> @@ -32,7 +32,7 @@ <scope>test</scope> <!-- has to be compile for StrutsTestCase, which is part of the base package so others can write unit tests --> <optional>true</optional> - </dependency> + </dependency> <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> Modified: struts/struts2/trunk/apps/blank/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/pom.xml?view=diff&rev=504540&r1=504539&r2=504540 ============================================================================== --- struts/struts2/trunk/apps/blank/pom.xml (original) +++ struts/struts2/trunk/apps/blank/pom.xml Wed Feb 7 05:23:42 2007 @@ -5,7 +5,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-apps</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-blank</artifactId> Modified: struts/struts2/trunk/apps/mailreader/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/pom.xml?view=diff&rev=504540&r1=504539&r2=504540 ============================================================================== --- struts/struts2/trunk/apps/mailreader/pom.xml (original) +++ struts/struts2/trunk/apps/mailreader/pom.xml Wed Feb 7 05:23:42 2007 @@ -5,7 +5,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-apps</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-mailreader</artifactId> @@ -19,7 +19,7 @@ </scm> <dependencies> - + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> @@ -38,7 +38,7 @@ </dependency> </dependencies> - + <build> <resources> <resource> Modified: struts/struts2/trunk/apps/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/pom.xml?view=diff&rev=504540&r1=504539&r2=504540 ============================================================================== --- struts/struts2/trunk/apps/pom.xml (original) +++ struts/struts2/trunk/apps/pom.xml Wed Feb 7 05:23:42 2007 @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -/* +/* * Copyright 2005-2006 The Apache Software Foundation. - * + * * Licensed 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. @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-parent</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-apps</artifactId> @@ -37,7 +37,7 @@ <module>portlet</module> <module>showcase</module> </modules> - + <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/</developerConnection> @@ -50,7 +50,7 @@ <url>scp://people.apache.org/www/struts.apache.org/struts2/apps</url> </site> </distributionManagement> - + <profiles> <profile> <id>hostedqa</id> @@ -173,9 +173,9 @@ </executions> </plugin> </plugins> - + <finalName>${pom.artifactId}</finalName> - + </build> <dependencies> @@ -193,5 +193,5 @@ <scope>test</scope> </dependency> </dependencies> - + </project> Modified: struts/struts2/trunk/apps/portlet/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/pom.xml?view=diff&rev=504540&r1=504539&r2=504540 ============================================================================== --- struts/struts2/trunk/apps/portlet/pom.xml (original) +++ struts/struts2/trunk/apps/portlet/pom.xml Wed Feb 7 05:23:42 2007 @@ -5,7 +5,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-apps</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-portlet</artifactId> @@ -29,7 +29,7 @@ <groupId>org.apache.struts</groupId> <artifactId>struts2-spring-plugin</artifactId> <version>${pom.version}</version> - </dependency> + </dependency> <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> Modified: struts/struts2/trunk/apps/showcase/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?view=diff&rev=504540&r1=504539&r2=504540 ============================================================================== --- struts/struts2/trunk/apps/showcase/pom.xml (original) +++ struts/struts2/trunk/apps/showcase/pom.xml Wed Feb 7 05:23:42 2007 @@ -5,7 +5,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-apps</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-showcase</artifactId> @@ -17,7 +17,7 @@ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/showcase/</developerConnection> <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/showcase/</url> </scm> - + <profiles> <profile> @@ -31,7 +31,7 @@ </profile> </profiles> <dependencies> - + <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-struts1-plugin</artifactId> @@ -55,7 +55,7 @@ <artifactId>struts2-sitemesh-plugin</artifactId> <version>${pom.version}</version> </dependency> - + <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-tiles-plugin</artifactId> @@ -79,14 +79,14 @@ <artifactId>struts2-spring-plugin</artifactId> <version>${pom.version}</version> </dependency> - + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.4</version> <scope>provided</scope> </dependency> - + <!-- Velocity --> <dependency> <groupId>velocity</groupId> @@ -137,9 +137,9 @@ <version>1.1.1</version> </dependency> - + </dependencies> - + <build> <plugins> <plugin> Modified: struts/struts2/trunk/assembly/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?view=diff&rev=504540&r1=504539&r2=504540 ============================================================================== --- struts/struts2/trunk/assembly/pom.xml (original) +++ struts/struts2/trunk/assembly/pom.xml Wed Feb 7 05:23:42 2007 @@ -1,14 +1,14 @@ <?xml version="1.0"?> <!-- -/* +/* * Copyright 2005-2006 The Apache Software Foundation. - * + * * Licensed 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. @@ -33,7 +33,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-parent</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> </parent> <scm> @@ -192,37 +192,37 @@ <groupId>org.apache.struts</groupId> <artifactId>struts2-pell-multipart-plugin</artifactId> <version>${version}</version> - </dependency> + </dependency> <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-plexus-plugin</artifactId> <version>${version}</version> - </dependency> + </dependency> <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-sitegraph-plugin</artifactId> <version>${version}</version> - </dependency> + </dependency> <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-sitemesh-plugin</artifactId> <version>${version}</version> - </dependency> + </dependency> <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-struts1-plugin</artifactId> <version>${version}</version> - </dependency> + </dependency> <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-tiles-plugin</artifactId> <version>${version}</version> - </dependency> + </dependency> <!-- Include optional dependencies --> @@ -416,7 +416,7 @@ <version>1.2.8</version> <scope>provided</scope> </dependency> - + <dependency> <groupId>myfaces</groupId> @@ -431,7 +431,7 @@ <version>0.0.2</version> <scope>provided</scope> </dependency> - + <!-- Exclude transitive dependencies --> <dependency> <groupId>javax.servlet</groupId> Modified: struts/struts2/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?view=diff&rev=504540&r1=504539&r2=504540 ============================================================================== --- struts/struts2/trunk/core/pom.xml (original) +++ struts/struts2/trunk/core/pom.xml Wed Feb 7 05:23:42 2007 @@ -5,7 +5,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-parent</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> @@ -20,7 +20,7 @@ <build> <plugins> - <plugin> + <plugin> <artifactId>maven-dependency-plugin</artifactId> <version>2.0-alpha-1-SNAPSHOT</version> <executions> @@ -31,18 +31,18 @@ <goal>unpack</goal> </goals> <configuration> - <artifactItems> - <artifactItem> - <groupId>opensymphony</groupId> - <artifactId>xwork</artifactId> - <version>2.0.0</version> - <classifier>sources</classifier> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.directory}/xwork-sources</outputDirectory> - </configuration> + <artifactItems> + <artifactItem> + <groupId>opensymphony</groupId> + <artifactId>xwork</artifactId> + <version>2.0.0</version> + <classifier>sources</classifier> + </artifactItem> + </artifactItems> + <outputDirectory>${project.build.directory}/xwork-sources</outputDirectory> + </configuration> </execution> - </executions> + </executions> </plugin> <plugin> <groupId>org.apache.myfaces.tobago</groupId> @@ -75,14 +75,14 @@ <goal>execute</goal> </goals> </execution> - </executions> + </executions> </plugin> </plugins> </build> <reporting> <plugins> - <plugin> + <plugin> <artifactId>maven-javadoc-plugin</artifactId> <version>2.2</version> <configuration> @@ -111,68 +111,68 @@ </reporting> <profiles> - <profile> - <!-- - Run the translator for Java 1.4 compatiblity - - Sample: - $ cd struts/struts2/ - $ mvn clean install -Papps,j4 -Djava14.jar=$JAVA_HOME/../Classes/classes.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> + <!-- + Run the translator for Java 1.4 compatiblity + + Sample: + $ cd struts/struts2/ + $ mvn clean install -Papps,j4 -Djava14.jar=$JAVA_HOME/../Classes/classes.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> @@ -471,6 +471,6 @@ <optional>true</optional> </dependency> - + </dependencies> </project> Modified: struts/struts2/trunk/plugins/codebehind/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/pom.xml?view=diff&rev=504540&r1=504539&r2=504540 ============================================================================== --- struts/struts2/trunk/plugins/codebehind/pom.xml (original) +++ struts/struts2/trunk/plugins/codebehind/pom.xml Wed Feb 7 05:23:42 2007 @@ -5,13 +5,13 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-codebehind-plugin</artifactId> <packaging>jar</packaging> <name>Struts 2 Codebehind Plugin</name> - + <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/codebehind/</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/codebehind/</developerConnection> @@ -57,9 +57,9 @@ <scope>provided</scope> </dependency> - - + + </dependencies> </project> Modified: struts/struts2/trunk/plugins/config-browser/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/pom.xml?view=diff&rev=504540&r1=504539&r2=504540 ============================================================================== --- struts/struts2/trunk/plugins/config-browser/pom.xml (original) +++ struts/struts2/trunk/plugins/config-browser/pom.xml Wed Feb 7 05:23:42 2007 @@ -5,13 +5,13 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-config-browser-plugin</artifactId> <packaging>jar</packaging> <name>Struts 2 Configuration Browser Plugin</name> - + <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/config-browser/</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/config-browser/</developerConnection> Modified: struts/struts2/trunk/plugins/continuations/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/continuations/pom.xml?view=diff&rev=504540&r1=504539&r2=504540 ============================================================================== --- struts/struts2/trunk/plugins/continuations/pom.xml (original) +++ struts/struts2/trunk/plugins/continuations/pom.xml Wed Feb 7 05:23:42 2007 @@ -5,13 +5,13 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-continuations-plugin</artifactId> <packaging>jar</packaging> <name>Struts 2 Continuations Plugin</name> - + <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/continuations/</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/continuations/</developerConnection> Modified: struts/struts2/trunk/plugins/jasperreports/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jasperreports/pom.xml?view=diff&rev=504540&r1=504539&r2=504540 ============================================================================== --- struts/struts2/trunk/plugins/jasperreports/pom.xml (original) +++ struts/struts2/trunk/plugins/jasperreports/pom.xml Wed Feb 7 05:23:42 2007 @@ -5,13 +5,13 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-jasperreports-plugin</artifactId> <packaging>jar</packaging> <name>Struts 2 Jasper Reports Plugin</name> - + <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/jasperreports/</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/jasperreports/</developerConnection> Modified: struts/struts2/trunk/plugins/jfreechart/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jfreechart/pom.xml?view=diff&rev=504540&r1=504539&r2=504540 ============================================================================== --- struts/struts2/trunk/plugins/jfreechart/pom.xml (original) +++ struts/struts2/trunk/plugins/jfreechart/pom.xml Wed Feb 7 05:23:42 2007 @@ -5,83 +5,83 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-jfreechart-plugin</artifactId> <packaging>jar</packaging> <name>Struts 2 JFreeChart Plugin</name> - + <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/jfreechart/</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/jfreechart/</developerConnection> <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/jfreechart/</url> </scm> - + <profiles> - <profile> - <!-- - Run the translator for Java 1.4 compatiblity - - Sample: - $ cd struts/struts2/ - $ mvn clean install -Papps,j4 -Djava14.jar=$JAVA_HOME/../Classes/classes.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> + <!-- + Run the translator for Java 1.4 compatiblity + + Sample: + $ cd struts/struts2/ + $ mvn clean install -Papps,j4 -Djava14.jar=$JAVA_HOME/../Classes/classes.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> + </profiles> <dependencies> Modified: struts/struts2/trunk/plugins/jsf/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jsf/pom.xml?view=diff&rev=504540&r1=504539&r2=504540 ============================================================================== --- struts/struts2/trunk/plugins/jsf/pom.xml (original) +++ struts/struts2/trunk/plugins/jsf/pom.xml Wed Feb 7 05:23:42 2007 @@ -5,13 +5,13 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-jsf-plugin</artifactId> <packaging>jar</packaging> <name>Struts 2 JSF Plugin</name> - + <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/jsf/</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/jsf/</developerConnection> @@ -24,7 +24,7 @@ <artifactId>struts-core</artifactId> <version>1.3.5</version> </dependency> - + <dependency> <groupId>myfaces</groupId> <artifactId>myfaces-jsf-api</artifactId> @@ -32,7 +32,7 @@ <scope>provided</scope> </dependency> - + <dependency> <groupId>mockobjects</groupId> <artifactId>mockobjects-core</artifactId> Modified: struts/struts2/trunk/plugins/pell-multipart/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/pell-multipart/pom.xml?view=diff&rev=504540&r1=504539&r2=504540 ============================================================================== --- struts/struts2/trunk/plugins/pell-multipart/pom.xml (original) +++ struts/struts2/trunk/plugins/pell-multipart/pom.xml Wed Feb 7 05:23:42 2007 @@ -5,13 +5,13 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-pell-multipart-plugin</artifactId> <packaging>jar</packaging> <name>Struts 2 Pell Multipart Plugin</name> - + <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/pell-multipart/</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/pell-multipart/</developerConnection> Modified: struts/struts2/trunk/plugins/plexus/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/plexus/pom.xml?view=diff&rev=504540&r1=504539&r2=504540 ============================================================================== --- struts/struts2/trunk/plugins/plexus/pom.xml (original) +++ struts/struts2/trunk/plugins/plexus/pom.xml Wed Feb 7 05:23:42 2007 @@ -5,13 +5,13 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plexus-plugin</artifactId> <packaging>jar</packaging> <name>Struts 2 Plexus Plugin</name> - + <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/plexus/</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/plexus/</developerConnection> Modified: struts/struts2/trunk/plugins/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/pom.xml?view=diff&rev=504540&r1=504539&r2=504540 ============================================================================== --- struts/struts2/trunk/plugins/pom.xml (original) +++ struts/struts2/trunk/plugins/pom.xml Wed Feb 7 05:23:42 2007 @@ -5,7 +5,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-parent</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> @@ -33,7 +33,7 @@ <module>struts1</module> <module>tiles</module> </modules> - + <dependencies> <dependency> @@ -62,5 +62,5 @@ </dependencies> - + </project> Modified: struts/struts2/trunk/plugins/sitegraph/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitegraph/pom.xml?view=diff&rev=504540&r1=504539&r2=504540 ============================================================================== --- struts/struts2/trunk/plugins/sitegraph/pom.xml (original) +++ struts/struts2/trunk/plugins/sitegraph/pom.xml Wed Feb 7 05:23:42 2007 @@ -5,7 +5,7 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-sitegraph-plugin</artifactId> @@ -137,7 +137,7 @@ <version>1.2.8</version> <scope>test</scope> </dependency> - + </dependencies> </project> Modified: struts/struts2/trunk/plugins/sitemesh/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitemesh/pom.xml?view=diff&rev=504540&r1=504539&r2=504540 ============================================================================== --- struts/struts2/trunk/plugins/sitemesh/pom.xml (original) +++ struts/struts2/trunk/plugins/sitemesh/pom.xml Wed Feb 7 05:23:42 2007 @@ -5,19 +5,19 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-sitemesh-plugin</artifactId> <packaging>jar</packaging> <name>Struts 2 Sitemesh Plugin</name> - + <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/sitemesh/</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/sitemesh/</developerConnection> <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/sitemesh/</url> </scm> - + <dependencies> <dependency> <groupId>opensymphony</groupId> Modified: struts/struts2/trunk/plugins/spring/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/spring/pom.xml?view=diff&rev=504540&r1=504539&r2=504540 ============================================================================== --- struts/struts2/trunk/plugins/spring/pom.xml (original) +++ struts/struts2/trunk/plugins/spring/pom.xml Wed Feb 7 05:23:42 2007 @@ -5,13 +5,13 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-spring-plugin</artifactId> <packaging>jar</packaging> <name>Struts 2 Spring Plugin</name> - + <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/spring/</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/spring/</developerConnection> Modified: struts/struts2/trunk/plugins/struts1/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/struts1/pom.xml?view=diff&rev=504540&r1=504539&r2=504540 ============================================================================== --- struts/struts2/trunk/plugins/struts1/pom.xml (original) +++ struts/struts2/trunk/plugins/struts1/pom.xml Wed Feb 7 05:23:42 2007 @@ -5,26 +5,26 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-struts1-plugin</artifactId> <packaging>jar</packaging> <name>Struts 2 Struts 1 Plugin</name> - + <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/struts1/</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/struts1/</developerConnection> <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/struts1/</url> </scm> - + <dependencies> <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts-core</artifactId> <version>1.3.5</version> </dependency> - + <dependency> <groupId>mockobjects</groupId> <artifactId>mockobjects-core</artifactId> Modified: struts/struts2/trunk/plugins/tiles/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles/pom.xml?view=diff&rev=504540&r1=504539&r2=504540 ============================================================================== --- struts/struts2/trunk/plugins/tiles/pom.xml (original) +++ struts/struts2/trunk/plugins/tiles/pom.xml Wed Feb 7 05:23:42 2007 @@ -5,19 +5,19 @@ <parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-plugins</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> </parent> <groupId>org.apache.struts</groupId> <artifactId>struts2-tiles-plugin</artifactId> <packaging>jar</packaging> <name>Struts 2 Tiles Plugin</name> - + <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/tiles/</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/tiles/</developerConnection> <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/tiles/</url> </scm> - + <dependencies> <dependency> <groupId>org.apache.tiles</groupId> Modified: struts/struts2/trunk/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?view=diff&rev=504540&r1=504539&r2=504540 ============================================================================== --- struts/struts2/trunk/pom.xml (original) +++ struts/struts2/trunk/pom.xml Wed Feb 7 05:23:42 2007 @@ -6,15 +6,15 @@ * Licensed 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. - * + * * $Id$ */ --> @@ -32,20 +32,20 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.struts</groupId> <artifactId>struts2-parent</artifactId> - <version>2.0.6-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Struts 2</name> <url>http://struts.apache.org/struts2</url> <description>Apache Struts 2</description> <inceptionYear>2000</inceptionYear> - + <!-- <description> - Apache Struts 2 is an elegant, extensible framework, - well suited for creating moderate to large-scale Java web - applications. The framework is designed to streamline the - full development cycle, from building, to deploying, + Apache Struts 2 is an elegant, extensible framework, + well suited for creating moderate to large-scale Java web + applications. The framework is designed to streamline the + full development cycle, from building, to deploying, to maintaining applications over time. </description> --> @@ -141,7 +141,7 @@ <!-- should have the org.w3c.dom dependency here --> </dependencies> </profile> - + <profile> <id>alljars</id> <build> @@ -384,7 +384,7 @@ <releases><enabled>false</enabled></releases> <snapshots><enabled>true</enabled></snapshots> </pluginRepository> - + </pluginRepositories> </project>