From b1e48265bb381c94fce8d5e82b7d5ded58d14616 Mon Sep 17 00:00:00 2001
From: Clay Johnson <cjohnson@gradle.com>
Date: Thu, 4 May 2023 15:37:24 -0500
Subject: [PATCH 1/4] Capture build scans on ge.apache.org to benefit from deep
 build insights

---
 build.gradle    |  2 --
 settings.gradle | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index b0b4a742e1e1..3c5703ef84b9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,7 +39,6 @@ plugins {
   id "io.swagger.core.v3.swagger-gradle-plugin" version "2.2.8"
 
   id "com.github.spotbugs" version '5.0.13' apply false
-  id 'org.gradle.test-retry' version '1.5.2' apply false
   id 'org.scoverage' version '7.0.1' apply false
   id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
   id 'com.diffplug.spotless' version '6.14.0' apply false // 6.14.1 and newer require Java 11 at compile time, so we can't upgrade until AK 4.0
@@ -227,7 +226,6 @@ subprojects {
   apply plugin: 'java-library'
   apply plugin: 'checkstyle'
   apply plugin: "com.github.spotbugs"
-  apply plugin: 'org.gradle.test-retry'
 
   // We use the shadow plugin for the jmh-benchmarks module and the `-all` jar can get pretty large, so
   // don't publish it
diff --git a/settings.gradle b/settings.gradle
index 871c57a887c3..17e6bc55e448 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,6 +13,38 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+plugins {
+    id 'com.gradle.enterprise' version '3.13.1'
+    id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.10'
+}
+
+def isGithubActions = System.getenv('GITHUB_ACTIONS') != null
+def isJenkins = System.getenv('JENKINS_URL') != null
+def isCI = isGithubActions || isJenkins
+
+gradleEnterprise {
+    server = "https://ge.apache.org"
+    buildScan {
+        capture { taskInputFiles = true }
+        uploadInBackground = !isCI
+        publishAlways()
+        publishIfAuthenticated()
+        obfuscation {
+            ipAddresses { addresses -> addresses.collect { address -> "0.0.0.0"} }
+        }
+    }
+}
+
+buildCache {
+    local {
+        enabled = !isCI
+    }
+
+    remote(gradleEnterprise.buildCache) {
+        enabled = false
+    }
+}
+
 include 'clients',
     'connect:api',
     'connect:basic-auth-extension',

From d0ed5d6aa62aa5729a9dfd19d556c6c054a1a71d Mon Sep 17 00:00:00 2001
From: Clay Johnson <cjohnson@gradle.com>
Date: Fri, 5 May 2023 10:02:46 -0500
Subject: [PATCH 2/4] Comment the rationale for obfuscating ip addresses from
 build scans

---
 settings.gradle | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 17e6bc55e448..ea2fe4c39c74 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,7 +14,7 @@
 // limitations under the License.
 
 plugins {
-    id 'com.gradle.enterprise' version '3.13.1'
+    id 'com.gradle.enterprise' version '3.13.2'
     id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.10'
 }
 
@@ -30,6 +30,8 @@ gradleEnterprise {
         publishAlways()
         publishIfAuthenticated()
         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.
             ipAddresses { addresses -> addresses.collect { address -> "0.0.0.0"} }
         }
     }

From a0353a4e97515a7edd4b2f028657aadf2a0695ef Mon Sep 17 00:00:00 2001
From: Clay Johnson <cjohnson@gradle.com>
Date: Mon, 5 Jun 2023 10:56:39 -0500
Subject: [PATCH 3/4] Update Gradle Enterprise plugin versions

---
 settings.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index ea2fe4c39c74..9931a67515bb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,8 +14,8 @@
 // limitations under the License.
 
 plugins {
-    id 'com.gradle.enterprise' version '3.13.2'
-    id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.10'
+    id 'com.gradle.enterprise' version '3.13.3'
+    id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.11'
 }
 
 def isGithubActions = System.getenv('GITHUB_ACTIONS') != null

From 72bf6bf742664ca1b84e3e5c1e322d3f34162b01 Mon Sep 17 00:00:00 2001
From: Clay Johnson <cjohnson@gradle.com>
Date: Tue, 27 Jun 2023 15:28:24 -0500
Subject: [PATCH 4/4] Update to Gradle Enterprise Gradle Plugin 3.13.4

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

diff --git a/settings.gradle b/settings.gradle
index 9931a67515bb..0f4f7e52d948 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,7 +14,7 @@
 // limitations under the License.
 
 plugins {
-    id 'com.gradle.enterprise' version '3.13.3'
+    id 'com.gradle.enterprise' version '3.13.4'
     id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.11'
 }