allow ignoring test only deps with scope compile, add them to json re…

…port
DisyInformationssysteme · Jan 17, 2022 · 5ee0ea7 · 5ee0ea7
1 parent 33ebafd
commit 5ee0ea7
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -30,7 +30,7 @@ under the License.
   </parent>
 
   <artifactId>maven-dependency-plugin</artifactId>
-  <version>3.2.1-disy-1</version>
+  <version>3.2.1-disy-2</version>
   <packaging>maven-plugin</packaging>
 
   <name>Apache Maven Dependency Plugin</name>

diff --git a/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java b/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java
@@ -228,6 +228,9 @@ public abstract class AbstractAnalyzeMojo
     @Parameter
     private String[] ignoredUnusedDeclaredDependencies = new String[0];
 
+    @Parameter
+    private String[] ignoredCompileScopedUsedOnlyInTestsDependencies = new String[0];
+
     /**
      * List of project packaging that will be ignored.
      * <br/>
@@ -359,6 +362,8 @@ private boolean checkDependencies()
         ignoredUnusedDeclared.addAll( filterDependencies( unusedDeclared, ignoredDependencies ) );
         ignoredUnusedDeclared.addAll( filterDependencies( unusedDeclared, ignoredUnusedDeclaredDependencies ) );
 
+        filterDependencies( testArtifactsWithNonTestScope, ignoredCompileScopedUsedOnlyInTestsDependencies );
+
         boolean reported = false;
         boolean warning = false;
 
@@ -420,7 +425,7 @@ private boolean checkDependencies()
 
         if ( outputJSON )
         {
-            writeDependencyJSON( usedUndeclared, unusedDeclared );
+            writeDependencyJSON( usedUndeclared, unusedDeclared, testArtifactsWithNonTestScope );
         }
 
         if ( scriptableOutput )
@@ -526,9 +531,13 @@ private String joinArtifacts( List<Artifact> artifacts )
         return sb.toString();
     }
 
-    private void writeDependencyJSON( Set<Artifact> usedUndeclared, Set<Artifact> unusedDeclared ) 
+    private void writeDependencyJSON(
+        Set<Artifact> usedUndeclared,
+        Set<Artifact> unusedDeclared,
+        Set<Artifact> testArtifactsWithNonTestScope
+    )
     {
-        if ( !usedUndeclared.isEmpty() || !unusedDeclared.isEmpty() )
+        if ( !usedUndeclared.isEmpty() || !unusedDeclared.isEmpty() || !testArtifactsWithNonTestScope.isEmpty() )
         {
             StringBuilder buf = new StringBuilder();
 
@@ -550,6 +559,16 @@ private void writeDependencyJSON( Set<Artifact> usedUndeclared, Set<Artifact> un
                 buf.append( joinArtifacts( new ArrayList<>( unusedDeclared ) ) );
                 buf.append( "]" );
             }
+            if ( !testArtifactsWithNonTestScope.isEmpty() )
+            {
+                if ( !usedUndeclared.isEmpty() || !unusedDeclared.isEmpty() )
+                {
+                    buf.append( ", " );
+                }
+                buf.append( "testOnlyWithNonTestScope: [" );
+                buf.append( joinArtifacts( new ArrayList<>( testArtifactsWithNonTestScope ) ) );
+                buf.append( "]" );
+            }
             buf.append( "}" );
             getLog().warn( buf.toString() );
         }