You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2009/09/30 18:00:25 UTC
svn commit: r820324 -
/maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
Author: jdcasey
Date: Wed Sep 30 16:00:24 2009
New Revision: 820324
URL: http://svn.apache.org/viewvc?rev=820324&view=rev
Log:
[MRESOURCES-105] This was half-fixed in the new plexus-interpolation version (1.13), so I tidied it up a bit to be consistent with the remote-resources plugin (1.1).
Modified:
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
Modified: maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java?rev=820324&r1=820323&r2=820324&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java Wed Sep 30 16:00:24 2009
@@ -238,7 +238,20 @@
{
delims.addAll( mavenResourcesExecution.getDelimiters() );
}
- delims.addAll( delimiters );
+
+ for ( Iterator dIt = delimiters.iterator(); dIt.hasNext(); )
+ {
+ String delim = (String) dIt.next();
+ if ( delim == null )
+ {
+ // FIXME: ${filter:*} could also trigger this condition. Need a better long-term solution.
+ delims.add( "${*}" );
+ }
+ else
+ {
+ delims.add( delim );
+ }
+ }
mavenResourcesExecution.setDelimiters( delims );
}