Merge pull request #192 from basil/testScoped

Plugin compatibility tester is re-adding test-scoped dependencies rather than merely updating them
jenkinsci · Sep 30, 2019 · ba980f3 · ba980f3
2 parents f7d00ce + 1d8d9da
commit ba980f3
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/plugins-compat-tester/src/main/java/org/jenkins/tools/test/model/MavenPom.java b/plugins-compat-tester/src/main/java/org/jenkins/tools/test/model/MavenPom.java
@@ -207,7 +207,12 @@ public void addDependencies(Map<String,VersionNumber> toAdd, Map<String,VersionN
                 }
             }
             version.addText(replacement.toString());
-            toReplaceUsed.put(trimmedArtifactId, replacement);
+            Element scope = mavenDependency.element("scope");
+            if (scope != null && scope.getTextTrim().equals("test")) {
+                toReplaceTestUsed.put(trimmedArtifactId, replacement);
+            } else {
+                toReplaceUsed.put(trimmedArtifactId, replacement);
+            }
         }
         // If the replacement dependencies weren't explicitly present in the pom, add them directly now
         toReplace.entrySet().removeAll(toReplaceUsed.entrySet());