You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2014/06/12 20:47:37 UTC

git commit: Adjust for the fact that the maven-plugin-plugin is run in process-classes.

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master 159eb5c3c -> ea8f45652


Adjust for the fact that the maven-plugin-plugin is run in process-classes.


Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/ea8f4565
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/ea8f4565
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/ea8f4565

Branch: refs/heads/master
Commit: ea8f45652f5fc7e6ae769b3c7b1f2c9a712164ab
Parents: 159eb5c
Author: Jason van Zyl <ja...@tesla.io>
Authored: Thu Jun 12 14:46:59 2014 -0400
Committer: Jason van Zyl <ja...@tesla.io>
Committed: Thu Jun 12 14:46:59 2014 -0400

----------------------------------------------------------------------
 .../maven-it-plugin-invalid-descriptor/pom.xml  | 32 +++++++++++++++-----
 1 file changed, 25 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/ea8f4565/core-it-support/core-it-plugins/maven-it-plugin-invalid-descriptor/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-invalid-descriptor/pom.xml b/core-it-support/core-it-plugins/maven-it-plugin-invalid-descriptor/pom.xml
index dd753e8..4dd1b7c 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-invalid-descriptor/pom.xml
+++ b/core-it-support/core-it-plugins/maven-it-plugin-invalid-descriptor/pom.xml
@@ -48,13 +48,31 @@ under the License.
   </dependencies>
 
   <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <!-- forces overwrite of generated one -->
-        <filtering>true</filtering>
-      </resource>
-    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-resources</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+              <resources>          
+                <resource>
+                  <directory>src/main/resources</directory>
+                  <!-- forces overwrite of generated one -->
+                  <filtering>true</filtering>
+                </resource>
+              </resources>              
+            </configuration>            
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
   </build>
 </project>