You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2005/07/06 05:09:24 UTC
svn commit: r209401 - in
/maven/components/trunk/maven-plugins/maven-resources-plugin: pom.xml
src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
Author: jvanzyl
Date: Tue Jul 5 20:09:21 2005
New Revision: 209401
URL: http://svn.apache.org/viewcvs?rev=209401&view=rev
Log:
o http://jira.codehaus.org/browse/MNG-516
Thanks to Andreas Hoheneder
Modified:
maven/components/trunk/maven-plugins/maven-resources-plugin/pom.xml
maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
Modified: maven/components/trunk/maven-plugins/maven-resources-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-resources-plugin/pom.xml?rev=209401&r1=209400&r2=209401&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-resources-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-resources-plugin/pom.xml Tue Jul 5 20:09:21 2005
@@ -16,6 +16,11 @@
<version>2.0-beta-1-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0-beta-1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>1.0</version>
Modified: maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java?rev=209401&r1=209400&r2=209401&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java Tue Jul 5 20:09:21 2005
@@ -20,6 +20,7 @@
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.InterpolationFilterReader;
@@ -41,6 +42,7 @@
/**
* @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
+ * @author Andreas Hoheneder
* @version $Id$
* @goal resources
* @phase process-resources
@@ -79,6 +81,13 @@
*/
private File filterPropertiesFile;
+ /**
+ * @parameter expression="${project}"
+ * @required
+ * @readonly
+ */
+ private MavenProject project;
+
private Properties filterProperties;
private static final String[] EMPTY_STRING_ARRAY = {};
@@ -210,6 +219,8 @@
// support @token@
reader = new InterpolationFilterReader( reader, filterProperties, "@", "@" );
+
+ reader = new InterpolationFilterReader( reader, new ReflectionProperties( project ), "${", "}" );
fileWriter = new FileWriter( to );
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org