Minor fixes addressing MR comments

apache · Nov 3, 2022 · 6b38a24 · 6b38a24
1 parent 7ba5624
commit 6b38a24
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/...cer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/DependencyVersionMap.java b/...cer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/DependencyVersionMap.java
@@ -131,21 +131,21 @@ public List<List<DependencyNode>> getConflictedVersionNumbers( List<String> incl
         List<List<DependencyNode>> output = new ArrayList<>();
         for ( List<DependencyNode> nodes : idsToNode.values() )
         {
-            if ( includes != null && !includes.isEmpty() )
+            List<DependencyNode> filteredNodes = nodes;
+            if ( formattedIncludes != null && !formattedIncludes.isEmpty() )
             {
-                List<DependencyNode> filteredNodes = new ArrayList<>();
+                filteredNodes = new ArrayList<>();
                 for ( DependencyNode node : nodes )
                 {
                     if ( includeArtifact( node.getArtifact(), formattedIncludes, formattedExcludes ) )
                     {
                         filteredNodes.add( node );
                     }
                 }
-                nodes = filteredNodes;
             }
-            if ( containsConflicts( nodes ) )
+            if ( containsConflicts( filteredNodes ) )
             {
-                output.add( nodes );
+                output.add( filteredNodes );
             }
         }
         return output;

diff --git a/...enforcer-plugin/src/it/projects/dependency-convergence_exclude_failure/invoker.properties b/...enforcer-plugin/src/it/projects/dependency-convergence_exclude_failure/invoker.properties
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.buildResult=failure
+invoker.buildResult=failure
diff --git a/...gin/src/it/projects/dependency-convergence_include-all-exclude_failure/invoker.properties b/...gin/src/it/projects/dependency-convergence_include-all-exclude_failure/invoker.properties
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.buildResult=failure
+invoker.buildResult=failure
diff --git a/...-plugin/src/it/projects/dependency-convergence_include-exclude_failure/invoker.properties b/...-plugin/src/it/projects/dependency-convergence_include-exclude_failure/invoker.properties
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.buildResult=failure
+invoker.buildResult=failure
diff --git a/...enforcer-plugin/src/it/projects/dependency-convergence_include_failure/invoker.properties b/...enforcer-plugin/src/it/projects/dependency-convergence_include_failure/invoker.properties
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.buildResult=failure
+invoker.buildResult=failure