From 1f8a30338e832a4d438c82e5af5f0ed892c041e8 Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <alexey.kuznetsov@datadoghq.com>
Date: Thu, 27 Aug 2026 13:53:37 -0400
Subject: [PATCH] Update Gradle to 9.7.1

---
 .gitlab-ci.yml                                              | 2 +-
 .../instrumentation/sofarpc/sofarpc-5.0/build.gradle        | 6 +++---
 .../src/test/resources/latest-tool-versions.properties      | 4 ++--
 gradle/wrapper/gradle-wrapper.properties                    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 33b792627b5..495b959bbac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,7 +53,7 @@ variables:
   BUILD_JOB_NAME: "build"
   DEPENDENCY_CACHE_POLICY: pull
   BUILD_CACHE_POLICY: pull
-  GRADLE_VERSION: "9.7.0" # must match gradle-wrapper.properties
+  GRADLE_VERSION: "9.7.1" # must match gradle-wrapper.properties
   MASS_READ_URL: "https://mass-read.us1.ddbuild.io"
   MAVEN_REPOSITORY_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
   GRADLE_PLUGIN_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/build.gradle b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/build.gradle
index 9f4c611b9ff..139e4801848 100644
--- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/build.gradle
+++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/build.gradle
@@ -31,7 +31,7 @@ dependencies {
   latestDepTestImplementation group: "com.alipay.sofa", name: "sofa-rpc-all", version: "+"
 
   constraints {
-    // Regression fix for Gradle 9.6.0 (should be fixed in 9.7.0)
+    // Regression fix for Gradle 9.6.0.
     //
     // The `sofa-rpc-all:5.14.2` brings `netty-all:4.1.44.Final`, which is a fat jar,
     // while `grpc-netty:1.53.0` brings individual `netty-*:4.1.79.Final` modules.
@@ -41,8 +41,8 @@ dependencies {
     // produces a `NoSuchMethodError` at runtime in netty's `AbstractReferenceCountedByteBuf`.
     //
     // The workaround is to force `netty-all` to `4.1.79` so the fat jar and the individual
-    // modules are aligned on the same version. This should be fixed in 9.7.0 and consequently
-    // removed from the constraints.
+    // modules are aligned on the same version. The fix is behind Gradle 9.7's
+    // ENHANCED_GRAPH_ORDERING preview, which currently exposes other fat-jar conflicts.
     // See https://github.com/gradle/gradle/issues/38057 for more details.
     testImplementation("io.netty:netty-all:4.1.79.Final") {
       because "sofa-rpc-all brings netty-all:4.1.44.Final (fat jar) while grpc-netty brings individual netty-*:4.1.79.Final modules; Gradle 9.6.0 classpath ordering regression causes 4.1.44 classes to shadow 4.1.79, producing NoSuchMethodError"
diff --git a/dd-smoke-tests/gradle/src/test/resources/latest-tool-versions.properties b/dd-smoke-tests/gradle/src/test/resources/latest-tool-versions.properties
index 0560b87f752..8529c2e4167 100644
--- a/dd-smoke-tests/gradle/src/test/resources/latest-tool-versions.properties
+++ b/dd-smoke-tests/gradle/src/test/resources/latest-tool-versions.properties
@@ -1,6 +1,6 @@
 # Pinned latest eligible stable versions (>=48h old) for CI Visibility Gradle smoke tests.
 # Updated automatically by the update-smoke-test-latest-versions workflow.
-gradle.latest=9.7.0
+gradle.latest=9.7.1
 # Latest eligible stable patch per Gradle major release. Used to resolve the "oldest" smoke-test
 # Gradle version (the latest patch of the oldest major the current TestKit supports).
 gradle.latest.3=3.5.1
@@ -9,4 +9,4 @@ gradle.latest.5=5.6.4
 gradle.latest.6=6.9.4
 gradle.latest.7=7.6.6
 gradle.latest.8=8.14.5
-gradle.latest.9=9.7.0
+gradle.latest.9=9.7.1
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 84c5a9c661a..760c45969c4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=84fbba45c7f4c64abc77460e1c00f541e9f960e3c7ed2538f1ede19eacd873ae
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
+distributionSha256Sum=acd53f1edaf02f1a8ff99879f8a34b302661a057d9b063ae9e35b552f804d20a
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500