From e221fbaeee495c21f4d68da487e60a2afb51b9b1 Mon Sep 17 00:00:00 2001
From: tison <wander4096@gmail.com>
Date: Sat, 15 Jun 2024 13:22:37 +0800
Subject: [PATCH] CURATOR-711. Upgrade Gradle Enterpirse Extensions for JDK 22
 build (#504)

Signed-off-by: tison <wander4096@gmail.com>
Co-authored-by: Clay Johnson <cjohnson@gradle.com>
---
 .github/workflows/ci.yml                      |  4 ++--
 .gitignore                                    |  1 +
 ...ovy => develocity-custom-user-data.groovy} |  0
 .../{gradle-enterprise.xml => develocity.xml} | 19 +++++++------------
 .mvn/extensions.xml                           |  6 +++---
 5 files changed, 13 insertions(+), 17 deletions(-)
 rename .mvn/{gradle-enterprise-custom-user-data.groovy => develocity-custom-user-data.groovy} (100%)
 rename .mvn/{gradle-enterprise.xml => develocity.xml} (69%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e15312366..012e86804 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -58,7 +58,7 @@ jobs:
       matrix:
         java: [8, 11, 17, 21]
     env:
-      GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
     steps:
       - uses: actions/checkout@v3
 
@@ -91,7 +91,7 @@ jobs:
       matrix:
         zookeeper: [curator-test-zk38, curator-test-zk37, curator-test-zk36, curator-test-zk35]
     env:
-      GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
     steps:
       - uses: actions/checkout@v3
 
diff --git a/.gitignore b/.gitignore
index e263d9723..58b899009 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,4 @@ atlassian-ide-plugin.xml
 # Gradle Enterprise
 test-reports/
 .mvn/.gradle-enterprise/
+.mvn/.develocity/
diff --git a/.mvn/gradle-enterprise-custom-user-data.groovy b/.mvn/develocity-custom-user-data.groovy
similarity index 100%
rename from .mvn/gradle-enterprise-custom-user-data.groovy
rename to .mvn/develocity-custom-user-data.groovy
diff --git a/.mvn/gradle-enterprise.xml b/.mvn/develocity.xml
similarity index 69%
rename from .mvn/gradle-enterprise.xml
rename to .mvn/develocity.xml
index 86d14f7af..fd1def1aa 100644
--- a/.mvn/gradle-enterprise.xml
+++ b/.mvn/develocity.xml
@@ -19,22 +19,17 @@
     under the License.
 
 -->
-<gradleEnterprise
-        xmlns="https://www.gradle.com/gradle-enterprise-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="https://www.gradle.com/gradle-enterprise-maven https://www.gradle.com/schema/gradle-enterprise-maven.xsd">
+<develocity
+        xmlns="https://www.gradle.com/develocity-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="https://www.gradle.com/develocity-maven https://www.gradle.com/schema/develocity-maven.xsd">
     <server>
         <url>https://ge.apache.org</url>
-        <allowUntrusted>false</allowUntrusted>
     </server>
     <buildScan>
-        <capture>
-            <goalInputFiles>true</goalInputFiles>
-            <buildLogging>true</buildLogging>
-            <testLogging>true</testLogging>
-        </capture>
         <backgroundBuildScanUpload>#{isFalse(env['GITHUB_ACTIONS'])}</backgroundBuildScanUpload>
-        <publish>ALWAYS</publish>
-        <publishIfAuthenticated>true</publishIfAuthenticated>
+        <publishing>
+            <onlyIf><![CDATA[authenticated]]></onlyIf>
+        </publishing>
         <obfuscation>
             <ipAddresses>#{{'0.0.0.0'}}</ipAddresses>
         </obfuscation>
@@ -47,4 +42,4 @@
             <enabled>false</enabled>
         </remote>
     </buildCache>
-</gradleEnterprise>
+</develocity>
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index 5f04e1f2e..1ca382883 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -23,12 +23,12 @@
             xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
     <extension>
         <groupId>com.gradle</groupId>
-        <artifactId>gradle-enterprise-maven-extension</artifactId>
-        <version>1.19.1</version>
+        <artifactId>develocity-maven-extension</artifactId>
+        <version>1.21.4</version>
     </extension>
     <extension>
         <groupId>com.gradle</groupId>
         <artifactId>common-custom-user-data-maven-extension</artifactId>
-        <version>1.12.4</version>
+        <version>2.0</version>
     </extension>
 </extensions>