Author: niallp
Date: Sat Oct 9 00:29:06 2010
New Revision: 1006084
URL: http://svn.apache.org/viewvc?rev=1006084&view=rev
Log:
M3 warnings - replace deprecated variables
- replace ${version} with ${project.version}
- replace ${pom.version} with ${project.version}
- replace ${pom.groupId} with ${project.groupId}
- replace ${pom.artifactId} with ${project.artifactId}
Modified:
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/blank/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/cookbook/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/examples/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/faces-example1/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/faces-example2/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/mailreader/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/scripting-mailreader/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/assembly/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/el/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/extras/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/faces/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/scripting/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/tiles/pom.xml
Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/apps/blank/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/apps/blank/pom.xml?rev=1006084&r1=1006083&r2=1006084&view=diff
==============================================================================
--- struts/struts1/branches/STRUTS_1_3_BRANCH/apps/blank/pom.xml (original)
+++ struts/struts1/branches/STRUTS_1_3_BRANCH/apps/blank/pom.xml Sat Oct 9
00:29:06 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>
@@ -57,7 +57,7 @@
</dependencies>
<build>
- <finalName>${pom.artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/apps/cookbook/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/apps/cookbook/pom.xml?rev=1006084&r1=1006083&r2=1006084&view=diff
==============================================================================
--- struts/struts1/branches/STRUTS_1_3_BRANCH/apps/cookbook/pom.xml (original)
+++ struts/struts1/branches/STRUTS_1_3_BRANCH/apps/cookbook/pom.xml Sat Oct 9
00:29:06 2010
@@ -39,9 +39,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>
@@ -50,9 +50,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>struts-taglib</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/pom.xml?rev=1006084&r1=1006083&r2=1006084&view=diff
==============================================================================
--- struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/pom.xml (original)
+++ struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/pom.xml Sat Oct
9 00:29:06 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/branches/STRUTS_1_3_BRANCH/apps/examples/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/apps/examples/pom.xml?rev=1006084&r1=1006083&r2=1006084&view=diff
==============================================================================
--- struts/struts1/branches/STRUTS_1_3_BRANCH/apps/examples/pom.xml (original)
+++ struts/struts1/branches/STRUTS_1_3_BRANCH/apps/examples/pom.xml Sat Oct 9
00:29:06 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>javax.servlet</groupId>
Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/apps/faces-example1/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/apps/faces-example1/pom.xml?rev=1006084&r1=1006083&r2=1006084&view=diff
==============================================================================
--- struts/struts1/branches/STRUTS_1_3_BRANCH/apps/faces-example1/pom.xml
(original)
+++ struts/struts1/branches/STRUTS_1_3_BRANCH/apps/faces-example1/pom.xml Sat
Oct 9 00:29:06 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>
@@ -98,7 +98,7 @@
</includes>
</resource>
</resources>
- <finalName>${pom.artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/apps/faces-example2/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/apps/faces-example2/pom.xml?rev=1006084&r1=1006083&r2=1006084&view=diff
==============================================================================
--- struts/struts1/branches/STRUTS_1_3_BRANCH/apps/faces-example2/pom.xml
(original)
+++ struts/struts1/branches/STRUTS_1_3_BRANCH/apps/faces-example2/pom.xml Sat
Oct 9 00:29:06 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>
@@ -91,7 +91,7 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts-tiles</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
@@ -106,7 +106,7 @@
</includes>
</resource>
</resources>
- <finalName>${pom.artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/apps/mailreader/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/apps/mailreader/pom.xml?rev=1006084&r1=1006083&r2=1006084&view=diff
==============================================================================
--- struts/struts1/branches/STRUTS_1_3_BRANCH/apps/mailreader/pom.xml (original)
+++ struts/struts1/branches/STRUTS_1_3_BRANCH/apps/mailreader/pom.xml Sat Oct
9 00:29:06 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/branches/STRUTS_1_3_BRANCH/apps/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/apps/pom.xml?rev=1006084&r1=1006083&r2=1006084&view=diff
==============================================================================
--- struts/struts1/branches/STRUTS_1_3_BRANCH/apps/pom.xml (original)
+++ struts/struts1/branches/STRUTS_1_3_BRANCH/apps/pom.xml Sat Oct 9 00:29:06
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/branches/STRUTS_1_3_BRANCH/apps/scripting-mailreader/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/apps/scripting-mailreader/pom.xml?rev=1006084&r1=1006083&r2=1006084&view=diff
==============================================================================
--- struts/struts1/branches/STRUTS_1_3_BRANCH/apps/scripting-mailreader/pom.xml
(original)
+++ struts/struts1/branches/STRUTS_1_3_BRANCH/apps/scripting-mailreader/pom.xml
Sat Oct 9 00:29:06 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/branches/STRUTS_1_3_BRANCH/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/assembly/pom.xml?rev=1006084&r1=1006083&r2=1006084&view=diff
==============================================================================
--- struts/struts1/branches/STRUTS_1_3_BRANCH/assembly/pom.xml (original)
+++ struts/struts1/branches/STRUTS_1_3_BRANCH/assembly/pom.xml Sat Oct 9
00:29:06 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-mailreader-dao</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<!-- Include optional dependencies -->
Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/el/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/el/pom.xml?rev=1006084&r1=1006083&r2=1006084&view=diff
==============================================================================
--- struts/struts1/branches/STRUTS_1_3_BRANCH/el/pom.xml (original)
+++ struts/struts1/branches/STRUTS_1_3_BRANCH/el/pom.xml Sat Oct 9 00:29:06
2010
@@ -74,19 +74,19 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts-taglib</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts-tiles</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<optional>true</optional>
</dependency>
Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/extras/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/extras/pom.xml?rev=1006084&r1=1006083&r2=1006084&view=diff
==============================================================================
--- struts/struts1/branches/STRUTS_1_3_BRANCH/extras/pom.xml (original)
+++ struts/struts1/branches/STRUTS_1_3_BRANCH/extras/pom.xml Sat Oct 9
00:29:06 2010
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/faces/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/faces/pom.xml?rev=1006084&r1=1006083&r2=1006084&view=diff
==============================================================================
--- struts/struts1/branches/STRUTS_1_3_BRANCH/faces/pom.xml (original)
+++ struts/struts1/branches/STRUTS_1_3_BRANCH/faces/pom.xml Sat Oct 9 00:29:06
2010
@@ -96,19 +96,19 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts-taglib</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts-tiles</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/scripting/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/scripting/pom.xml?rev=1006084&r1=1006083&r2=1006084&view=diff
==============================================================================
--- struts/struts1/branches/STRUTS_1_3_BRANCH/scripting/pom.xml (original)
+++ struts/struts1/branches/STRUTS_1_3_BRANCH/scripting/pom.xml Sat Oct 9
00:29:06 2010
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/pom.xml?rev=1006084&r1=1006083&r2=1006084&view=diff
==============================================================================
--- struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/pom.xml (original)
+++ struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/pom.xml Sat Oct 9
00:29:06 2010
@@ -91,7 +91,7 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/tiles/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/tiles/pom.xml?rev=1006084&r1=1006083&r2=1006084&view=diff
==============================================================================
--- struts/struts1/branches/STRUTS_1_3_BRANCH/tiles/pom.xml (original)
+++ struts/struts1/branches/STRUTS_1_3_BRANCH/tiles/pom.xml Sat Oct 9 00:29:06
2010
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
