From 406eea77d2a5bd5929c4c0cf43f2761b9ec6f5c9 Mon Sep 17 00:00:00 2001
From: Gasper Kojek <gkojek@gradle.com>
Date: Wed, 25 Mar 2026 14:06:32 +0100
Subject: [PATCH 1/3] Upgrade Gradle Enterprise plugin to Develocity 4.3.2

- Upgrade com.gradle.enterprise 3.13.1 to com.gradle.develocity 4.3.2
- Upgrade common-custom-user-data-gradle-plugin 1.10 to 2.4.0
- Migrate from gradleEnterprise {} to develocity {} DSL
- Update server URL from ge.apache.org to develocity.apache.org
- Enable remote build cache (read-only for local builds, push on CI)
---
 settings.gradle | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index cce9f80900..2222241eff 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 '4.3.2'
+  id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.4.0'
 }
 
 def isGithubActions = System.getenv('GITHUB_ACTIONS') != null
 def isJenkins = System.getenv('JENKINS_URL') != null
 def isCI = isGithubActions || isJenkins
 
-gradleEnterprise {
-  server = "https://ge.apache.org"
+develocity {
+  server = "https://develocity.apache.org"
   buildScan {
-    capture { taskInputFiles = true }
+    capture { fileFingerprints = true }
     uploadInBackground = !isCI
-    publishAlways()
-    publishIfAuthenticated()
+    publishing.onlyIf { it.authenticated }
     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,8 +44,9 @@ buildCache {
     enabled = !isCI
   }
 
-  remote(gradleEnterprise.buildCache) {
-    enabled = false
+  remote(develocity.buildCache) {
+    enabled = true
+    push = isCI
   }
 }
 

From c3f0a4d31a01c71ed081219ab1a4e1e3bf6ba17c Mon Sep 17 00:00:00 2001
From: Gasper Kojek <gkojek@gradle.com>
Date: Wed, 25 Mar 2026 14:36:43 +0100
Subject: [PATCH 2/3] Migrate CI workflow to Develocity access key and
 setup-gradle
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- GRADLE_ENTERPRISE_ACCESS_KEY → DEVELOCITY_ACCESS_KEY (matches
  the Develocity plugin rename in settings.gradle)
- Replace actions/cache + gradle/wrapper-validation-action with
  gradle/actions/setup-gradle, which handles both caching and
  wrapper validation
---
 .github/workflows/ci.yml | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 813d82b979..4bee22d092 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,16 +27,8 @@ jobs:
       matrix:
         java-version: [ 8.0.232 ]
     env:
-      GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
     steps:
-      - name: Cache Gradle packages
-        uses: actions/cache@v2
-        with:
-          key: samza-ci-gradle-cache
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-
       - uses: actions/checkout@v2
 
       - name: Set up JDK ${{ matrix.java-version }}
@@ -45,8 +37,8 @@ jobs:
           java-version: ${{ matrix.java-version }}
           distribution: 'zulu'
 
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Build with Gradle
         run: ./gradlew build

From e060e3a06cde47f1d88898baa04bfb3f34ad0c68 Mon Sep 17 00:00:00 2001
From: Gasper Kojek <gkojek@gradle.com>
Date: Wed, 25 Mar 2026 14:38:26 +0100
Subject: [PATCH 3/3] Keep only access key migration in CI workflow
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Revert setup-gradle change, keep GRADLE_ENTERPRISE_ACCESS_KEY →
DEVELOCITY_ACCESS_KEY rename only.
---
 .github/workflows/ci.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4bee22d092..8aea560e0d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,6 +29,14 @@ jobs:
     env:
       DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
     steps:
+      - name: Cache Gradle packages
+        uses: actions/cache@v2
+        with:
+          key: samza-ci-gradle-cache
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+
       - uses: actions/checkout@v2
 
       - name: Set up JDK ${{ matrix.java-version }}
@@ -37,8 +45,8 @@ jobs:
           java-version: ${{ matrix.java-version }}
           distribution: 'zulu'
 
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
 
       - name: Build with Gradle
         run: ./gradlew build