You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2011/02/05 11:47:34 UTC
svn commit: r1067424 - in /maven/plugins/trunk/maven-resources-plugin:
pom.xml src/site/apt/usage.apt src/site/apt/usage.apt.vm
Author: dennisl
Date: Sat Feb 5 10:47:33 2011
New Revision: 1067424
URL: http://svn.apache.org/viewvc?rev=1067424&view=rev
Log:
o Use a property in the POM for the version of Maven Filtering, and add it to the documentation.
Added:
maven/plugins/trunk/maven-resources-plugin/src/site/apt/usage.apt.vm (contents, props changed)
- copied, changed from r1057906, maven/plugins/trunk/maven-resources-plugin/src/site/apt/usage.apt
Removed:
maven/plugins/trunk/maven-resources-plugin/src/site/apt/usage.apt
Modified:
maven/plugins/trunk/maven-resources-plugin/pom.xml
Modified: maven/plugins/trunk/maven-resources-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/pom.xml?rev=1067424&r1=1067423&r2=1067424&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-resources-plugin/pom.xml Sat Feb 5 10:47:33 2011
@@ -59,6 +59,7 @@ under the License.
</issueManagement>
<properties>
+ <mavenFilteringVersion>1.0-SNAPSHOT</mavenFilteringVersion>
<mavenVersion>2.0.6</mavenVersion>
</properties>
@@ -114,7 +115,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-filtering</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${mavenFilteringVersion}</version>
</dependency>
<dependency>
Copied: maven/plugins/trunk/maven-resources-plugin/src/site/apt/usage.apt.vm (from r1057906, maven/plugins/trunk/maven-resources-plugin/src/site/apt/usage.apt)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/site/apt/usage.apt.vm?p2=maven/plugins/trunk/maven-resources-plugin/src/site/apt/usage.apt.vm&p1=maven/plugins/trunk/maven-resources-plugin/src/site/apt/usage.apt&r1=1057906&r2=1067424&rev=1067424&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/site/apt/usage.apt (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/site/apt/usage.apt.vm Sat Feb 5 10:47:33 2011
@@ -3,7 +3,7 @@
------
Franz Allan See
------
- 2008-09-05
+ 2011-02-05
------
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -31,6 +31,10 @@ Usage
The Resources Plugin handles the copying of project resources to the output
directory. The following examples describe the basic usage of the Plugin.
+ To handle filtering this version of Maven Resources Plugin uses
+ {{{http://maven.apache.org/shared/maven-filtering/index.html}Maven Filtering}} ${mavenFilteringVersion}.
+
+
* Copy resources for the main source code
+-----+
@@ -44,6 +48,7 @@ mvn resources:resources
Moreover, this goal is bound to the <<<process-resources>>> phase.
+
* Copy resources for the unit tests
+-----+
@@ -57,6 +62,7 @@ mvn resources:testResources
Furthermore, this is bound to the <<<process-test-resources>>> phase.
+
* Copy resources specified by a \<resources> configuration element
+-----+
@@ -65,7 +71,7 @@ mvn resources:copy-resources
Rather than using the \<resources> or \<testResources> elements or their
defaults, this uses a \<resources> element that is specified as part of the
- configuration.
+ plugin configuration.
See the examples for how to configure this. See the Maven Model for
how to write \<resources> elements.
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-resources-plugin/src/site/apt/usage.apt.vm
------------------------------------------------------------------------------
svn:eol-style = native