Author: olamy
Date: Sat Sep 6 14:37:22 2008
New Revision: 692743
URL: http://svn.apache.org/viewvc?rev=692743&view=rev
Log:
[MWAR-133] Filtering issue: wrong replacement of properties by values from
MavenProject object
upgrade to last maven-filtering component.
Fix the it which didn't really test the issue :-)
Modified:
maven/plugins/trunk/maven-war-plugin/pom.xml
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/pom.xml
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/src/main/webresources/filtered.properties
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/verify.bsh
Modified: maven/plugins/trunk/maven-war-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=692743&r1=692742&r2=692743&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/pom.xml Sat Sep 6 14:37:22 2008
@@ -110,7 +110,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-filtering</artifactId>
- <version>1.0-beta-1</version>
+ <version>1.0-beta-2-SNAPSHOT</version>
</dependency>
<dependency>
Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/pom.xml?rev=692743&r1=692742&r2=692743&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/pom.xml Sat Sep 6
14:37:22 2008
@@ -26,9 +26,6 @@
<name>MWAR-133 Maven Webapp</name>
<description>MWAR-133 it</description>
- <properties>
- <node.version>2.0</node.version>
- </properties>
<build>
<resources>
<resource>
Modified:
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/src/main/webresources/filtered.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/src/main/webresources/filtered.properties?rev=692743&r1=692742&r2=692743&view=diff
==============================================================================
---
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/src/main/webresources/filtered.properties
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/src/main/webresources/filtered.properties
Sat Sep 6 14:37:22 2008
@@ -1,4 +1,4 @@
#
-# Replaced with the version in the pom
+# Not Replaced with the pom version
#
app.version=${node.version}
\ No newline at end of file
Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/verify.bsh?rev=692743&r1=692742&r2=692743&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/verify.bsh (original)
+++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-133/verify.bsh Sat Sep 6
14:37:22 2008
@@ -50,7 +50,7 @@
String paramContent = IOUtil.toString ( fis );
- int indexOf = paramContent.indexOf( "app.version=2.0" );
+ int indexOf = paramContent.indexOf( "app.version=${node.version}" );
if ( indexOf < 0)
{
System.err.println( "filtered.properties was not filtered with the
value of ${node.version}" );
