Merge pull request #137 from nebula-plugins/gradle-9

rpalcolea · web-flow · commit 9013cb878ddf · 2025-06-24T11:25:08.000-07:00
Gradle 9.x support
diff --git a/.github/workflows/nebula.yml b/.github/workflows/nebula.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         # test against latest update of some major Java version(s), as well as specific LTS version(s)
-        java: [8, 17, 21]
+        java: [17, 21]
     name: Gradle Build without Publish
     steps:
       - uses: actions/checkout@v4
@@ -35,7 +35,7 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: |
-            8
+            17
             ${{ matrix.java }}
           java-package: jdk
       - uses: actions/cache@v3
@@ -75,7 +75,7 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: |
-            8
+            17
             21
           java-package: jdk
       - uses: actions/cache@v3
@@ -120,7 +120,7 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: |
-            8
+            17
             21
           java-package: jdk
       - uses: actions/cache@v3
diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 plugins {
-    id 'com.netflix.nebula.plugin-plugin' version '21.3.3'
+    id 'com.netflix.nebula.plugin-plugin' version '22.0.2'
 }
 
 description = 'Allows projects to leave off version numbers in dependencies section and have versions recommended by other sources'
diff --git a/gradle.lockfile b/gradle.lockfile
@@ -4,28 +4,29 @@
 cglib:cglib-nodep:3.2.2=integTestRuntimeClasspath,testRuntimeClasspath
 com.google.guava:guava:20.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.netflix.nebula:nebula-gradle-interop:2.3.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.netflix.nebula:nebula-test:10.6.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.netflix.nebula:nebula-test:11.0.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 javax.inject:javax.inject:1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 junit:junit:4.13.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-lang3:3.8.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apache.groovy:groovy:4.0.4=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.maven:maven-artifact:3.8.3=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.maven:maven-builder-support:3.8.3=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.maven:maven-model-builder:3.8.3=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.maven:maven-model:3.8.3=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apiguardian:apiguardian-api:1.1.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy:3.0.12=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.codehaus.plexus:plexus-interpolation:1.26=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.codehaus.plexus:plexus-utils:3.3.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest-core:1.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:2.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib:2.1.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.jetbrains:annotations:13.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.9.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.9.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.13.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.13.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.13.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:2.4=integTestRuntimeClasspath,testRuntimeClasspath
-org.opentest4j:opentest4j:1.2.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.3-groovy-3.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-junit4:2.3-groovy-3.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.opentest4j:opentest4j:1.3.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.spockframework:spock-core:2.3-groovy-4.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.spockframework:spock-junit4:2.3-groovy-4.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.xmlunit:xmlunit-core:2.6.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 empty=annotationProcessor,integTestAnnotationProcessor,testAnnotationProcessor
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-rc-1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/integTest/groovy/netflix/nebula/dependency/recommender/publisher/MavenBomXmlGeneratorIntegrationSpec.groovy b/src/integTest/groovy/netflix/nebula/dependency/recommender/publisher/MavenBomXmlGeneratorIntegrationSpec.groovy
@@ -15,6 +15,7 @@
  */
 package netflix.nebula.dependency.recommender.publisher
 
+import groovy.xml.XmlSlurper
 import nebula.test.IntegrationSpec
 import nebula.test.dependencies.DependencyGraphBuilder
 import nebula.test.dependencies.GradleDependencyGenerator
