commit 1f1b755e5f59beb0be425f2d408b3363b4119b24
author Andreas Dangel <adangel@apache.org> Fri Jul 23 15:29:48 2021 +0200
committer Andreas Dangel <adangel@apache.org> Fri Jul 23 15:41:51 2021 +0200
tree 1ebbbad6861ae83f73116a95d946e72f41746993
parent 7b82d6ddb1f75af50565d4fa37766909f1474ada

[MPMD-318] Incorrect aux classpath if 'includeTests' set to true

src/main/java/org/apache/maven/plugins/pmd/PmdReport.java

diff --git a/src/main/java/org/apache/maven/plugins/pmd/PmdReport.java b/src/main/java/org/apache/maven/plugins/pmd/PmdReport.java
index e0f1b97..cccbcd4 100644
--- a/src/main/java/org/apache/maven/plugins/pmd/PmdReport.java
+++ b/src/main/java/org/apache/maven/plugins/pmd/PmdReport.java
@@ -23,11 +23,9 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
-import java.util.Set;
 
 import org.apache.maven.doxia.sink.Sink;
 import org.apache.maven.plugins.annotations.Component;
@@ -548,7 +546,7 @@
     {
         try
         {
-            Set<String> classpath = new HashSet<>();
+            List<String> classpath = new ArrayList<>();
             if ( aggregate )
             {
                 List<String> dependencies = new ArrayList<>();
@@ -563,7 +561,8 @@
                 }
                 TransformableFilter filter = new AndFilter( Arrays.asList(
                         new ExclusionsFilter( exclusionPatterns ),
-                        includeTests ? ScopeFilter.including( "compile", "test" ) : ScopeFilter.including( "compile" )
+                        includeTests ? ScopeFilter.including( "compile", "test" )
+                                     : ScopeFilter.including( "compile" )
                 ) );
 
                 for ( MavenProject localProject : reactorProjects )
@@ -572,20 +571,15 @@
                             session.getProjectBuildingRequest() );
 
                     Iterable<ArtifactResult> resolvedDependencies = dependencyResolver.resolveDependencies(
-                            buildingRequest, localProject.getModel(), filter );
+                            buildingRequest, localProject.getDependencies(), null, filter );
 
                     for ( ArtifactResult resolvedArtifact : resolvedDependencies )
                     {
                         dependencies.add( resolvedArtifact.getArtifact().getFile().toString() );
                     }
 
-                    List<String> projectClasspath = new ArrayList<>(
-                            localProject.getCompileClasspathElements() );
-
-                    if ( includeTests )
-                    {
-                        projectClasspath.addAll( localProject.getTestClasspathElements() );
-                    }
+                    List<String> projectClasspath = includeTests ? localProject.getTestClasspathElements()
+                            : localProject.getCompileClasspathElements();
 
                     // Add the project's target folder first
                     classpath.addAll( projectClasspath );
@@ -613,12 +607,8 @@
             }
             else
             {
-                classpath.addAll( project.getCompileClasspathElements() );
-
-                if ( includeTests )
-                {
-                    classpath.addAll( project.getTestClasspathElements() );
-                }
+                classpath.addAll( includeTests ? project.getTestClasspathElements()
+                                               : project.getCompileClasspathElements() );
 
                 getLog().debug( "Using aux classpath: " + classpath );
             }