gradle · erichaagdev · Dec 20, 2024 · Nov 11, 2024
diff --git a/.github/actions/gradle/experiment-1/action.yml b/.github/actions/gradle/experiment-1/action.yml
@@ -80,19 +80,19 @@ runs:
         if [ ! -z "${{ inputs.args }}" ]; then
           ARG_ARGS="${{ inputs.args }}"
         fi
-        ARG_GE_URL=""
+        ARG_DEVELOCITY_URL=""
         if [ ! -z "${{ inputs.gradleEnterpriseUrl }}" ]; then
-          ARG_GE_URL="${{ inputs.gradleEnterpriseUrl }}"
+          ARG_DEVELOCITY_URL="${{ inputs.gradleEnterpriseUrl }}"
         fi
         if [ ! -z "${{ inputs.develocityUrl }}" ]; then
-          ARG_GE_URL="${{ inputs.develocityUrl }}"
+          ARG_DEVELOCITY_URL="${{ inputs.develocityUrl }}"
         fi
-        ARG_GE_ENABLE=""
+        ARG_DEVELOCITY_ENABLE=""
         if [ "${{ inputs.enableGradleEnterprise }}" == "true" ]; then
-          ARG_GE_ENABLE="${{ inputs.enableGradleEnterprise }}"
+          ARG_DEVELOCITY_ENABLE="${{ inputs.enableGradleEnterprise }}"
         fi
         if [ "${{ inputs.enableDeveocity }}" == "true" ]; then
-          ARG_GE_ENABLE="${{ inputs.enableDeveocity }}"
+          ARG_DEVELOCITY_ENABLE="${{ inputs.enableDeveocity }}"
         fi
 
         # Navigate into the folder containing the validation scripts
@@ -107,8 +107,8 @@ runs:
           ${ARG_PROJECT_DIR:+"-p" "$ARG_PROJECT_DIR"} \
           ${ARG_TASKS:+"-t" "$ARG_TASKS"} \
           ${ARG_ARGS:+"-a" "$ARG_ARGS"} \
-          ${ARG_GE_URL:+"-s" "$ARG_GE_URL"} \
-          ${ARG_GE_ENABLE:+"-e"} \
+          ${ARG_DEVELOCITY_URL:+"-s" "$ARG_DEVELOCITY_URL"} \
+          ${ARG_DEVELOCITY_ENABLE:+"-e"} \
           ${RUNNER_DEBUG:+"--debug"}
 
         # Set the Build Scan urls as outputs

diff --git a/.github/actions/gradle/experiment-2/action.yml b/.github/actions/gradle/experiment-2/action.yml
@@ -83,19 +83,19 @@ runs:
         if [ ! -z "${{ inputs.args }}" ]; then
           ARG_ARGS="${{ inputs.args }}"
         fi
-        ARG_GE_URL=""
+        ARG_DEVELOCITY_URL=""
         if [ ! -z "${{ inputs.gradleEnterpriseUrl }}" ]; then
-          ARG_GE_URL="${{ inputs.gradleEnterpriseUrl }}"
+          ARG_DEVELOCITY_URL="${{ inputs.gradleEnterpriseUrl }}"
         fi
         if [ ! -z "${{ inputs.develocityUrl }}" ]; then
-          ARG_GE_URL="${{ inputs.develocityUrl }}"
+          ARG_DEVELOCITY_URL="${{ inputs.develocityUrl }}"
         fi
-        ARG_GE_ENABLE=""
+        ARG_DEVELOCITY_ENABLE=""
         if [ "${{ inputs.enableGradleEnterprise }}" == "true" ]; then
-          ARG_GE_ENABLE="${{ inputs.enableGradleEnterprise }}"
+          ARG_DEVELOCITY_ENABLE="${{ inputs.enableGradleEnterprise }}"
         fi
         if [ "${{ inputs.enableDeveocity }}" == "true" ]; then
