You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2006/09/12 03:03:42 UTC
svn commit: r442405 - in
/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency:
AbstractDependencyFilterMojo.java resolvers/ResolveDependenciesMojo.java
utils/DependencyStatusSets.java
Author: brianf
Date: Mon Sep 11 18:03:40 2006
New Revision: 442405
URL: http://svn.apache.org/viewvc?view=rev&rev=442405
Log:
[MDEP-29] patch applied from Jimisola Laursen
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.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/utils/DependencyStatusSets.java
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java?view=diff&rev=442405&r1=442404&r2=442405
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java Mon Sep 11 18:03:40 2006
@@ -98,6 +98,11 @@
*/
protected boolean overWriteSnapshots;
+ /**
+ * Output absolute filename for resolved artifacts
+ * @parameter expression="${outputArtifactFilename}" default-value="false"
+ */
+ protected boolean outputArtifactFilename;
/**
* Retrieves dependencies, either direct only or all including transitive.
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?view=diff&rev=442405&r1=442404&r2=442405
==============================================================================
--- 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 Mon Sep 11 18:03:40 2006
@@ -44,6 +44,6 @@
//get sets of dependencies
DependencyStatusSets status = this.getDependencySets();
- status.logStatus(log);
+ status.logStatus(log, outputArtifactFilename);
}
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java?view=diff&rev=442405&r1=442404&r2=442405
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java Mon Sep 11 18:03:40 2006
@@ -99,7 +99,7 @@
this.unResolvedDependencies = unResolvedDependencies;
}
- public void logStatus( Log log )
+ public void logStatus( Log log, boolean outputArtifactFilename )
{
log.info( "" );
log.info( "The following files have been resolved: " );
@@ -113,7 +113,20 @@
sortedResolvedDependencies.addAll(resolvedDependencies);
for ( Iterator i = sortedResolvedDependencies.iterator(); i.hasNext(); )
{
- log.info( " " + ( (Artifact) i.next() ).getId() );
+ Artifact artifact = (Artifact) i.next();
+ String artifactFilename = null;
+ if (outputArtifactFilename)
+ {
+ try
+ {
+ artifact.getFile().getAbsoluteFile();
+ }
+ catch (NullPointerException e)
+ {
+ //ignore the null pointer, we'll output a null string
+ }
+ }
+ log.info( " " + artifact.getId() + (outputArtifactFilename ? ":" + artifactFilename : ""));
}
}