diff --git a/src/main/groovy/netflix/nebula/dependency/recommender/ConfigureUtil.groovy b/src/main/groovy/netflix/nebula/dependency/recommender/ConfigureUtil.groovy
@@ -0,0 +1,99 @@
+package netflix.nebula.dependency.recommender
+
+import groovy.transform.CompileDynamic;
+import org.codehaus.groovy.runtime.GeneratedClosure;
+import org.gradle.api.Action;
+import org.gradle.internal.Actions;
+import org.gradle.internal.metaobject.ConfigureDelegate;
+import org.gradle.internal.metaobject.DynamicInvokeResult;
+import org.gradle.internal.metaobject.DynamicObject;
+import org.gradle.internal.metaobject.DynamicObjectUtil
+import org.gradle.util.Configurable;
+import org.gradle.util.internal.ClosureBackedAction;
+
+import javax.annotation.Nullable;
+
+@CompileDynamic
+class ConfigureUtil {
+
+    static class IncompleteInputException extends RuntimeException {
+        private final Collection missingKeys;
+
+        IncompleteInputException(String message, Collection missingKeys) {
+            super(message);
+            this.missingKeys = missingKeys;
+        }
+
+        Collection getMissingKeys() {
+            return missingKeys;
+        }
+    }
+
+    /**
+     * <p>Configures {@code target} with {@code configureClosure}, via the {@link Configurable} interface if necessary.</p>
+     *
+     * <p>If {@code target} does not implement {@link Configurable} interface, it is set as the delegate of a clone of
+     * {@code configureClosure} with a resolve strategy of {@code DELEGATE_FIRST}.</p>
+     *
+     * <p>If {@code target} does implement the {@link Configurable} interface, the {@code configureClosure} will be passed to
+     * {@code delegate}'s {@link Configurable#configure(Closure)} method.</p>
+     *
+     * @param configureClosure The configuration closure
+     * @param target The object to be configured
+     * @return The delegate param
+     */
+    static <T> T configure(@Nullable Closure configureClosure, T target) {
+        if (configureClosure == null) {
+            return target;
+        }
+
+        if (target instanceof Configurable) {
+            ((Configurable) target).configure(configureClosure);
+        } else {
+            configureTarget(configureClosure, target, new ConfigureDelegate(configureClosure, target));
+        }
+
+        return target;
+    }
+
+    /**
+     * Creates an action that uses the given closure to configure objects of type T.
+     */
+    static <T> Action<T> configureUsing(@Nullable final Closure configureClosure) {
+        if (configureClosure == null) {
+            return Actions.doNothing();
+        }
+
+        return new WrappedConfigureAction<T>(configureClosure);
+    }
+
+
+    private static <T> void configureTarget(Closure configureClosure, T target, ConfigureDelegate closureDelegate) {
+        if (!(configureClosure instanceof GeneratedClosure)) {
+            new ClosureBackedAction<T>(configureClosure, Closure.DELEGATE_FIRST, false).execute(target);
+            return;
+        }
+
+        // Hackery to make closure execution faster, by short-circuiting the expensive property and method lookup on Closure
+        Closure withNewOwner = configureClosure.rehydrate(target, closureDelegate, configureClosure.getThisObject());
+        new ClosureBackedAction<T>(withNewOwner, Closure.OWNER_ONLY, false).execute(target);
+    }
+
+
+    static class WrappedConfigureAction<T> implements Action<T> {
+        private final Closure configureClosure;
+
+        WrappedConfigureAction(Closure configureClosure) {
+            this.configureClosure = configureClosure;
+        }
+
+        @Override
+        void execute(T t) {
+            configure(configureClosure, t);
+        }
+
+        Closure getConfigureClosure() {
+            return configureClosure;
+        }
+    }
+}
diff --git a/src/main/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPlugin.java b/src/main/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPlugin.java
@@ -38,7 +38,6 @@
 import org.gradle.api.logging.Logger;
 import org.gradle.api.logging.Logging;
 import org.gradle.api.plugins.ExtraPropertiesExtension;
-import org.gradle.internal.deprecation.DeprecationLogger;
 
 import java.lang.reflect.Method;
 import java.util.*;
