From 690a6a91b4855de16da3a56af7b2dc3b1d3d5635 Mon Sep 17 00:00:00 2001
From: Laplie Anderson <laplie.anderson@datadoghq.com>
Date: Wed, 12 Mar 2025 17:16:08 -0400
Subject: [PATCH 1/2] Use internal proxy for maven artifacts in Gitlab

---
 .gitlab-ci.yml             | 7 +++----
 gradle/repositories.gradle | 5 +++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index da8ffd29fc2..5277c5cf3f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,6 +23,7 @@ variables:
   DEPENDENCY_CACHE_POLICY: pull
   BUILD_CACHE_POLICY: pull
   GRADLE_VERSION: "8.4" # must match gradle-wrapper.properties
+  MAVEN_REPOSITORY_PROXY: artifactual.us1.prod.dog
   JAVA_BUILD_IMAGE_VERSION: "v25.01"
   REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations"
   PROFILE_TESTS:
@@ -74,7 +75,7 @@ default:
       policy: $BUILD_CACHE_POLICY
   before_script:
     - export GRADLE_USER_HOME=`pwd`/.gradle
-    - export GRADLE_ARGS=" --build-cache --stacktrace --no-daemon --parallel --max-workers=$GRADLE_WORKERS"
+    - export GRADLE_ARGS=" --build-cache --stacktrace --no-daemon --parallel --max-workers=$GRADLE_WORKERS -PmavenRepositoryProxy=$MAVEN_REPOSITORY_PROXY"
     - *normalize_node_index
     # for weird reasons, gradle will always "chmod 700" the .gradle folder
     # with Gitlab caching, .gradle is always owned by root and thus gradle's chmod invocation fails
@@ -199,10 +200,8 @@ muzzle:
   needs: [ build ]
   stage: tests
   parallel: 8
-  rules:
-    - when: never
   variables:
-    BUILD_CACHE_TYPE: test
+    BUILD_CACHE_TYPE: lib
   script:
     - export SKIP_BUILDSCAN="true"
     - ./gradlew writeMuzzleTasksToFile $GRADLE_ARGS
diff --git a/gradle/repositories.gradle b/gradle/repositories.gradle
index 2b25aae70a0..0b0a3e7ecd8 100644
--- a/gradle/repositories.gradle
+++ b/gradle/repositories.gradle
@@ -1,4 +1,9 @@
 repositories {
+  if (project.rootProject.hasProperty("mavenRepositoryProxy")) {
+    maven {
+      url project.rootProject.property("mavenRepositoryProxy")
+    }
+  }
   mavenLocal()
   mavenCentral()
   // add sonatype repository for snapshot dependencies

From 99397646089ad4260d0b2f2044a23c33ffa149dd Mon Sep 17 00:00:00 2001
From: Laplie Anderson <laplie.anderson@datadoghq.com>
Date: Thu, 13 Mar 2025 11:13:14 -0400
Subject: [PATCH 2/2] fix proxy url

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5277c5cf3f0..eba992b8d67 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ variables:
   DEPENDENCY_CACHE_POLICY: pull
   BUILD_CACHE_POLICY: pull
   GRADLE_VERSION: "8.4" # must match gradle-wrapper.properties
-  MAVEN_REPOSITORY_PROXY: artifactual.us1.prod.dog
+  MAVEN_REPOSITORY_PROXY: "https://artifactual.us1.prod.dog/repository/maven-central/"
   JAVA_BUILD_IMAGE_VERSION: "v25.01"
   REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations"
   PROFILE_TESTS: