From 3571149f9d37bdb52c4f01446b64c6c21f38ff3f Mon Sep 17 00:00:00 2001
From: Clay Johnson <cjohnson@gradle.com>
Date: Wed, 8 Jan 2025 13:16:40 -0600
Subject: [PATCH 1/4] Publish build scans to develocity.apache.org

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index cce9f80900..4050ae0a0e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -26,7 +26,7 @@ def isJenkins = System.getenv('JENKINS_URL') != null
 def isCI = isGithubActions || isJenkins
 
 gradleEnterprise {
-  server = "https://ge.apache.org"
+  server = "https://develocity.apache.org"
   buildScan {
     capture { taskInputFiles = true }
     uploadInBackground = !isCI

From 80e34049db4916c31a82e793921a6943cec2072c Mon Sep 17 00:00:00 2001
From: Clay Johnson <cjohnson@gradle.com>
Date: Wed, 8 Jan 2025 13:18:56 -0600
Subject: [PATCH 2/4] Use `DEVELOCITY_ACCESS_KEY` to authenticate to
 `develocity.apache.org`

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 813d82b979..e98027658c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
       matrix:
         java-version: [ 8.0.232 ]
     env:
-      GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+      GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
     steps:
       - name: Cache Gradle packages
         uses: actions/cache@v2

From 2ca7bd2ee61275b3e0f02d504a408583eb226568 Mon Sep 17 00:00:00 2001
From: Clay Johnson <cjohnson@gradle.com>
Date: Wed, 8 Jan 2025 13:29:42 -0600
Subject: [PATCH 3/4] Update Develocity plugin versions

---
 .github/workflows/ci.yml |  2 +-
 settings.gradle          | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e98027658c..68ad5c824a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
       matrix:
         java-version: [ 8.0.232 ]
     env:
-      GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
     steps:
       - name: Cache Gradle packages
         uses: actions/cache@v2
diff --git a/settings.gradle b/settings.gradle
index 4050ae0a0e..5060275337 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,21 +17,20 @@
  * under the License.
  */
 plugins {
-  id 'com.gradle.enterprise' version '3.13.1'
-  id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.10'
+  id 'com.gradle.develocity' version '3.18.2'
+  id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0.2'
 }
 
 def isGithubActions = System.getenv('GITHUB_ACTIONS') != null
 def isJenkins = System.getenv('JENKINS_URL') != null
 def isCI = isGithubActions || isJenkins
 
-gradleEnterprise {
+develocity {
   server = "https://develocity.apache.org"
+  projectId = "samza"
   buildScan {
-    capture { taskInputFiles = true }
     uploadInBackground = !isCI
-    publishAlways()
-    publishIfAuthenticated()
+    publishing.onlyIf { it.isAuthenticated() }
     obfuscation {
       // This obfuscates the IP addresses of the build machine in the build scan.
       // Alternatively, the build scan will provide the hostname for troubleshooting host-specific issues.
@@ -45,7 +44,7 @@ buildCache {
     enabled = !isCI
   }
 
-  remote(gradleEnterprise.buildCache) {
+  remote(develocity.buildCache) {
     enabled = false
   }
 }

From 4b8d5969a3740e5e9b34b0975cf8f82f7a5030ff Mon Sep 17 00:00:00 2001
From: Clay Johnson <cjohnson@gradle.com>
Date: Mon, 27 Jan 2025 20:53:38 -0800
Subject: [PATCH 4/4] Use wrapper validation v4

---
 .github/workflows/ci.yml | 2 +-
 settings.gradle          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 68ad5c824a..ef0b45679f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,7 +46,7 @@ jobs:
           distribution: 'zulu'
 
       - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@v4
 
       - name: Build with Gradle
         run: ./gradlew build
diff --git a/settings.gradle b/settings.gradle
index 5060275337..bef9d3b97f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,8 +17,8 @@
  * under the License.
  */
 plugins {
-  id 'com.gradle.develocity' version '3.18.2'
-  id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0.2'
+  id 'com.gradle.develocity' version '4.2.2'
+  id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.4.0'
 }
 
 def isGithubActions = System.getenv('GITHUB_ACTIONS') != null