@@ -101,7 +100,7 @@ public Unit invoke(ResolvableDependencies resolvableDependencies) {
                             }
 
                             for (Dependency dependency : resolvableDependencies.getDependencies()) {
-                                applyRecommendationToDependency(rsFactory, dependency, new ArrayList<ProjectDependency>());
+                                applyRecommendationToDependency(rsFactory, dependency, new ArrayList<ProjectDependency>(), project);
 
                                 // if project dependency, pull all first orders and apply recommendations if missing dependency versions
                                 // dependency.getProjectConfiguration().allDependencies iterate and inspect them as well
@@ -160,7 +159,7 @@ private boolean isExcludedConfiguration(String confName) {
         return false;
     }
 
-    private void applyRecommendationToDependency(final RecommendationStrategyFactory factory, Dependency dependency, List<ProjectDependency> visited) {
+    private void applyRecommendationToDependency(final RecommendationStrategyFactory factory, Dependency dependency, List<ProjectDependency> visited, Project rootProject) {
         if (dependency instanceof ExternalModuleDependency) {
             factory.getRecommendationStrategy().inspectDependency(dependency);
         } else if (dependency instanceof ProjectDependency) {
@@ -171,10 +170,11 @@ private void applyRecommendationToDependency(final RecommendationStrategyFactory
                 try {
                     ProjectDependency.class.getMethod("getTargetConfiguration");
                     String targetConfiguration = projectDependency.getTargetConfiguration() == null ? Dependency.DEFAULT_CONFIGURATION : projectDependency.getTargetConfiguration();
+                    Project dependencyProject = rootProject.findProject(projectDependency.getPath());
+                    if (dependencyProject != null) {
+                        configuration[0] = dependencyProject.getConfigurations().getByName(targetConfiguration);
+                    }
 
-                    DeprecationLogger.whileDisabled(() -> {
-                        configuration[0] = projectDependency.getDependencyProject().getConfigurations().getByName(targetConfiguration);
-                    });
                 } catch (NoSuchMethodException ignore) {
                     try {
                         Method method = ProjectDependency.class.getMethod("getProjectConfiguration");
@@ -183,9 +183,11 @@ private void applyRecommendationToDependency(final RecommendationStrategyFactory
                         throw new RuntimeException("Unable to retrieve configuration for project dependency", e);
                     }
                 }
-                DependencySet dependencies = configuration[0].getAllDependencies();
-                for (Dependency dep : dependencies) {
-                    applyRecommendationToDependency(factory, dep, visited);
+                if (configuration[0] != null) {
+                    DependencySet dependencies = configuration[0].getAllDependencies();
+                    for (Dependency dep : dependencies) {
+                        applyRecommendationToDependency(factory, dep, visited, rootProject);
+                    }
                 }
             }
         }
diff --git a/src/main/groovy/netflix/nebula/dependency/recommender/ExtendRecommenderConfigurationAction.java b/src/main/groovy/netflix/nebula/dependency/recommender/ExtendRecommenderConfigurationAction.java
@@ -43,7 +43,7 @@ public void execute(Configuration configuration) {
             Configuration toExtend = bom;
             if (!project.getRootProject().equals(project)) {
                 toExtend = createCopy(bom.getDependencies(), bom.getDependencyConstraints());
-                project.getConfigurations().add(toExtend);
+                // No need to add to configurations - createCopy already handles this
             }
             configuration.extendsFrom(toExtend);
         } else {
diff --git a/src/main/groovy/netflix/nebula/dependency/recommender/provider/IvyRecommendationProvider.groovy b/src/main/groovy/netflix/nebula/dependency/recommender/provider/IvyRecommendationProvider.groovy
@@ -1,6 +1,7 @@
 package netflix.nebula.dependency.recommender.provider
 
 import groovy.transform.CompileDynamic
+import groovy.xml.XmlSlurper
 import org.gradle.api.Project
 
 class IvyRecommendationProvider extends FileBasedRecommendationProvider {
diff --git a/src/main/groovy/netflix/nebula/dependency/recommender/provider/RecommendationProviderContainer.java b/src/main/groovy/netflix/nebula/dependency/recommender/provider/RecommendationProviderContainer.java
@@ -16,14 +16,14 @@
 package netflix.nebula.dependency.recommender.provider;
 
 import groovy.lang.Closure;
+import netflix.nebula.dependency.recommender.ConfigureUtil;
 import netflix.nebula.dependency.recommender.DependencyRecommendationsPlugin;
 import netflix.nebula.dependency.recommender.RecommendationStrategies;
 import org.gradle.api.*;
 import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.internal.ConfigureByMapAction;
 import org.gradle.api.internal.DefaultNamedDomainObjectList;
 import org.gradle.api.model.ObjectFactory;
-import org.gradle.util.ConfigureUtil;
 import org.gradle.util.GradleVersion;
 
 import java.io.File;
diff --git a/src/main/groovy/netflix/nebula/dependency/recommender/publisher/MavenBomXmlGenerator.groovy b/src/main/groovy/netflix/nebula/dependency/recommender/publisher/MavenBomXmlGenerator.groovy
@@ -23,6 +23,7 @@ import org.gradle.api.artifacts.ModuleVersionIdentifier
 import org.gradle.api.artifacts.ResolvedDependency
 import org.gradle.api.publish.maven.MavenPublication
 
+@CompileDynamic
 class MavenBomXmlGenerator {
     Project project
 
diff --git a/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginSpec.groovy b/src/test/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginSpec.groovy
@@ -304,7 +304,7 @@ class DependencyRecommendationsPluginSpec extends IntegrationSpec  {
             '''.stripIndent()
 
         when:
-        def result = runTasksSuccessfully('dependencies')//, '--configuration', 'compile')
+        def result = runTasksSuccessfully('dependencies', '-Dorg.gradle.configuration-cache=false')//, '--configuration', 'compile')
 
         then:
         result.standardOutput.contains 'test.nebula:foo -> 1.0.0'

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`* limitations under the License.`
`15`	`15`	`*/`
`16`	`16`	`plugins {`
`17`		`- id 'com.netflix.nebula.plugin-plugin' version '21.3.3'`
	`17`	`+ id 'com.netflix.nebula.plugin-plugin' version '22.0.2'`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`description = 'Allows projects to leave off version numbers in dependencies section and have versions recommended by other sources'`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public void execute(Configuration configuration) {`
`43`	`43`	`Configuration toExtend = bom;`
`44`	`44`	`if (!project.getRootProject().equals(project)) {`
`45`	`45`	`toExtend = createCopy(bom.getDependencies(), bom.getDependencyConstraints());`
`46`		`- project.getConfigurations().add(toExtend);`
	`46`	`+ // No need to add to configurations - createCopy already handles this`
`47`	`47`	`}`
`48`	`48`	`configuration.extendsFrom(toExtend);`
`49`	`49`	`} else {`