Author: niallp Date: Fri Oct 8 23:16:24 2010 New Revision: 1006077 URL: http://svn.apache.org/viewvc?rev=1006077&view=rev Log: M3 warnings - replace deprecated variables - replace ${version} with ${project.version} - replace ${artifactId} with ${project.artifactId} - replace ${pom.version} with ${project.version} - replace ${pom.groupId} with ${project.groupId} - replace ${pom.artifactId} with ${project.artifactId}
Modified: struts/struts1/trunk/apps/blank/pom.xml struts/struts1/trunk/apps/cookbook/pom.xml struts/struts1/trunk/apps/el-example/pom.xml struts/struts1/trunk/apps/examples/pom.xml struts/struts1/trunk/apps/faces-example1/pom.xml struts/struts1/trunk/apps/faces-example2/pom.xml struts/struts1/trunk/apps/mailreader/pom.xml struts/struts1/trunk/apps/pom.xml struts/struts1/trunk/apps/scripting-mailreader/pom.xml struts/struts1/trunk/assembly/pom.xml struts/struts1/trunk/assembly/src/main/assembly/all.xml struts/struts1/trunk/assembly/src/main/assembly/lib.xml struts/struts1/trunk/el/pom.xml struts/struts1/trunk/extras/pom.xml struts/struts1/trunk/faces/pom.xml struts/struts1/trunk/integration/apps-it/pom.xml struts/struts1/trunk/pom.xml struts/struts1/trunk/scripting/pom.xml struts/struts1/trunk/taglib/pom.xml struts/struts1/trunk/tiles/pom.xml struts/struts1/trunk/tiles2/pom.xml Modified: struts/struts1/trunk/apps/blank/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/blank/pom.xml?rev=1006077&r1=1006076&r2=1006077&view=diff ============================================================================== --- struts/struts1/trunk/apps/blank/pom.xml (original) +++ struts/struts1/trunk/apps/blank/pom.xml Fri Oct 8 23:16:24 2010 @@ -39,14 +39,14 @@ <dependencies> <dependency> - <groupId>${pom.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>struts-taglib</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> - <groupId>${pom.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>struts-tiles</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -55,7 +55,7 @@ </dependencies> <build> - <finalName>${pom.artifactId}</finalName> + <finalName>${project.artifactId}</finalName> </build> </project> Modified: struts/struts1/trunk/apps/cookbook/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/cookbook/pom.xml?rev=1006077&r1=1006076&r2=1006077&view=diff ============================================================================== --- struts/struts1/trunk/apps/cookbook/pom.xml (original) +++ struts/struts1/trunk/apps/cookbook/pom.xml Fri Oct 8 23:16:24 2010 @@ -39,14 +39,14 @@ <dependencies> <dependency> - <groupId>${pom.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>struts-core</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> - <groupId>${pom.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>struts-taglib</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>javax.servlet</groupId> Modified: struts/struts1/trunk/apps/el-example/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/el-example/pom.xml?rev=1006077&r1=1006076&r2=1006077&view=diff ============================================================================== --- struts/struts1/trunk/apps/el-example/pom.xml (original) +++ struts/struts1/trunk/apps/el-example/pom.xml Fri Oct 8 23:16:24 2010 @@ -39,9 +39,9 @@ <dependencies> <dependency> - <groupId>${pom.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>struts-el</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>javax.servlet</groupId> Modified: struts/struts1/trunk/apps/examples/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/pom.xml?rev=1006077&r1=1006076&r2=1006077&view=diff ============================================================================== --- struts/struts1/trunk/apps/examples/pom.xml (original) +++ struts/struts1/trunk/apps/examples/pom.xml Fri Oct 8 23:16:24 2010 @@ -39,14 +39,14 @@ <dependencies> <dependency> - <groupId>${pom.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>struts-taglib</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> - <groupId>${pom.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>struts-extras</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>commons-fileupload</groupId> Modified: struts/struts1/trunk/apps/faces-example1/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/pom.xml?rev=1006077&r1=1006076&r2=1006077&view=diff ============================================================================== --- struts/struts1/trunk/apps/faces-example1/pom.xml (original) +++ struts/struts1/trunk/apps/faces-example1/pom.xml Fri Oct 8 23:16:24 2010 @@ -39,9 +39,9 @@ <dependencies> <dependency> - <groupId>${pom.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>struts-faces</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -88,7 +88,7 @@ </includes> </resource> </resources> - <finalName>${pom.artifactId}</finalName> + <finalName>${project.artifactId}</finalName> </build> </project> Modified: struts/struts1/trunk/apps/faces-example2/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example2/pom.xml?rev=1006077&r1=1006076&r2=1006077&view=diff ============================================================================== --- struts/struts1/trunk/apps/faces-example2/pom.xml (original) +++ struts/struts1/trunk/apps/faces-example2/pom.xml Fri Oct 8 23:16:24 2010 @@ -39,14 +39,14 @@ <dependencies> <dependency> - <groupId>${pom.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>struts-faces</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> - <groupId>${pom.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>struts-tiles</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -92,7 +92,7 @@ </includes> </resource> </resources> - <finalName>${pom.artifactId}</finalName> + <finalName>${project.artifactId}</finalName> </build> </project> Modified: struts/struts1/trunk/apps/mailreader/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/mailreader/pom.xml?rev=1006077&r1=1006076&r2=1006077&view=diff ============================================================================== --- struts/struts1/trunk/apps/mailreader/pom.xml (original) +++ struts/struts1/trunk/apps/mailreader/pom.xml Fri Oct 8 23:16:24 2010 @@ -39,19 +39,19 @@ <dependencies> <dependency> - <groupId>${pom.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>struts-taglib</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> - <groupId>${pom.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>struts-extras</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> - <groupId>${pom.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>struts-mailreader-dao</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>javax.servlet</groupId> Modified: struts/struts1/trunk/apps/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/pom.xml?rev=1006077&r1=1006076&r2=1006077&view=diff ============================================================================== --- struts/struts1/trunk/apps/pom.xml (original) +++ struts/struts1/trunk/apps/pom.xml Fri Oct 8 23:16:24 2010 @@ -95,7 +95,7 @@ <phase>process-sources</phase> <configuration> <tasks> - <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java" + <copy todir="${project.build.directory}/${project.artifactId}/WEB-INF/src/java" failonerror="false"> <fileset dir="${basedir}/src/main/java"/> </copy> @@ -109,7 +109,7 @@ </plugin> </plugins> - <finalName>${pom.artifactId}</finalName> + <finalName>${project.artifactId}</finalName> </build> Modified: struts/struts1/trunk/apps/scripting-mailreader/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/scripting-mailreader/pom.xml?rev=1006077&r1=1006076&r2=1006077&view=diff ============================================================================== --- struts/struts1/trunk/apps/scripting-mailreader/pom.xml (original) +++ struts/struts1/trunk/apps/scripting-mailreader/pom.xml Fri Oct 8 23:16:24 2010 @@ -39,24 +39,24 @@ <dependencies> <dependency> - <groupId>${pom.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>struts-scripting</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> - <groupId>${pom.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>struts-taglib</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> - <groupId>${pom.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>struts-mailreader-dao</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> - <groupId>${pom.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>struts-extras</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>groovy</groupId> Modified: struts/struts1/trunk/assembly/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/assembly/pom.xml?rev=1006077&r1=1006076&r2=1006077&view=diff ============================================================================== --- struts/struts1/trunk/assembly/pom.xml (original) +++ struts/struts1/trunk/assembly/pom.xml Fri Oct 8 23:16:24 2010 @@ -58,49 +58,49 @@ <artifactItem> <groupId>org.apache.struts</groupId> <artifactId>struts-blank</artifactId> - <version>${version}</version> + <version>${project.version}</version> <type>war</type> </artifactItem> <artifactItem> <groupId>org.apache.struts</groupId> <artifactId>struts-cookbook</artifactId> - <version>${version}</version> + <version>${project.version}</version> <type>war</type> </artifactItem> <artifactItem> <groupId>org.apache.struts</groupId> <artifactId>struts-examples</artifactId> - <version>${version}</version> + <version>${project.version}</version> <type>war</type> </artifactItem> <artifactItem> <groupId>org.apache.struts</groupId> <artifactId>struts-faces-example1</artifactId> - <version>${version}</version> + <version>${project.version}</version> <type>war</type> </artifactItem> <artifactItem> <groupId>org.apache.struts</groupId> <artifactId>struts-faces-example2</artifactId> - <version>${version}</version> + <version>${project.version}</version> <type>war</type> </artifactItem> <artifactItem> <groupId>org.apache.struts</groupId> <artifactId>struts-mailreader</artifactId> - <version>${version}</version> + <version>${project.version}</version> <type>war</type> </artifactItem> <artifactItem> <groupId>org.apache.struts</groupId> <artifactId>struts-scripting-mailreader</artifactId> - <version>${version}</version> + <version>${project.version}</version> <type>war</type> </artifactItem> <artifactItem> <groupId>org.apache.struts</groupId> <artifactId>struts-el-example</artifactId> - <version>${version}</version> + <version>${project.version}</version> <type>war</type> </artifactItem> </artifactItems> @@ -120,7 +120,7 @@ <descriptor>src/main/assembly/src.xml</descriptor> <descriptor>src/main/assembly/docs.xml</descriptor> </descriptors> - <finalName>struts-${version}</finalName> + <finalName>struts-${project.version}</finalName> <outputDirectory>target/assembly/out</outputDirectory> <workDirectory>target/assembly/work</workDirectory> </configuration> @@ -133,42 +133,42 @@ <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts-core</artifactId> - <version>${version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts-extras</artifactId> - <version>${version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts-el</artifactId> - <version>${version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts-faces</artifactId> - <version>${version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts-scripting</artifactId> - <version>${version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts-taglib</artifactId> - <version>${version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts-tiles</artifactId> - <version>${version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts-tiles2</artifactId> - <version>${version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.tiles</groupId> @@ -179,7 +179,7 @@ <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts-mailreader-dao</artifactId> - <version>${version}</version> + <version>${project.version}</version> </dependency> <!-- Include optional dependencies --> Modified: struts/struts1/trunk/assembly/src/main/assembly/all.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/assembly/src/main/assembly/all.xml?rev=1006077&r1=1006076&r2=1006077&view=diff ============================================================================== --- struts/struts1/trunk/assembly/src/main/assembly/all.xml (original) +++ struts/struts1/trunk/assembly/src/main/assembly/all.xml Fri Oct 8 23:16:24 2010 @@ -32,7 +32,7 @@ </excludes> </dependencySet> <dependencySet> - <outputFileNameMapping>${artifactId}-${version}-j4.${extension}</outputFileNameMapping> + <outputFileNameMapping>${project.artifactId}-${project.version}-j4.${extension}</outputFileNameMapping> <outputDirectory>lib</outputDirectory> <includes> <include>org.apache.tiles:tiles-api:jar:j4</include> Modified: struts/struts1/trunk/assembly/src/main/assembly/lib.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/assembly/src/main/assembly/lib.xml?rev=1006077&r1=1006076&r2=1006077&view=diff ============================================================================== --- struts/struts1/trunk/assembly/src/main/assembly/lib.xml (original) +++ struts/struts1/trunk/assembly/src/main/assembly/lib.xml Fri Oct 8 23:16:24 2010 @@ -33,7 +33,7 @@ </excludes> </dependencySet> <dependencySet> - <outputFileNameMapping>${artifactId}-${version}-j4.${extension}</outputFileNameMapping> + <outputFileNameMapping>${project.artifactId}-${project.version}-j4.${extension}</outputFileNameMapping> <outputDirectory>lib</outputDirectory> <includes> <include>org.apache.tiles:tiles-api:jar:j4</include> Modified: struts/struts1/trunk/el/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/el/pom.xml?rev=1006077&r1=1006076&r2=1006077&view=diff ============================================================================== --- struts/struts1/trunk/el/pom.xml (original) +++ struts/struts1/trunk/el/pom.xml Fri Oct 8 23:16:24 2010 @@ -50,7 +50,7 @@ <properties> <struts.osgi.symbolicName>org.apache.strutsel.taglib</struts.osgi.symbolicName> - <struts.osgi.export>org.apache.strutsel.*;version=${pom.version}</struts.osgi.export> + <struts.osgi.export>org.apache.strutsel.*;version=${project.version}</struts.osgi.export> </properties> <build> @@ -63,19 +63,19 @@ <dependencies> <dependency> - <groupId>${pom.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>struts-core</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> - <groupId>${pom.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>struts-taglib</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> - <groupId>${pom.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>struts-tiles</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> <optional>true</optional> </dependency> <dependency> Modified: struts/struts1/trunk/extras/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/extras/pom.xml?rev=1006077&r1=1006076&r2=1006077&view=diff ============================================================================== --- struts/struts1/trunk/extras/pom.xml (original) +++ struts/struts1/trunk/extras/pom.xml Fri Oct 8 23:16:24 2010 @@ -78,7 +78,7 @@ <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts-core</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> </dependencies> Modified: struts/struts1/trunk/faces/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/faces/pom.xml?rev=1006077&r1=1006076&r2=1006077&view=diff ============================================================================== --- struts/struts1/trunk/faces/pom.xml (original) +++ struts/struts1/trunk/faces/pom.xml Fri Oct 8 23:16:24 2010 @@ -76,19 +76,19 @@ <dependencies> <dependency> - <groupId>${pom.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>struts-core</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> - <groupId>${pom.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>struts-taglib</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> - <groupId>${pom.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>struts-tiles</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>junit</groupId> Modified: struts/struts1/trunk/integration/apps-it/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/integration/apps-it/pom.xml?rev=1006077&r1=1006076&r2=1006077&view=diff ============================================================================== --- struts/struts1/trunk/integration/apps-it/pom.xml (original) +++ struts/struts1/trunk/integration/apps-it/pom.xml Fri Oct 8 23:16:24 2010 @@ -95,7 +95,7 @@ </property> <property> <name>version</name> - <value>${version}</value> + <value>${project.version}</value> </property> </systemProperties> </configuration> Modified: struts/struts1/trunk/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/pom.xml?rev=1006077&r1=1006076&r2=1006077&view=diff ============================================================================== --- struts/struts1/trunk/pom.xml (original) +++ struts/struts1/trunk/pom.xml Fri Oct 8 23:16:24 2010 @@ -342,8 +342,8 @@ <properties> <myfaces.version>1.0.9</myfaces.version> - <struts.osgi.symbolicName>org.apache.${artifactId}</struts.osgi.symbolicName> - <struts.osgi.export>org.apache.struts.*;version=${pom.version}</struts.osgi.export> + <struts.osgi.symbolicName>org.apache.${project.artifactId}</struts.osgi.symbolicName> + <struts.osgi.export>org.apache.struts.*;version=${project.version}</struts.osgi.export> <struts.osgi.import>*</struts.osgi.import> <struts.osgi.dynamicImport /> <struts.osgi.private /> Modified: struts/struts1/trunk/scripting/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/scripting/pom.xml?rev=1006077&r1=1006076&r2=1006077&view=diff ============================================================================== --- struts/struts1/trunk/scripting/pom.xml (original) +++ struts/struts1/trunk/scripting/pom.xml Fri Oct 8 23:16:24 2010 @@ -62,9 +62,9 @@ <dependencies> <dependency> - <groupId>${pom.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>struts-core</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>bsf</groupId> Modified: struts/struts1/trunk/taglib/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/pom.xml?rev=1006077&r1=1006076&r2=1006077&view=diff ============================================================================== --- struts/struts1/trunk/taglib/pom.xml (original) +++ struts/struts1/trunk/taglib/pom.xml Fri Oct 8 23:16:24 2010 @@ -78,9 +78,9 @@ <dependencies> <dependency> - <groupId>${pom.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>struts-core</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>javax.servlet</groupId> Modified: struts/struts1/trunk/tiles/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/pom.xml?rev=1006077&r1=1006076&r2=1006077&view=diff ============================================================================== --- struts/struts1/trunk/tiles/pom.xml (original) +++ struts/struts1/trunk/tiles/pom.xml Fri Oct 8 23:16:24 2010 @@ -71,9 +71,9 @@ <dependencies> <dependency> - <groupId>${pom.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>struts-core</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>javax.servlet</groupId> Modified: struts/struts1/trunk/tiles2/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/pom.xml?rev=1006077&r1=1006076&r2=1006077&view=diff ============================================================================== --- struts/struts1/trunk/tiles2/pom.xml (original) +++ struts/struts1/trunk/tiles2/pom.xml Fri Oct 8 23:16:24 2010 @@ -71,9 +71,9 @@ <dependencies> <dependency> - <groupId>${pom.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>struts-core</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>backport-util-concurrent</groupId>