From 65b3154b88bc9188cfa91bcce37cbff1da17f685 Mon Sep 17 00:00:00 2001
From: Clay Johnson <cjohnson@gradle.com>
Date: Wed, 8 Jan 2025 11:48:21 -0600
Subject: [PATCH] Update Develocity plugin versions

---
 .github/workflows/run-checks-all.yml                   |  2 +-
 .github/workflows/run-checks-gradle-upgrade.yml        |  2 +-
 .github/workflows/run-checks-mod-analysis-common.yml   |  2 +-
 .../workflows/run-checks-mod-distribution.tests.yml    |  2 +-
 gradle/ge.gradle                                       | 10 +++++-----
 settings.gradle                                        |  4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/run-checks-all.yml b/.github/workflows/run-checks-all.yml
index 18dd308e9a77..1df8f97074e4 100644
--- a/.github/workflows/run-checks-all.yml
+++ b/.github/workflows/run-checks-all.yml
@@ -13,7 +13,7 @@ on:
       - 'branch_10x'
 
 env:
-  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
 # We split the workflow into two parallel jobs for efficiency:
 # one is running all validation checks without tests,
diff --git a/.github/workflows/run-checks-gradle-upgrade.yml b/.github/workflows/run-checks-gradle-upgrade.yml
index 07b7210cf4e2..217785c5929d 100644
--- a/.github/workflows/run-checks-gradle-upgrade.yml
+++ b/.github/workflows/run-checks-gradle-upgrade.yml
@@ -20,7 +20,7 @@ on:
       - 'gradle/wrapper/**'
 
 env:
-  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
 jobs:
   gradleSanityCheck:
diff --git a/.github/workflows/run-checks-mod-analysis-common.yml b/.github/workflows/run-checks-mod-analysis-common.yml
index a208039a99fa..e609a4b20b2b 100644
--- a/.github/workflows/run-checks-mod-analysis-common.yml
+++ b/.github/workflows/run-checks-mod-analysis-common.yml
@@ -20,7 +20,7 @@ on:
       - 'lucene/analysis/common/**'
 
 env:
-  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
 jobs:
   test:
diff --git a/.github/workflows/run-checks-mod-distribution.tests.yml b/.github/workflows/run-checks-mod-distribution.tests.yml
index e3af5812c80c..12d55f8bf673 100644
--- a/.github/workflows/run-checks-mod-distribution.tests.yml
+++ b/.github/workflows/run-checks-mod-distribution.tests.yml
@@ -14,7 +14,7 @@ on:
       - 'branch_10x'
 
 env:
-  GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
 jobs:
   test:
diff --git a/gradle/ge.gradle b/gradle/ge.gradle
index 96e0359e45cc..c4677859e33a 100644
--- a/gradle/ge.gradle
+++ b/gradle/ge.gradle
@@ -17,13 +17,13 @@
 
 def isCIBuild = System.getenv().keySet().find { it ==~ /(?i)((JENKINS|HUDSON)(_\w+)?|CI)/ } != null
 
-gradleEnterprise {
+develocity {
     server = "https://develocity.apache.org"
+    projectId = "lucene"
+
     buildScan {
-        capture { taskInputFiles = true }
         uploadInBackground = !isCIBuild
-        publishAlways()
-        publishIfAuthenticated()
+        publishing.onlyIf { it.isAuthenticated() }
         obfuscation {
             ipAddresses { addresses -> addresses.collect { address -> "0.0.0.0"} }
         }
@@ -35,7 +35,7 @@ buildCache {
         enabled = !isCIBuild
     }
 
-    remote(gradleEnterprise.buildCache) {
+    remote(develocity.buildCache) {
         enabled = false
     }
 }
diff --git a/settings.gradle b/settings.gradle
index f4ee13243ca6..8543bab1619f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -26,8 +26,8 @@ pluginManagement {
 
 plugins {
     id "org.gradle.toolchains.foojay-resolver-convention" version "0.8.0"
-    id 'com.gradle.enterprise' version '3.15.1'
-    id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.11.3'
+    id 'com.gradle.develocity' version '3.18.2'
+    id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0.2'
 }
 
 dependencyResolutionManagement {