You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2008/11/05 23:03:42 UTC

svn commit: r711713 - in /myfaces/tobago/trunk: core/pom.xml pom.xml sandbox/pom.xml

Author: bommel
Date: Wed Nov  5 14:03:41 2008
New Revision: 711713

URL: http://svn.apache.org/viewvc?rev=711713&view=rev
Log:
update to maven-resource-plugin 2.3

Modified:
    myfaces/tobago/trunk/core/pom.xml
    myfaces/tobago/trunk/pom.xml
    myfaces/tobago/trunk/sandbox/pom.xml

Modified: myfaces/tobago/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/pom.xml?rev=711713&r1=711712&r2=711713&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/pom.xml (original)
+++ myfaces/tobago/trunk/core/pom.xml Wed Nov  5 14:03:41 2008
@@ -168,9 +168,10 @@
         <executions>
           <execution>
             <id>copy-faces-config</id>
-            <goals><goal>resources</goal></goals>
+            <goals><goal>copy-resources</goal></goals>
             <phase>process-classes</phase>
             <configuration>
+              <outputDirectory>${project.build.outputDirectory}</outputDirectory>
               <resources>
                 <resource>
                   <targetPath>META-INF</targetPath>
@@ -179,6 +180,20 @@
               </resources>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-tld</id>
+            <goals><goal>copy-resources</goal></goals>
+            <phase>process-classes</phase>
+            <configuration>
+              <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+              <resources>
+                <resource>
+                  <targetPath>META-INF</targetPath>
+                  <directory>${project.build.directory}/generated-tld</directory>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>

Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=711713&r1=711712&r2=711713&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Wed Nov  5 14:03:41 2008
@@ -681,6 +681,11 @@
           <artifactId>maven-war-plugin</artifactId>
           <version>2.0.2</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>2.3</version>
+        </plugin>        
       </plugins>
     </pluginManagement>
   </build>

Modified: myfaces/tobago/trunk/sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/pom.xml?rev=711713&r1=711712&r2=711713&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/sandbox/pom.xml Wed Nov  5 14:03:41 2008
@@ -207,9 +207,10 @@
         <executions>
           <execution>
             <id>copy-faces-config</id>
-            <goals><goal>resources</goal></goals>
+            <goals><goal>copy-resources</goal></goals>
             <phase>process-classes</phase>
             <configuration>
+              <outputDirectory>${project.build.outputDirectory}</outputDirectory>
               <resources>
                 <resource>
                   <targetPath>META-INF</targetPath>
@@ -218,6 +219,20 @@
               </resources>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-tld</id>
+            <goals><goal>copy-resources</goal></goals>
+            <phase>process-classes</phase>
+            <configuration>
+              <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+              <resources>
+                <resource>
+                  <targetPath>META-INF</targetPath>
+                  <directory>${project.build.directory}/generated-tld</directory>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
     </plugins>