-          ARG_GE_ENABLE="${{ inputs.enableDeveocity }}"
+          ARG_DEVELOCITY_ENABLE="${{ inputs.enableDeveocity }}"
         fi
         ARG_FAIL_IF_NOT_FULLY_CACHEABLE=""
         if [ "${{ inputs.failIfNotFullyCacheable }}" == "true" ]; then
@@ -114,8 +114,8 @@ runs:
           ${ARG_PROJECT_DIR:+"-p" "$ARG_PROJECT_DIR"} \
           ${ARG_TASKS:+"-t" "$ARG_TASKS"} \
           ${ARG_ARGS:+"-a" "$ARG_ARGS"} \
-          ${ARG_GE_URL:+"-s" "$ARG_GE_URL"} \
-          ${ARG_GE_ENABLE:+"-e"} \
+          ${ARG_DEVELOCITY_URL:+"-s" "$ARG_DEVELOCITY_URL"} \
+          ${ARG_DEVELOCITY_ENABLE:+"-e"} \
           ${ARG_FAIL_IF_NOT_FULLY_CACHEABLE:+"-f"} \
           ${RUNNER_DEBUG:+"--debug"}
 

diff --git a/.github/actions/gradle/experiment-3/action.yml b/.github/actions/gradle/experiment-3/action.yml
@@ -83,19 +83,19 @@ runs:
         if [ ! -z "${{ inputs.args }}" ]; then
           ARG_ARGS="${{ inputs.args }}"
         fi
-        ARG_GE_URL=""
+        ARG_DEVELOCITY_URL=""
         if [ ! -z "${{ inputs.gradleEnterpriseUrl }}" ]; then
-          ARG_GE_URL="${{ inputs.gradleEnterpriseUrl }}"
+          ARG_DEVELOCITY_URL="${{ inputs.gradleEnterpriseUrl }}"
         fi
         if [ ! -z "${{ inputs.develocityUrl }}" ]; then
-          ARG_GE_URL="${{ inputs.develocityUrl }}"
+          ARG_DEVELOCITY_URL="${{ inputs.develocityUrl }}"
         fi
-        ARG_GE_ENABLE=""
+        ARG_DEVELOCITY_ENABLE=""
         if [ "${{ inputs.enableGradleEnterprise }}" == "true" ]; then
-          ARG_GE_ENABLE="${{ inputs.enableGradleEnterprise }}"
+          ARG_DEVELOCITY_ENABLE="${{ inputs.enableGradleEnterprise }}"
         fi
         if [ "${{ inputs.enableDeveocity }}" == "true" ]; then
-          ARG_GE_ENABLE="${{ inputs.enableDeveocity }}"
+          ARG_DEVELOCITY_ENABLE="${{ inputs.enableDeveocity }}"
         fi
         ARG_FAIL_IF_NOT_FULLY_CACHEABLE=""
         if [ "${{ inputs.failIfNotFullyCacheable }}" == "true" ]; then
@@ -114,8 +114,8 @@ runs:
           ${ARG_PROJECT_DIR:+"-p" "$ARG_PROJECT_DIR"} \
           ${ARG_TASKS:+"-t" "$ARG_TASKS"} \
           ${ARG_ARGS:+"-a" "$ARG_ARGS"} \
-          ${ARG_GE_URL:+"-s" "$ARG_GE_URL"} \
-          ${ARG_GE_ENABLE:+"-e"} \
+          ${ARG_DEVELOCITY_URL:+"-s" "$ARG_DEVELOCITY_URL"} \
+          ${ARG_DEVELOCITY_ENABLE:+"-e"} \
           ${ARG_FAIL_IF_NOT_FULLY_CACHEABLE:+"-f"} \
           ${RUNNER_DEBUG:+"--debug"}
 

diff --git a/.github/actions/maven/experiment-1/action.yml b/.github/actions/maven/experiment-1/action.yml
@@ -83,19 +83,19 @@ runs:
         if [ ! -z "${{ inputs.args }}" ]; then
           ARG_ARGS="${{ inputs.args }}"
         fi
-        ARG_GE_URL=""
+        ARG_DEVELOCITY_URL=""
         if [ ! -z "${{ inputs.gradleEnterpriseUrl }}" ]; then
