You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2008/09/07 00:44:17 UTC
svn commit: r692758 - in /maven/plugins/trunk/maven-resources-plugin:
pom.xml src/it/filter/src/main/filters/my.filter
src/it/filter/src/main/resources/SomeResource.txt src/it/filter/verify.bsh
Author: olamy
Date: Sat Sep 6 15:44:17 2008
New Revision: 692758
URL: http://svn.apache.org/viewvc?rev=692758&view=rev
Log:
[MRESOURCES-39] Filtering fails for command line properties
add test in an it
Modified:
maven/plugins/trunk/maven-resources-plugin/pom.xml
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/my.filter
maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/resources/SomeResource.txt
maven/plugins/trunk/maven-resources-plugin/src/it/filter/verify.bsh
Modified: maven/plugins/trunk/maven-resources-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/pom.xml?rev=692758&r1=692757&r2=692758&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-resources-plugin/pom.xml Sat Sep 6 15:44:17 2008
@@ -107,7 +107,10 @@
<goal>process-test-resources</goal>
</goals>
<settingsFile>src/it/settings.xml</settingsFile>
- <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo>
+ <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo>
+ <properties>
+ <execProps>fromExecProps</execProps>
+ </properties>
</configuration>
<executions>
<execution>
Modified: maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/my.filter
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/my.filter?rev=692758&r1=692757&r2=692758&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/my.filter (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/filters/my.filter Sat Sep 6 15:44:17 2008
@@ -1,4 +1,5 @@
filter.token.project.version=${project.version}
filter.token.projectProperty=${projectProperty}
-filter.token.profileProperty=${profileProperty}
\ No newline at end of file
+filter.token.profileProperty=${profileProperty}
+execProps=fromFilter
\ No newline at end of file
Modified: maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/resources/SomeResource.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/resources/SomeResource.txt?rev=692758&r1=692757&r2=692758&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/resources/SomeResource.txt (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/it/filter/src/main/resources/SomeResource.txt Sat Sep 6 15:44:17 2008
@@ -8,3 +8,5 @@
test:filter direct profileProperty=${profileProperty}
test:filter resolution profileProperty=${filter.token.profileProperty}
+test:filter syspropsExecutionPropsWins=${execProps}
+
Modified: maven/plugins/trunk/maven-resources-plugin/src/it/filter/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/filter/verify.bsh?rev=692758&r1=692757&r2=692758&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/it/filter/verify.bsh (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/it/filter/verify.bsh Sat Sep 6 15:44:17 2008
@@ -91,7 +91,14 @@
System.err.println( "SomeResource.txt not contains test:filter resolution profileProperty=foo-profileProperty-bar" );
return false;
}
-
+
+ //test:filter syspropsExecutionPropsWins=fromExecProps
+ indexOf = paramContent.indexOf( "test:filter syspropsExecutionPropsWins=fromExecProps" );
+ if ( indexOf < 0)
+ {
+ System.err.println( "SomeResource.txt not contains test:filter syspropsExecutionPropsWins=fromExecProps" );
+ return false;
+ }
}
catch( IOException e )
{