You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/07/31 22:25:00 UTC

[maven-dependency-plugin] branch space created (now ca9879d)

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a change to branch space
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git.


      at ca9879d  Avoid trailing whitespace

This branch includes the following new commits:

     new ca9879d  Avoid trailing whitespace

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[maven-dependency-plugin] 01/01: Avoid trailing whitespace

Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch space
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git

commit ca9879d17ebae9b0957ad7dcb734f4140d9c3078
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Aug 1 00:24:51 2020 +0200

    Avoid trailing whitespace
---
 .../dependency/resolvers/ResolveDependenciesMojo.java      |  2 +-
 .../dependency/resolvers/ResolveDependenciesMojoTest.java  | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java
index e745b62..e2131c4 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java
@@ -219,7 +219,7 @@ public class ResolveDependenciesMojo
 
             if ( theOutputScope && artifact.isOptional() )
             {
-                messageBuilder.a( " (optional) " );
+                messageBuilder.a( " (optional)" );
             }
 
             // dependencies:collect won't download jars
diff --git a/src/test/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojoTest.java b/src/test/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojoTest.java
index 74b45f6..0bc892f 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojoTest.java
@@ -24,6 +24,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.versioning.VersionRange;
 import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
 import org.apache.maven.plugins.dependency.utils.DependencyStatusSets;
 
@@ -56,6 +57,19 @@ public class ResolveDependenciesMojoTest
     {
         doTestDependencyStatusLog( new HashSet<Artifact>() );
     }
+    public void testOptionalDependencyFormatting() throws IOException
+    {
+        Set<Artifact> set = new HashSet<>();
+        Artifact artifact = stubFactory.createArtifact("g", "a", VersionRange.createFromVersion( "1.0"),
+                "test", "jar", null, true);
+        set.add(artifact);
+        doTestDependencyStatusLog( set );
+        ResolveDependenciesMojo mojo = newMojo( new DependencyStatusSets() );
+        mojo.results.setResolvedDependencies( set );
+        String output = mojo.getOutput( false, true, false );
+        assertTrue( output.contains( "g:a:jar:1.0:test (optional)" + System.lineSeparator() ) );
+
+    }
 
     public void doTestDependencyStatusLog( Set<Artifact> artifacts )
     {