Author: rfscholte
Date: Thu Aug 31 19:42:47 2017
New Revision: 1806840
URL: http://svn.apache.org/viewvc?rev=1806840&view=rev
Log:
Add colors to resolve-goal for modules
Modified:
maven/plugins/trunk/maven-dependency-plugin/pom.xml
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java
Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=1806840&r1=1806839&r2=1806840&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Thu Aug 31 19:42:47 2017
@@ -224,6 +224,11 @@ under the License.
<artifactId>maven-artifact-transfer</artifactId>
<version>0.9.2-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-shared-utils</artifactId>
+ <version>3.2.0</version>
+ </dependency>
<dependency>
<groupId>commons-lang</groupId>
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java?rev=1806840&r1=1806839&r2=1806840&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java
Thu Aug 31 19:42:47 2017
@@ -31,6 +31,8 @@ import org.apache.maven.plugins.annotati
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
+import org.apache.maven.shared.utils.logging.MessageBuilder;
+import org.apache.maven.shared.utils.logging.MessageUtils;
import java.io.File;
import java.io.IOException;
@@ -42,6 +44,7 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.jar.JarFile;
+import java.util.jar.Manifest;
/**
* Goal that resolves the project dependencies from the repository.
@@ -177,56 +180,61 @@ public class ResolveDependenciesMojo
List<String> artifactStringList = new ArrayList<String>();
for ( Artifact artifact : artifacts )
{
- String artifactFilename = null;
+ MessageBuilder messageBuilder = MessageUtils.buffer();
+
+ messageBuilder.a( " " );
+
+ if ( outputScope )
+ {
+ messageBuilder.a( artifact.toString() );
+ }
+ else
+ {
+ messageBuilder.a( artifact.getId() );
+ }
+
if ( outputAbsoluteArtifactFilename )
{
try
{
// we want to print the absolute file name here
- artifactFilename =
artifact.getFile().getAbsoluteFile().getPath();
+ String artifactFilename =
artifact.getFile().getAbsoluteFile().getPath();
+
+ messageBuilder.a( ':' ).a( artifactFilename );
}
catch ( NullPointerException e )
{
// ignore the null pointer, we'll output a null string
- artifactFilename = null;
}
}
- String id = outputScope ? artifact.toString() : artifact.getId();
- String optionalMarker = "";
if ( outputScope && artifact.isOptional() )
{
- optionalMarker = " (optional) ";
+ messageBuilder.a( " (optional) " );
}
- String moduleNameMarker = "";
-
// dependencies:collect won't download jars
if ( artifact.getFile() != null )
{
ModuleDescriptor moduleDescriptor = getModuleDescriptor(
artifact.getFile() );
if ( moduleDescriptor != null )
{
- moduleNameMarker = " -- module " + moduleDescriptor.name;
+ messageBuilder.project( " -- module " +
moduleDescriptor.name );
if ( moduleDescriptor.automatic )
{
if ( "MANIFEST".equals(
moduleDescriptor.moduleNameSource ) )
{
- moduleNameMarker += " [auto]";
+ messageBuilder.strong( " [auto]" );
}
else
{
- moduleNameMarker += " (auto)";
+ messageBuilder.warning( " (auto)" );
}
}
}
}
-
- artifactStringList.add( " " + id + (
outputAbsoluteArtifactFilename ? ":" + artifactFilename : "" )
- + optionalMarker
- + moduleNameMarker
- + "\n" );
+ artifactStringList.add( messageBuilder.toString() + "\n" );
}
if ( sort )
{
@@ -281,7 +289,10 @@ public class ResolveDependenciesMojo
{
jarFile = new JarFile( artifactFile );
- if (
jarFile.getManifest().getMainAttributes().getValue( "Automatic-Module-Name" )
!= null )
+ Manifest manifest = jarFile.getManifest();
+
+ if ( manifest != null
+ && manifest.getMainAttributes().getValue(
"Automatic-Module-Name" ) != null )
{
moduleDescriptor.moduleNameSource = "MANIFEST";
}
