README.adoc

@@ -287,7 +287,8 @@ The following table shows the compatibility of the plugin version with Develocit
 
 |===
 |Jenkins Gradle Plugin version  | Injected Develocity Maven extension version        | Injected Common Custom User Data Maven extension version  | Minimum supported Develocity version
-|Next version                   | 1.20.1                                             | 1.12.5                                                    | 2023.4
+|Next version                   | 1.21.1                                             | 2.0                                                       | 2024.1
+|2.11                           | 1.21.1                                             | 2.0                                                       | 2024.1
 |2.10                           | 1.20.1                                             | 1.12.5                                                    | 2023.4
 |2.9                            | 1.19.3                                             | 1.12.4                                                    | 2023.3
 |2.8.2                          | 1.18.1                                             | 1.12.2                                                    | 2023.2

acceptance-tests/build.gradle.kts

@@ -5,7 +5,7 @@ import java.net.URL
 
 plugins {
     java
-    id("de.undercouch.download") version "5.5.0"
+    id("de.undercouch.download") version "5.6.0"
 }
 
 val ciJenkinsBuild: Boolean by (gradle as ExtensionAware).extra
@@ -34,7 +34,7 @@ dependencies {
 
     implementation("org.jenkins-ci:acceptance-test-harness:5740.vd30f30408987")
 
-    testImplementation(platform("io.netty:netty-bom:4.1.106.Final"))
+    testImplementation(platform("io.netty:netty-bom:4.1.108.Final"))
     testImplementation("io.ratpack:ratpack-test:2.0.0-rc-1")
 
     add(gradlePlugin.name, project(path = ":", configuration = "gradlePluginJpi"))
@@ -113,7 +113,7 @@ data class JenkinsVersion(val version: String, val downloadUrl: URL, val javaVer
 
         private const val LATEST_VERSION = "latest"
         private const val LATEST_LTS_VERSION = "latest-lts"
-        private const val V2_375_VERSION = "2.375.4"
+        private const val V2_388_VERSION = "2.388"
 
         private const val MIRROR = "https://updates.jenkins.io"
 
@@ -123,7 +123,7 @@ data class JenkinsVersion(val version: String, val downloadUrl: URL, val javaVer
 
         val LATEST = of(LATEST_VERSION)
         val LATEST_LTS = of(LATEST_LTS_VERSION)
-        val V2_375 = of(V2_375_VERSION)
+        val V2_375 = of(V2_388_VERSION)
 
         private fun of(version: String, javaVersion: JavaLanguageVersion = JAVA_11): JenkinsVersion {
             val downloadUrl =
@@ -145,7 +145,7 @@ data class JenkinsVersion(val version: String, val downloadUrl: URL, val javaVer
     }
 
     val isDefault: Boolean
-        get() = version == V2_375_VERSION
+        get() = version == V2_388_VERSION
 
     val label: String
         get() = if (isJenkinsVersion(version)) {

acceptance-tests/src/test/java/hudson/plugins/gradle/GradleEnterpriseErrorsTest.java

@@ -39,7 +39,7 @@ public void checkForGradleEnterpriseErrors() {
         GradleStep gradle = job.addBuildStep(GradleStep.class);
         gradle.setVersion(GRADLE_VERSION);
         gradle.setSwitches("--no-daemon");
-        gradle.setTasks("helloWorld -Dcom.gradle.scan.trigger-synthetic-error=true");
+        gradle.setTasks("helloWorld -Dcom.gradle.scan.trigger-synthetic-error=true -Ddevelocity.scan.trigger-synthetic-error=true");
         job.save();
 
         // when

acceptance-tests/src/test/java/hudson/plugins/gradle/GradleInjectionTest.java

@@ -178,7 +178,7 @@ public void gradlePluginRepoPasswordIsMasked() {
         // then
         build.shouldSucceed();
         assertBuildScanPublished(build);
-        build.action(EnvInjectAction.class).shouldContain("JENKINSGRADLEPLUGIN_GRADLE_PLUGIN_REPOSITORY_PASSWORD", "[*******]");
+        build.action(EnvInjectAction.class).shouldContain("GRADLE_PLUGIN_REPOSITORY_PASSWORD", "[*******]");
     }
 
     @Test

build.gradle.kts

@@ -9,7 +9,7 @@ import java.util.zip.ZipFile
 plugins {
     id("org.jenkins-ci.jpi") version "0.50.0"
     id("ru.vyarus.animalsniffer") version "1.7.1"
-    id("com.github.spotbugs") version "6.0.7"
+    id("com.github.spotbugs") version "6.0.9"
     id("codenarc")
     id("buildlogic.reproducible-archives")
 }
@@ -23,11 +23,15 @@ val coreBomVersion = "1500.ve4d05cd32975"
 
 val gradleExt = (gradle as ExtensionAware).extra
 
-val gradleEnterpriseMavenExtensionVersion: String by gradleExt
+val develocityMavenExtensionVersion: String by gradleExt
 val commonCustomUserDataMavenExtensionVersion: String by gradleExt
 val ciJenkinsBuild: Boolean by gradleExt
 val isCi: Boolean by gradleExt
 
+repositories {
+    mavenCentral()
+}
+
 jenkinsPlugin {
     // Version of Jenkins core this plugin depends on.
     jenkinsVersion.set("${coreBaseVersion}.${corePatchVersion}")
@@ -110,9 +114,9 @@ dependencies {
         exclude(group = "commons-logging", module = "commons-logging")
     }
 
-    implementation("com.fasterxml.jackson.core:jackson-databind:2.16.1")
+    implementation("com.fasterxml.jackson.core:jackson-databind:2.17.0")
 
-    add(includedLibs.name, "com.gradle:gradle-enterprise-maven-extension:${gradleEnterpriseMavenExtensionVersion}")
+    add(includedLibs.name, "com.gradle:develocity-maven-extension:${develocityMavenExtensionVersion}")
     add(includedLibs.name, "com.gradle:common-custom-user-data-maven-extension:${commonCustomUserDataMavenExtensionVersion}")
     add(includedLibs.name, project(path = ":configuration-maven-extension", configuration = "mvnExtension"))
 
@@ -126,7 +130,7 @@ dependencies {
     testImplementation("org.jenkins-ci.plugins:pipeline-maven:3.10.0")
     testImplementation("org.spockframework:spock-core:2.3-groovy-2.5")
     testImplementation("org.spockframework:spock-junit4:2.3-groovy-2.5")
-    testImplementation("net.bytebuddy:byte-buddy:1.14.11")
+    testImplementation("net.bytebuddy:byte-buddy:1.14.13")
     testImplementation("org.objenesis:objenesis:3.3")
 
     testImplementation("io.ratpack:ratpack-groovy-test:1.9.0") {
@@ -261,7 +265,7 @@ val localizeMessages: Task by tasks.getting(LocalizationTask::class) {
 }
 
 val generateExtensionsVersions: Task by tasks.creating {
-    inputs.property("gradleEnterpriseMavenExtensionVersion", gradleEnterpriseMavenExtensionVersion)
+    inputs.property("develocityMavenExtensionVersion", develocityMavenExtensionVersion)
     inputs.property("commonCustomUserDataMavenExtensionVersion", commonCustomUserDataMavenExtensionVersion)
 
     val srcDir = layout.buildDirectory.file("generated/sources/extensionsVersions/java/main")
@@ -282,7 +286,7 @@ val generateExtensionsVersions: Task by tasks.creating {
 
             public final class ExtensionsVersions {
 
-                public static final String GE_EXTENSION_VERSION = "$gradleEnterpriseMavenExtensionVersion";
+                public static final String DEVELOCITY_EXTENSION_VERSION = "$develocityMavenExtensionVersion";
                 public static final String CCUD_EXTENSION_VERSION = "$commonCustomUserDataMavenExtensionVersion";
 
                 private ExtensionsVersions() {
@@ -317,7 +321,7 @@ tasks.processTestResources {
 
 tasks.processResources {
     filesMatching("hudson/plugins/gradle/injection/InjectionConfig/help-injectMavenExtension.html") {
-        expand("gradleEnterpriseMavenExtensionVersion" to gradleEnterpriseMavenExtensionVersion)
+        expand("develocityMavenExtensionVersion" to develocityMavenExtensionVersion)
     }
     filesMatching("hudson/plugins/gradle/injection/InjectionConfig/help-injectCcudExtension.html") {
         expand("commonCustomUserDataMavenExtensionVersion" to commonCustomUserDataMavenExtensionVersion)

configuration-maven-extension/build.gradle.kts

@@ -13,7 +13,7 @@ group = "com.gradle"
 description = "Maven extension to configure injected Gradle Enterprise Maven extension"
 version = "1.0.0"
 
-val gradleEnterpriseMavenExtensionVersion: String by (gradle as ExtensionAware).extra
+val develocityMavenExtensionVersion: String by (gradle as ExtensionAware).extra
 
 repositories {
     mavenCentral()
@@ -23,7 +23,7 @@ val mvnExtension: Configuration by configurations.creating { isCanBeConsumed = t
 
 dependencies {
     compileOnly("org.apache.maven:maven-core:3.8.7")
-    compileOnly("com.gradle:gradle-enterprise-maven-extension:${gradleEnterpriseMavenExtensionVersion}")
+    compileOnly("com.gradle:develocity-maven-extension:${develocityMavenExtensionVersion}")
 }
 
 val jar by tasks.getting(Jar::class)

configuration-maven-extension/src/main/java/com/gradle/jenkins/maven/extension/internal/DevelocityConfigurerListener.java

@@ -1,17 +1,17 @@
 package com.gradle.jenkins.maven.extension.internal;
 
-import com.gradle.maven.extension.api.GradleEnterpriseApi;
-import com.gradle.maven.extension.api.GradleEnterpriseListener;
+import com.gradle.develocity.agent.maven.api.DevelocityApi;
+import com.gradle.develocity.agent.maven.api.DevelocityListener;
 import org.apache.maven.execution.MavenSession;
 import org.codehaus.plexus.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @Component(
-    role = GradleEnterpriseListener.class,
+    role = DevelocityListener.class,
     hint = "develocity-configurer"
 )
-public class DevelocityConfigurerListener implements GradleEnterpriseListener {
+public class DevelocityConfigurerListener implements DevelocityListener {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DevelocityConfigurerListener.class);
 
@@ -20,7 +20,7 @@ public class DevelocityConfigurerListener implements GradleEnterpriseListener {
     private static final String JENKINSGRADLEPLUGIN_MAVEN_PLUGIN_CONFIG_ALLOW_UNTRUSTED_SERVER = "JENKINSGRADLEPLUGIN_MAVEN_PLUGIN_CONFIG_ALLOW_UNTRUSTED_SERVER";
 
     @Override
-    public void configure(GradleEnterpriseApi api, MavenSession session) {
+    public void configure(DevelocityApi api, MavenSession session) {
         if (api.getServer() != null) {
             LOGGER.debug("Develocity server is already configured");
             return;

configuration-maven-extension/src/main/resources/META-INF/plexus/components.xml

@@ -2,7 +2,7 @@
 <component-set>
   <components>
     <component>
-      <role>com.gradle.maven.extension.api.GradleEnterpriseListener</role>
+      <role>com.gradle.develocity.agent.maven.api.DevelocityListener</role>
       <role-hint>develocity-configurer</role-hint>
       <implementation>com.gradle.jenkins.maven.extension.internal.DevelocityConfigurerListener</implementation>
       <isolated-realm>false</isolated-realm>

gradle.properties

@@ -1,3 +1,3 @@
-version = 2.10
+version = 2.11
 githubUser = jenkinsci
 org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m

settings.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    id("com.gradle.enterprise") version "3.16.2"
-    id("com.gradle.common-custom-user-data-gradle-plugin") version "1.12.1"
+    id("com.gradle.enterprise") version "3.17"
+    id("com.gradle.common-custom-user-data-gradle-plugin") version "2.0"
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 
@@ -20,8 +20,8 @@ val gradleExt = (gradle as ExtensionAware).extra
 val ciJenkinsBuild by gradleExt { System.getenv("JENKINS_URL") != null }
 val ciTeamCityBuild by gradleExt { System.getenv("TEAMCITY_VERSION") != null }
 val isCi by gradleExt { ciJenkinsBuild || ciTeamCityBuild }
-val gradleEnterpriseMavenExtensionVersion by gradleExt { "1.20.1" }
-val commonCustomUserDataMavenExtensionVersion by gradleExt { "1.12.5" }
+val develocityMavenExtensionVersion by gradleExt { "1.21.1" }
+val commonCustomUserDataMavenExtensionVersion by gradleExt { "2.0" }
 
 gradleEnterprise {
     projectId = "jenkinsci-gradle-plugin"

src/main/java/hudson/plugins/gradle/injection/BuildScanEnvironmentContributor.java

@@ -20,8 +20,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static hudson.plugins.gradle.injection.GradleInjectionAware.JENKINSGRADLEPLUGIN_GRADLE_PLUGIN_REPOSITORY_PASSWORD;
-
 @Extension
 public class BuildScanEnvironmentContributor extends EnvironmentContributor {
 
@@ -43,7 +41,8 @@ private static boolean alreadyExecuted(@Nonnull Run run) {
     public static class DevelocityParametersAction extends ParametersAction {
 
         private static final String GRADLE_ENTERPRISE_ACCESS_KEY = "GRADLE_ENTERPRISE_ACCESS_KEY";
-        private static final String GRADLE_ENTERPRISE_REPO_PASSWORD = JENKINSGRADLEPLUGIN_GRADLE_PLUGIN_REPOSITORY_PASSWORD;
+        private static final String DEVELOCITY_ACCESS_KEY = "DEVELOCITY_ACCESS_KEY";
+        private static final String GRADLE_PLUGIN_REPOSITORY_PASSWORD = InitScriptVariables.GRADLE_PLUGIN_REPOSITORY_PASSWORD.getEnvVar();
 
         private static final DevelocityParametersAction EMPTY = new DevelocityParametersAction();
 
@@ -66,17 +65,18 @@ static DevelocityParametersAction of(DevelocityLogger logger, @Nullable Secret a
                     logger.error("Develocity access key format is not valid");
                 } else {
                     values.add(new PasswordParameterValue(GRADLE_ENTERPRISE_ACCESS_KEY, accessKey.getPlainText()));
+                    values.add(new PasswordParameterValue(DEVELOCITY_ACCESS_KEY, accessKey.getPlainText()));
                 }
             }
             if (repoPassword != null) {
-                values.add(new PasswordParameterValue(GRADLE_ENTERPRISE_REPO_PASSWORD, repoPassword.getPlainText()));
+                values.add(new PasswordParameterValue(GRADLE_PLUGIN_REPOSITORY_PASSWORD, repoPassword.getPlainText()));
             }
             if (values.isEmpty()) {
                 return DevelocityParametersAction.empty();
             }
             return new DevelocityParametersAction(
                 values,
-                Stream.of(GRADLE_ENTERPRISE_ACCESS_KEY, GRADLE_ENTERPRISE_REPO_PASSWORD).collect(Collectors.toSet())
+                Stream.of(GRADLE_ENTERPRISE_ACCESS_KEY, DEVELOCITY_ACCESS_KEY, GRADLE_PLUGIN_REPOSITORY_PASSWORD).collect(Collectors.toSet())
             );
         }
     }

src/main/java/hudson/plugins/gradle/injection/CopyUtil.java

@@ -2,6 +2,7 @@
 
 import hudson.FilePath;
 import hudson.Util;
+import org.apache.commons.io.IOUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -26,6 +27,14 @@ public static String unsafeResourceDigest(String resourceName) {
         }
     }
 
+    public static String readResource(String resourceName) {
+        try {
+            return doWithResource(resourceName, IOUtils::toString);
+        } catch (IOException | InterruptedException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
     private static <T> T doWithResource(String resourceName, CheckedFunction<InputStream, T> action) throws IOException, InterruptedException {
         try (InputStream is = CopyUtil.class.getResourceAsStream("/hudson/plugins/gradle/injection/" + resourceName)) {
             if (is == null) {

src/main/java/hudson/plugins/gradle/injection/DevelocityExceptionLogProcessor.java

@@ -16,6 +16,14 @@ public final class DevelocityExceptionLogProcessor extends AbstractGradleLogProc
 
     private static final DevelocityExceptionDetector[] DETECTORS =
         {
+            new DevelocityExceptionDetector.ByPrefix(
+                BuildToolType.GRADLE,
+                "Internal error in Develocity Gradle plugin:"
+            ),
+            new DevelocityExceptionDetector.ByPrefix(
+                BuildToolType.MAVEN,
+                "[ERROR] Internal error in Develocity Maven extension:"
+            ),
             new DevelocityExceptionDetector.ByPrefix(
                 BuildToolType.GRADLE,
                 "Internal error in Gradle Enterprise Gradle plugin:"

src/main/java/hudson/plugins/gradle/injection/EnvUtil.java

@@ -51,11 +51,22 @@ public static String getEnv(EnvVars env, String key) {
     public static void removeEnvVars(Node node, Collection<String> keys) {
         keys.forEach(key -> removeEnvVar(node, key));
     }
+    public static void removeEnvVars(Node node, InitScriptVariables[] keys) {
+        for (InitScriptVariables key : keys) {
+            removeEnvVar(node, key);
+        }
+    }
 
     public static void removeEnvVar(Node node, String key) {
         setEnvVar(node, key, null);
     }
+    public static void removeEnvVar(Node node, InitScriptVariables key) {
+        setEnvVar(node, key, null);
+    }
 
+    public static void setEnvVar(Node node, InitScriptVariables key, @Nullable String value) {
+        setEnvVar(node, key.getEnvVar(), value);
+    }
     public static void setEnvVar(Node node, String key, @Nullable String value) {
         List<EnvironmentVariablesNodeProperty> all =
             node.getNodeProperties().getAll(EnvironmentVariablesNodeProperty.class);