-          ARG_GE_URL="${{ inputs.gradleEnterpriseUrl }}"
+          ARG_DEVELOCITY_URL="${{ inputs.gradleEnterpriseUrl }}"
         fi
         if [ ! -z "${{ inputs.develocityUrl }}" ]; then
-          ARG_GE_URL="${{ inputs.develocityUrl }}"
+          ARG_DEVELOCITY_URL="${{ inputs.develocityUrl }}"
         fi
-        ARG_GE_ENABLE=""
+        ARG_DEVELOCITY_ENABLE=""
         if [ "${{ inputs.enableGradleEnterprise }}" == "true" ]; then
-          ARG_GE_ENABLE="${{ inputs.enableGradleEnterprise }}"
+          ARG_DEVELOCITY_ENABLE="${{ inputs.enableGradleEnterprise }}"
         fi
         if [ "${{ inputs.enableDeveocity }}" == "true" ]; then
-          ARG_GE_ENABLE="${{ inputs.enableDeveocity }}"
+          ARG_DEVELOCITY_ENABLE="${{ inputs.enableDeveocity }}"
         fi
         ARG_FAIL_IF_NOT_FULLY_CACHEABLE=""
         if [ "${{ inputs.failIfNotFullyCacheable }}" == "true" ]; then
@@ -114,8 +114,8 @@ runs:
           ${ARG_PROJECT_DIR:+"-p" "$ARG_PROJECT_DIR"} \
           ${ARG_GOALS:+"-g" "$ARG_GOALS"} \
           ${ARG_ARGS:+"-a" "$ARG_ARGS"} \
-          ${ARG_GE_URL:+"-s" "$ARG_GE_URL"} \
-          ${ARG_GE_ENABLE:+"-e"} \
+          ${ARG_DEVELOCITY_URL:+"-s" "$ARG_DEVELOCITY_URL"} \
+          ${ARG_DEVELOCITY_ENABLE:+"-e"} \
           ${ARG_FAIL_IF_NOT_FULLY_CACHEABLE:+"-f"} \
           ${RUNNER_DEBUG:+"--debug"}
 

diff --git a/.github/actions/maven/experiment-2/action.yml b/.github/actions/maven/experiment-2/action.yml
@@ -83,19 +83,19 @@ runs:
         if [ ! -z "${{ inputs.args }}" ]; then
           ARG_ARGS="${{ inputs.args }}"
         fi
-        ARG_GE_URL=""
+        ARG_DEVELOCITY_URL=""
         if [ ! -z "${{ inputs.gradleEnterpriseUrl }}" ]; then
-          ARG_GE_URL="${{ inputs.gradleEnterpriseUrl }}"
+          ARG_DEVELOCITY_URL="${{ inputs.gradleEnterpriseUrl }}"
         fi
         if [ ! -z "${{ inputs.develocityUrl }}" ]; then
-          ARG_GE_URL="${{ inputs.develocityUrl }}"
+          ARG_DEVELOCITY_URL="${{ inputs.develocityUrl }}"
         fi
-        ARG_GE_ENABLE=""
+        ARG_DEVELOCITY_ENABLE=""
         if [ "${{ inputs.enableGradleEnterprise }}" == "true" ]; then
-          ARG_GE_ENABLE="${{ inputs.enableGradleEnterprise }}"
+          ARG_DEVELOCITY_ENABLE="${{ inputs.enableGradleEnterprise }}"
         fi
         if [ "${{ inputs.enableDeveocity }}" == "true" ]; then
-          ARG_GE_ENABLE="${{ inputs.enableDeveocity }}"
+          ARG_DEVELOCITY_ENABLE="${{ inputs.enableDeveocity }}"
         fi
         ARG_FAIL_IF_NOT_FULLY_CACHEABLE=""
         if [ "${{ inputs.failIfNotFullyCacheable }}" == "true" ]; then
@@ -114,8 +114,8 @@ runs:
           ${ARG_PROJECT_DIR:+"-p" "$ARG_PROJECT_DIR"} \
           ${ARG_GOALS:+"-g" "$ARG_GOALS"} \
           ${ARG_ARGS:+"-a" "$ARG_ARGS"} \
