maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krosenv...@apache.org
Subject svn commit: r1639901 - in /maven/plugins/trunk/maven-invoker-plugin: pom.xml src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
Date Sat, 15 Nov 2014 15:50:51 GMT
Author: krosenvold
Date: Sat Nov 15 15:50:50 2014
New Revision: 1639901

URL: http://svn.apache.org/r1639901
Log:
[MINVOKER-178] Upgraded p-utils to 3.0.21 and changed to use symlink-safe copy

The new FileUtils.mkDirs method is designed to work with
DirectoryScanner#getIncludedDirectories and will preserve
any symlinks present in the directory scan. The p-u 3.0.21
copyFile method copies file symlinks.

Modified:
    maven/plugins/trunk/maven-invoker-plugin/pom.xml
    maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java

Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/pom.xml?rev=1639901&r1=1639900&r2=1639901&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/pom.xml Sat Nov 15 15:50:50 2014
@@ -185,7 +185,7 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>3.0.20</version>
+      <version>3.0.21</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>

Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java?rev=1639901&r1=1639900&r2=1639901&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
(original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
Sat Nov 15 15:50:50 2014
@@ -1014,11 +1014,8 @@ public abstract class AbstractInvokerMoj
          * NOTE: Make sure the destination directory is always there (even if empty) to support
POM-less ITs.
          */
         destDir.mkdirs();
-        for ( String includedDir : scanner.getIncludedDirectories() )
-        {
-            File clonedDir = new File( destDir, includedDir );
-            clonedDir.mkdirs();
-        }
+        // Create all the directories, including any symlinks present in source
+        FileUtils.mkDirs( sourceDir, scanner.getIncludedDirectories(), destDir );
 
         for ( String includedFile : scanner.getIncludedFiles() )
         {



Mime
View raw message