You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/08/04 13:29:50 UTC

svn commit: r682330 - in /maven/plugins/trunk/maven-patch-plugin: pom.xml src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java

Author: bentmann
Date: Mon Aug  4 04:29:49 2008
New Revision: 682330

URL: http://svn.apache.org/viewvc?rev=682330&view=rev
Log:
o Updated command line to use "-i" option instead of stdin redirection to work with newer plexus-utils (PLXUTILS-78)

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

Modified: maven/plugins/trunk/maven-patch-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-patch-plugin/pom.xml?rev=682330&r1=682329&r2=682330&view=diff
==============================================================================
--- maven/plugins/trunk/maven-patch-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-patch-plugin/pom.xml Mon Aug  4 04:29:49 2008
@@ -58,8 +58,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <!-- NOTE: Can't use newer versions which escape the "<" redirection for patch input on Unix due to PLXUTILS-78 -->
-      <version>1.5.1</version>
+      <version>1.5.6</version>
     </dependency>
 
     <!-- Others -->

Modified: maven/plugins/trunk/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java?rev=682330&r1=682329&r2=682330&view=diff
==============================================================================
--- maven/plugins/trunk/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java (original)
+++ maven/plugins/trunk/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java Mon Aug  4 04:29:49 2008
@@ -600,7 +600,7 @@
             cli.createArg().setValue( "-E" );
         }
 
-        cli.createArg().setValue( "<" );
+        cli.createArg().setValue( "-i" );
         cli.createArg().setFile( patchFile );
 
         return cli;