From c55f6c1ed6d3cfc157f4e4b6738aa98fad5e1340 Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <alexey.kuznetsov@datadoghq.com>
Date: Thu, 3 Sep 2026 21:34:50 -0400
Subject: [PATCH 1/2] Avoid Maven Central fallback in build setup

---
 build-logic/settings.gradle.kts | 24 ++++++++++++++++++++----
 buildSrc/build.gradle.kts       | 10 +++++++++-
 settings.gradle.kts             |  9 +++++++--
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
index c218e2cd34c..5bf6a9df0d4 100644
--- a/build-logic/settings.gradle.kts
+++ b/build-logic/settings.gradle.kts
@@ -13,8 +13,13 @@ pluginManagement {
         isAllowInsecureProtocol = true
       }
     }
-    gradlePluginPortal()
-    mavenCentral()
+    // TODO: temporary fix for Maven Central rate limiting
+    if (!settings.extra.has("gradlePluginProxy")) {
+      gradlePluginPortal()
+    }
+    if (!settings.extra.has("mavenRepositoryProxy")) {
+      mavenCentral()
+    }
   }
 }
 
@@ -26,14 +31,25 @@ dependencyResolutionManagement {
   }
   repositories {
     mavenLocal()
+    // TODO: temporary fix for Maven Central rate limiting
+    if (settings.extra.has("gradlePluginProxy")) {
+      maven {
+        url = uri(settings.extra["gradlePluginProxy"] as String)
+        isAllowInsecureProtocol = true
+      }
+    }
     if (settings.extra.has("mavenRepositoryProxy")) {
       maven {
         url = uri(settings.extra["mavenRepositoryProxy"] as String)
         isAllowInsecureProtocol = true
       }
     }
-    gradlePluginPortal()
-    mavenCentral()
+    if (!settings.extra.has("gradlePluginProxy")) {
+      gradlePluginPortal()
+    }
+    if (!settings.extra.has("mavenRepositoryProxy")) {
+      mavenCentral()
+    }
     // Hosts gradle-tooling-api; used by the smoke-test plugin to run nested Gradle builds
     // pinned to older Gradle versions.
     maven {
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index b31a2fde05c..7ebbf3a6e5c 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -84,7 +84,15 @@ gradlePlugin {
 apply(from = "$rootDir/../gradle/repositories.gradle")
 
 repositories {
-  gradlePluginPortal()
+  // TODO: temporary fix for Maven Central rate limiting
+  if (rootProject.hasProperty("gradlePluginProxy")) {
+    maven {
+      url = uri(rootProject.property("gradlePluginProxy") as String)
+      isAllowInsecureProtocol = true
+    }
+  } else {
+    gradlePluginPortal()
+  }
 }
 
 dependencies {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 14e988af3fe..afbffefb27f 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -14,8 +14,13 @@ pluginManagement {
         isAllowInsecureProtocol = true
       }
     }
-    gradlePluginPortal()
-    mavenCentral()
+    // TODO: temporary fix for Maven Central rate limiting
+    if (!settings.extra.has("gradlePluginProxy")) {
+      gradlePluginPortal()
+    }
+    if (!settings.extra.has("mavenRepositoryProxy")) {
+      mavenCentral()
+    }
     // Hosts gradle-tooling-api, a transitive dep of the build-logic:smoke-test plugin used
     // to run nested Gradle builds for smoke-test applications pinned to older Gradle versions.
     maven {

From c868a95e46aab7de13f3ef467cece0bf06d2fb75 Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <alexey.kuznetsov@datadoghq.com>
Date: Thu, 3 Sep 2026 21:46:42 -0400
Subject: [PATCH 2/2] Rolled back Gradle plugins change.

---
 build-logic/settings.gradle.kts | 16 +++-------------
 buildSrc/build.gradle.kts       | 10 +---------
 settings.gradle.kts             |  4 +---
 3 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
index 5bf6a9df0d4..6d1ceec50bb 100644
--- a/build-logic/settings.gradle.kts
+++ b/build-logic/settings.gradle.kts
@@ -13,10 +13,8 @@ pluginManagement {
         isAllowInsecureProtocol = true
       }
     }
+    gradlePluginPortal()
     // TODO: temporary fix for Maven Central rate limiting
-    if (!settings.extra.has("gradlePluginProxy")) {
-      gradlePluginPortal()
-    }
     if (!settings.extra.has("mavenRepositoryProxy")) {
       mavenCentral()
     }
@@ -31,22 +29,14 @@ dependencyResolutionManagement {
   }
   repositories {
     mavenLocal()
-    // TODO: temporary fix for Maven Central rate limiting
-    if (settings.extra.has("gradlePluginProxy")) {
-      maven {
-        url = uri(settings.extra["gradlePluginProxy"] as String)
-        isAllowInsecureProtocol = true
-      }
-    }
     if (settings.extra.has("mavenRepositoryProxy")) {
       maven {
         url = uri(settings.extra["mavenRepositoryProxy"] as String)
         isAllowInsecureProtocol = true
       }
     }
-    if (!settings.extra.has("gradlePluginProxy")) {
-      gradlePluginPortal()
-    }
+    gradlePluginPortal()
+    // TODO: temporary fix for Maven Central rate limiting
     if (!settings.extra.has("mavenRepositoryProxy")) {
       mavenCentral()
     }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 7ebbf3a6e5c..b31a2fde05c 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -84,15 +84,7 @@ gradlePlugin {
 apply(from = "$rootDir/../gradle/repositories.gradle")
 
 repositories {
-  // TODO: temporary fix for Maven Central rate limiting
-  if (rootProject.hasProperty("gradlePluginProxy")) {
-    maven {
-      url = uri(rootProject.property("gradlePluginProxy") as String)
-      isAllowInsecureProtocol = true
-    }
-  } else {
-    gradlePluginPortal()
-  }
+  gradlePluginPortal()
 }
 
 dependencies {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index afbffefb27f..3ce6557b8e2 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -14,10 +14,8 @@ pluginManagement {
         isAllowInsecureProtocol = true
       }
     }
+    gradlePluginPortal()
     // TODO: temporary fix for Maven Central rate limiting
-    if (!settings.extra.has("gradlePluginProxy")) {
-      gradlePluginPortal()
-    }
     if (!settings.extra.has("mavenRepositoryProxy")) {
       mavenCentral()
     }