Author: brianf
Date: Thu Nov 4 21:04:45 2010
New Revision: 1031245
URL: http://svn.apache.org/viewvc?rev=1031245&view=rev
Log:
MDEP-281 applied patch from Selim Ok
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractResolveMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractResolveMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractResolveMojo.java?rev=1031245&r1=1031244&r2=1031245&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractResolveMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractResolveMojo.java
Thu Nov 4 21:04:45 2010
@@ -69,6 +69,15 @@ public abstract class AbstractResolveMoj
* @throws ArtifactNotFoundException
* @throws InvalidDependencyVersionException
*/
+
+ /**
+ * Whether to append outputs into the output file or overwrite it.
+ *
+ * @parameter expression="${appendOutput}" default-value="false"
+ * @since 2.2
+ */
+ protected boolean appendOutput;
+
protected Set resolveDependencyArtifacts( MavenProject theProject )
throws ArtifactResolutionException, ArtifactNotFoundException,
InvalidDependencyVersionException
{
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java?rev=1031245&r1=1031244&r2=1031245&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java
Thu Nov 4 21:04:45 2010
@@ -224,7 +224,15 @@ public class TreeMojo extends AbstractMo
* The computed dependency tree root node of the Maven project.
*/
private DependencyNode rootNode;
-
+
+ /**
+ * Whether to append outputs into the output file or overwrite it.
+ *
+ * @parameter expression="${appendOutput}" default-value="false"
+ * @since 2.2
+ */
+ private boolean appendOutput;
+
// Mojo methods -----------------------------------------------------------
/*
@@ -270,7 +278,7 @@ public class TreeMojo extends AbstractMo
if ( outputFile != null )
{
- DependencyUtil.write( dependencyTreeString, outputFile,
getLog() );
+ DependencyUtil.write( dependencyTreeString, outputFile,
this.appendOutput ,getLog() );
getLog().info( "Wrote dependency tree to: " + outputFile );
}
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java?rev=1031245&r1=1031244&r2=1031245&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java
Thu Nov 4 21:04:45 2010
@@ -76,7 +76,7 @@ public class ResolveDependenciesMojo
}
else
{
- DependencyUtil.write( output, outputFile, getLog() );
+ DependencyUtil.write( output, outputFile, appendOutput,
getLog() );
}
}
catch ( IOException e )
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java?rev=1031245&r1=1031244&r2=1031245&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java
Thu Nov 4 21:04:45 2010
@@ -99,7 +99,7 @@ public class ResolveDependencySourcesMoj
}
else
{
- DependencyUtil.write( output, outputFile, getLog() );
+ DependencyUtil.write( output, outputFile, appendOutput,
getLog() );
}
}
catch ( IOException e )
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java?rev=1031245&r1=1031244&r2=1031245&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java
Thu Nov 4 21:04:45 2010
@@ -159,7 +159,7 @@ public final class DependencyUtil
* @param file the file to write to
* @throws IOException if an I/O error occurs
*/
- public static synchronized void write( String string, File file, Log log )
+ public static synchronized void write( String string, File file, boolean
append, Log log )
throws IOException
{
file.getParentFile().mkdirs();
@@ -168,7 +168,7 @@ public final class DependencyUtil
try
{
- writer = new FileWriter( file );
+ writer = new FileWriter( file, append );
writer.write( string );
}
