Permalink
Browse files

JSFUNIT-280 Fix Maven deprecation warnings

git-svn-id: https://svn.jboss.org/repos/jsfunit/trunk@577 992343fe-802f-0410-85da-d31fbad5f0a6
  • Loading branch information...
1 parent 87a9622 commit 49a38f025da8a8872ce16013a4e56208e0692eab @ssilvert ssilvert committed May 5, 2011
@@ -36,7 +36,7 @@
<systemProperties>
<property>
<name>cactus.contextURL</name>
- <value>http://localhost:8080/${artifactId}</value>
+ <value>http://localhost:8080/${project.artifactId}</value>
</property>
</systemProperties>
</configuration>
@@ -52,7 +52,7 @@
<configuration>
<deployables>
<deployable>
- <location>${project.build.directory}/${artifactId}.war</location>
+ <location>${project.build.directory}/${project.artifactId}.war</location>
<type>war</type>
</deployable>
</deployables>
@@ -105,7 +105,7 @@
<systemProperties>
<property>
<name>cactus.contextURL</name>
- <value>http://localhost:8080/${artifactId}</value>
+ <value>http://localhost:8080/${project.artifactId}</value>
</property>
</systemProperties>
</configuration>
@@ -121,7 +121,7 @@
<configuration>
<deployables>
<deployable>
- <location>${project.build.directory}/${artifactId}.war</location>
+ <location>${project.build.directory}/${project.artifactId}.war</location>
<type>war</type>
</deployable>
</deployables>
@@ -39,7 +39,7 @@
<systemProperties>
<property>
<name>cactus.contextURL</name>
- <value>http://localhost:8080/${artifactId}</value>
+ <value>http://localhost:8080/${project.artifactId}</value>
</property>
</systemProperties>
</configuration>
@@ -62,7 +62,7 @@
<configuration>
<deployables>
<deployable>
- <location>${project.build.directory}/${artifactId}.war</location>
+ <location>${project.build.directory}/${project.artifactId}.war</location>
<type>war</type>
</deployable>
</deployables>
@@ -110,7 +110,7 @@
<systemProperties>
<property>
<name>cactus.contextURL</name>
- <value>http://localhost:8080/${artifactId}</value>
+ <value>http://localhost:8080/${project.artifactId}</value>
</property>
</systemProperties>
<excludes>
@@ -136,7 +136,7 @@
<configuration>
<deployables>
<deployable>
- <location>${project.build.directory}/${artifactId}.war</location>
+ <location>${project.build.directory}/${project.artifactId}.war</location>
<type>war</type>
</deployable>
</deployables>
@@ -34,7 +34,7 @@
<systemProperties>
<property>
<name>cactus.contextURL</name>
- <value>http://localhost:8080/${artifactId}</value>
+ <value>http://localhost:8080/${project.artifactId}</value>
</property>
</systemProperties>
</configuration>
@@ -50,7 +50,7 @@
<configuration>
<deployables>
<deployable>
- <location>${project.build.directory}/${artifactId}.war</location>
+ <location>${project.build.directory}/${project.artifactId}.war</location>
<type>war</type>
</deployable>
</deployables>
@@ -17,7 +17,11 @@
<module>jboss-jsfunit-examples-hellojsf-jsfunit</module>
<module>jboss-jsfunit-examples-hellojsf-jee6</module>
<module>jboss-jsfunit-examples-hellojsf-pathmapped</module>
- <module>jboss-jsfunit-examples-hellojsf-ant</module>
+
+ <!-- Test removed because antrun plugin is incompatible with Maven 3 -->
+ <!-- See http://jira.codehaus.org/browse/MANTRUN-123 -->
+ <!-- https://issues.jboss.org/browse/JSFUNIT-279 -->
+ <!-- <module>jboss-jsfunit-examples-hellojsf-ant</module> -->
</modules>
<dependencies>
@@ -33,7 +33,7 @@
<systemProperties>
<property>
<name>cactus.contextURL</name>
- <value>http://localhost:8080/${artifactId}</value>
+ <value>http://localhost:8080/${project.artifactId}</value>
</property>
</systemProperties>
</configuration>
@@ -57,7 +57,7 @@
<configuration>
<deployables>
<deployable>
- <location>${project.build.directory}/${artifactId}.war</location>
+ <location>${project.build.directory}/${project.artifactId}.war</location>
<type>war</type>
</deployable>
</deployables>
@@ -303,7 +303,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
- <warName>${artifactId}</warName>
+ <warName>${project.artifactId}</warName>
</configuration>
</plugin>
</plugins>

0 comments on commit 49a38f0

Please sign in to comment.