-          ${ARG_GE_URL:+"-s" "$ARG_GE_URL"} \
-          ${ARG_GE_ENABLE:+"-e"} \
+          ${ARG_DEVELOCITY_URL:+"-s" "$ARG_DEVELOCITY_URL"} \
+          ${ARG_DEVELOCITY_ENABLE:+"-e"} \
           ${ARG_FAIL_IF_NOT_FULLY_CACHEABLE:+"-f"} \
           ${RUNNER_DEBUG:+"--debug"}
 

diff --git a/.github/workflows/cross-platform-testing-build-from-source.yml b/.github/workflows/cross-platform-testing-build-from-source.yml
@@ -57,8 +57,8 @@ jobs:
       run:
         shell: ${{ matrix.shell }} {0}
     env:
-      GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}
-      WSLENV: GITHUB_ACTIONS:GITHUB_SERVER_URL:GITHUB_REPOSITORY:GITHUB_RUN_ID:GITHUB_WORKFLOW:GITHUB_HEAD_REF:GRADLE_ENTERPRISE_ACCESS_KEY
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}
+      WSLENV: GITHUB_ACTIONS:GITHUB_SERVER_URL:GITHUB_REPOSITORY:GITHUB_RUN_ID:GITHUB_WORKFLOW:GITHUB_HEAD_REF:DEVELOCITY_ACCESS_KEY
     steps:
       - name: Set up WSL
         if: ${{ runner.os == 'Windows' }}

diff --git a/.github/workflows/cross-platform-testing-use-development-release.yml b/.github/workflows/cross-platform-testing-use-development-release.yml
@@ -36,8 +36,8 @@ jobs:
       run:
         shell: ${{ matrix.shell }} {0}
     env:
-      GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}
-      WSLENV: GITHUB_ACTIONS:GITHUB_SERVER_URL:GITHUB_REPOSITORY:GITHUB_RUN_ID:GITHUB_WORKFLOW:GITHUB_HEAD_REF:GRADLE_ENTERPRISE_ACCESS_KEY
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}
+      WSLENV: GITHUB_ACTIONS:GITHUB_SERVER_URL:GITHUB_REPOSITORY:GITHUB_RUN_ID:GITHUB_WORKFLOW:GITHUB_HEAD_REF:DEVELOCITY_ACCESS_KEY
     steps:
       - name: Set up WSL
         if: ${{ runner.os == 'Windows' }}

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -90,7 +90,7 @@ dependencies {
     develocityInjection("com.gradle:develocity-injection:1.1")
     develocityComponents("com.gradle:build-scan-summary:$buildScanSummaryVersion")
     develocityMavenComponents("com.gradle:gradle-enterprise-maven-extension:1.18.4")
-    mavenComponents(project(path = ":configure-gradle-enterprise-maven-extension", configuration = "shadow"))
+    mavenComponents(project(path = ":configure-develocity-maven-extension", configuration = "shadow"))
     thirdPartyMavenComponents("com.gradle:common-custom-user-data-maven-extension:2.0.1")
 }
 

