You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/06/20 16:30:53 UTC

svn commit: r1352126 - in /maven/plugins/trunk/maven-resources-plugin: pom.xml src/it/includeEmptyDirs/src/main/resources/empty-dir-child/child/.gitattributes src/it/includeEmptyDirs/src/main/resources/empty-dir/.gitattributes

Author: olamy
Date: Wed Jun 20 14:30:53 2012
New Revision: 1352126

URL: http://svn.apache.org/viewvc?rev=1352126&view=rev
Log:
use last parent
add .gitattributes to be able to run it success with git.

Added:
    maven/plugins/trunk/maven-resources-plugin/src/it/includeEmptyDirs/src/main/resources/empty-dir-child/child/.gitattributes
    maven/plugins/trunk/maven-resources-plugin/src/it/includeEmptyDirs/src/main/resources/empty-dir/.gitattributes
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=1352126&r1=1352125&r2=1352126&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-resources-plugin/pom.xml Wed Jun 20 14:30:53 2012
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <artifactId>maven-plugins</artifactId>
     <groupId>org.apache.maven.plugins</groupId>
-    <version>21</version>
+    <version>22</version>
     <relativePath>../maven-plugins/pom.xml</relativePath>
   </parent>
 
@@ -168,6 +168,7 @@ under the License.
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-invoker-plugin</artifactId>
+            <version>1.6</version>
             <configuration>
               <debug>true</debug>
               <projectsDirectory>src/it</projectsDirectory>
@@ -195,6 +196,13 @@ under the License.
                 </goals>
               </execution>
             </executions>
+            <dependencies>
+              <dependency>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-utils</artifactId>
+                <version>3.0.1</version>
+              </dependency>
+            </dependencies>
           </plugin>
         </plugins>
       </build>

Added: maven/plugins/trunk/maven-resources-plugin/src/it/includeEmptyDirs/src/main/resources/empty-dir-child/child/.gitattributes
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/includeEmptyDirs/src/main/resources/empty-dir-child/child/.gitattributes?rev=1352126&view=auto
==============================================================================
    (empty)

Added: maven/plugins/trunk/maven-resources-plugin/src/it/includeEmptyDirs/src/main/resources/empty-dir/.gitattributes
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/includeEmptyDirs/src/main/resources/empty-dir/.gitattributes?rev=1352126&view=auto
==============================================================================
    (empty)