Make a copy of a configuration before resolving

kordamp · Oct 24, 2020 · cabc056 · cabc056
1 parent 1dfaae7
commit cabc056
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/core/enforcer-rules/src/main/groovy/enforcer/rules/AbstractBanDependencies.groovy b/core/enforcer-rules/src/main/groovy/enforcer/rules/AbstractBanDependencies.groovy
@@ -126,10 +126,11 @@ abstract class AbstractBanDependencies extends AbstractStandardEnforcerRule {
         }
 
         context.logger.info("Resolving configuration ${configuration.name}.")
-        configuration.resolve()
+        Configuration cfg = configuration.copy()
+        cfg.resolve()
 
-        context.logger.info("Configuration ${configuration.name} contains ${configuration.resolvedConfiguration.resolvedArtifacts.size()} artifacts.")
-        artifacts.addAll(configuration.resolvedConfiguration.resolvedArtifacts)
+        context.logger.info("Configuration ${cfg.name} contains ${cfg.resolvedConfiguration.resolvedArtifacts.size()} artifacts.")
+        artifacts.addAll(cfg.resolvedConfiguration.resolvedArtifacts)
     }
 
     protected abstract Set<ResolvedArtifact> checkDependencies(EnforcerContext context, Set<ResolvedArtifact> artifacts)

diff --git a/core/enforcer-rules/src/main/groovy/enforcer/rules/BanDuplicateClasses.groovy b/core/enforcer-rules/src/main/groovy/enforcer/rules/BanDuplicateClasses.groovy
@@ -154,11 +154,12 @@ class BanDuplicateClasses extends AbstractResolveDependencies {
             ignorableDependencies.add(ignorableDependency)
         }
 
-        configuration.resolve()
+        Configuration cfg = configuration.copy()
+        cfg.resolve()
 
         Set<String> duplicates = []
 
-        for (ResolvedArtifact o : configuration.resolvedConfiguration.resolvedArtifacts) {
+        for (ResolvedArtifact o : cfg.resolvedConfiguration.resolvedArtifacts) {
             if (artifactsSeen.contains(o)) {
                 continue
             }

diff --git a/core/enforcer-rules/src/main/groovy/enforcer/rules/DependencyConvergence.groovy b/core/enforcer-rules/src/main/groovy/enforcer/rules/DependencyConvergence.groovy
@@ -74,17 +74,17 @@ class DependencyConvergence extends AbstractFilteringEnforcerRule {
             case AFTER_PROJECT:
                 // resolve
                 context.project.configurations.each { Configuration c ->
-                    if (c.canBeResolved) c.resolve()
+                    if (c.canBeResolved) c.copy().resolve()
                 }
                 break
             case AFTER_PROJECTS:
                 // resolve
                 context.project.configurations.each { Configuration c ->
-                    if (c.canBeResolved) c.resolve()
+                    if (c.canBeResolved) c.copy().resolve()
                 }
                 for (Project project : context.project.childProjects.values()) {
                     project.configurations.each { Configuration c ->
-                        if (c.canBeResolved) c.resolve()
+                        if (c.canBeResolved) c.copy().resolve()
                     }
                 }
                 break

diff --git a/core/enforcer-rules/src/main/groovy/enforcer/rules/EnforceBytecodeVersion.groovy b/core/enforcer-rules/src/main/groovy/enforcer/rules/EnforceBytecodeVersion.groovy
@@ -225,9 +225,10 @@ class EnforceBytecodeVersion extends AbstractResolveDependencies {
             return
         }
 
-        configuration.resolve()
+        Configuration cfg = configuration.copy()
+        cfg.resolve()
 
-        Set<ResolvedArtifact> resolvedArtifacts = configuration.resolvedConfiguration.resolvedArtifacts
+        Set<ResolvedArtifact> resolvedArtifacts = cfg.resolvedConfiguration.resolvedArtifacts
         resolvedArtifacts.removeAll(artifactsSeen)
         artifactsSeen.addAll(resolvedArtifacts)