diff --git a/...terprise-maven-extension/build.gradle.kts → ...velocity-maven-extension/build.gradle.kts b/...terprise-maven-extension/build.gradle.kts → ...velocity-maven-extension/build.gradle.kts
diff --git a/...om/gradle/ConfigureDevelocityAdaptor.java → ...om/gradle/ConfigureDevelocityAdaptor.java b/...om/gradle/ConfigureDevelocityAdaptor.java → ...om/gradle/ConfigureDevelocityAdaptor.java
@@ -19,7 +19,7 @@
 
 public class ConfigureDevelocityAdaptor {
 
-    private static final String EXPERIMENT_DIR = System.getProperty("com.gradle.enterprise.build-validation.expDir");
+    private static final String EXPERIMENT_DIR = System.getProperty("develocity.build-validation.expDir");
 
     private final RootProjectExtractor rootProjectExtractor;
     private final Logger logger;
@@ -35,14 +35,14 @@ public void configure(DevelocityAdapter api, MavenSession session) {
 
         BuildScanApiAdapter buildScan = api.getBuildScan();
 
-        String geUrl = System.getProperty("gradle.enterprise.url");
-        String geAllowUntrustedServer = System.getProperty("gradle.enterprise.allowUntrustedServer");
+        String develocityUrl = System.getProperty("develocity.url");
+        String develocityAllowUntrustedServer = System.getProperty("develocity.allowUntrustedServer");
 
-        if (geUrl != null && !geUrl.isEmpty()) {
-            buildScan.setServer(geUrl);
+        if (develocityUrl != null && !develocityUrl.isEmpty()) {
+            buildScan.setServer(develocityUrl);
         }
-        if (geAllowUntrustedServer != null && !geAllowUntrustedServer.isEmpty()) {
-            buildScan.setAllowUntrustedServer(Boolean.parseBoolean(geAllowUntrustedServer));
+        if (develocityAllowUntrustedServer != null && !develocityAllowUntrustedServer.isEmpty()) {
+            buildScan.setAllowUntrustedServer(Boolean.parseBoolean(develocityAllowUntrustedServer));
         }
 
         String rootProjectName = rootProjectExtractor.extractRootProject(session).getName();
@@ -53,8 +53,8 @@ public void configure(DevelocityAdapter api, MavenSession session) {
 
     private static void registerBuildScanActions(BuildScanApiAdapter buildScan, String rootProjectName) {
         buildScan.buildFinished(buildResult -> {
-            // communicate via error file that no GE server is set
-            boolean omitServerUrlValidation = parseBoolean(System.getProperty("com.gradle.enterprise.build-validation.omitServerUrlValidation"));
+            // communicate via error file that no Develocity server is set
+            boolean omitServerUrlValidation = parseBoolean(System.getProperty("develocity.build-validation.omitServerUrlValidation"));
             if (buildScan.getServer() == null && !omitServerUrlValidation) {
                 buildScan.publishAlwaysIf(false); // disable publishing, otherwise scans.gradle.com will be used
                 File errorFile = new File(EXPERIMENT_DIR, "errors.txt");
@@ -63,19 +63,19 @@ private static void registerBuildScanActions(BuildScanApiAdapter buildScan, Stri
         });
 
         buildScan.buildFinished(buildResult -> {
-            String expId = System.getProperty("com.gradle.enterprise.build-validation.expId");
+            String expId = System.getProperty("develocity.build-validation.expId");
             addCustomValueAndSearchLink(buildScan, "Experiment id", expId);
             buildScan.tag(expId);
 
-            String runId = System.getProperty("com.gradle.enterprise.build-validation.runId");
+            String runId = System.getProperty("develocity.build-validation.runId");
             addCustomValueAndSearchLink(buildScan, "Experiment run id", runId);
 
-            String scriptsVersion = System.getProperty("com.gradle.enterprise.build-validation.scriptsVersion");
+            String scriptsVersion = System.getProperty("develocity.build-validation.scriptsVersion");
             buildScan.value("Build validation scripts", scriptsVersion);
         });
 
         buildScan.buildScanPublished(scan -> {
-            String runNum = System.getProperty("com.gradle.enterprise.build-validation.runNum");
+            String runNum = System.getProperty("develocity.build-validation.runNum");
             URI buildScanUri = scan.getBuildScanUri();
             String buildScanId = scan.getBuildScanId();
             String port = buildScanUri.getPort() != -1 ? ":" + buildScanUri.getPort() : "";

diff --git a/...m/gradle/ConfigureDevelocityListener.java → ...m/gradle/ConfigureDevelocityListener.java b/...m/gradle/ConfigureDevelocityListener.java → ...m/gradle/ConfigureDevelocityListener.java
diff --git a/...le/ConfigureGradleEnterpriseListener.java → ...le/ConfigureGradleEnterpriseListener.java b/...le/ConfigureGradleEnterpriseListener.java → ...le/ConfigureGradleEnterpriseListener.java
diff --git a/...java/com/gradle/RootProjectExtractor.java → ...java/com/gradle/RootProjectExtractor.java b/...java/com/gradle/RootProjectExtractor.java → ...java/com/gradle/RootProjectExtractor.java
diff --git a/.../resources/META-INF/plexus/components.xml → .../resources/META-INF/plexus/components.xml b/.../resources/META-INF/plexus/components.xml → .../resources/META-INF/plexus/components.xml
diff --git a/components/scripts/gradle/01-validate-incremental-building.sh b/components/scripts/gradle/01-validate-incremental-building.sh
@@ -35,8 +35,8 @@ git_branch=''
 project_dir=''
 tasks=''
 extra_args=''
-enable_ge=''
-ge_server=''
+enable_develocity=''
+develocity_server=''
 interactive_mode=''
 
 main() {

diff --git a/components/scripts/gradle/02-validate-local-build-caching-same-location.sh b/components/scripts/gradle/02-validate-local-build-caching-same-location.sh
@@ -35,8 +35,8 @@ git_branch=''
 project_dir=''
 tasks=''
 extra_args=''
-enable_ge=''
-ge_server=''
+enable_develocity=''
+develocity_server=''
 interactive_mode=''
 
 main() {

diff --git a/components/scripts/gradle/03-validate-local-build-caching-different-locations.sh b/components/scripts/gradle/03-validate-local-build-caching-different-locations.sh
@@ -35,8 +35,8 @@ git_branch=''
 project_dir=''
 tasks=''
 extra_args=''
-enable_ge=''
-ge_server=''
+enable_develocity=''
+develocity_server=''
 interactive_mode=''
 
 main() {

diff --git a/components/scripts/gradle/04-validate-remote-build-caching-ci-ci.sh b/components/scripts/gradle/04-validate-remote-build-caching-ci-ci.sh
@@ -36,8 +36,8 @@ git_options='<not available>'
 project_dir='<not available>'
 extra_args='<not available>'
 tasks=''
-enable_ge=''
-ge_server=''
+enable_develocity=''
+develocity_server=''
 interactive_mode=''
 mapping_file=''
 

diff --git a/components/scripts/gradle/05-validate-remote-build-caching-ci-local.sh b/components/scripts/gradle/05-validate-remote-build-caching-ci-local.sh
@@ -35,8 +35,8 @@ git_branch=''
 project_dir=''
 tasks=''
 extra_args=''
-enable_ge=''
-ge_server=''
+enable_develocity=''
+develocity_server=''
 interactive_mode=''
 
 ci_build_scan_url=''
@@ -148,7 +148,7 @@ validate_required_args() {
     fi
   fi
 
-  if [[ "${enable_ge}" == "on" && -z "${ge_server}" ]]; then
+  if [[ "${enable_develocity}" == "on" && -z "${develocity_server}" ]]; then
     _PRINT_HELP=yes die "ERROR: Missing required argument when enabling Develocity on a project not already connected: --develocity-server" "${INVALID_INPUT}"
   fi
 }
@@ -469,11 +469,11 @@ generate_command_to_repeat_experiment() {
     cmd+=("-u" "${remote_build_cache_url}")
   fi
 
-  if [ -n "${ge_server}" ]; then
-    cmd+=("-s" "${ge_server}")
+  if [ -n "${develocity_server}" ]; then
+    cmd+=("-s" "${develocity_server}")
   fi
 
-  if [[ "${enable_ge}" == "on" ]]; then
+  if [[ "${enable_develocity}" == "on" ]]; then
     cmd+=("-e")
   fi
 

diff --git a/components/scripts/lib/build-scan-online.sh b/components/scripts/lib/build-scan-online.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
 # This is a helper function for the common pattern of reading Build Scan metadata
-# from the build-scans.csv file, then retrieving build metrics using the Gradle
-# Enterprise API.
+# from the build-scans.csv file, then retrieving build metrics using the
+# Develocity API.
 process_build_scan_data_online() {
   read_build_scan_metadata
   fetch_build_scans_and_build_time_metrics 'brief_logging' "${build_scan_urls[@]}"