Fix more places to use the internal maven proxy (#8592)

* Cleanup repositories {} blocks

* update proxy url to use internal routing

* no "s"

* allow insecure everywhere

* include apache with confluence

* use gradlePluginCache, mavenCentral after pluginportal

* proxy mule as well

---------

Co-authored-by: Santiago M. Mola <[email protected]>

Author: randomanderson

.gitlab-ci.yml

@@ -23,7 +23,8 @@ variables:
   DEPENDENCY_CACHE_POLICY: pull
   BUILD_CACHE_POLICY: pull
   GRADLE_VERSION: "8.4" # must match gradle-wrapper.properties
-  MAVEN_REPOSITORY_PROXY: "https://artifactual.us1.prod.dog/repository/maven-central/"
+  MAVEN_REPOSITORY_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/maven-central/"
+  GRADLE_PLUGIN_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/gradle-plugin-portal-proxy/"
   JAVA_BUILD_IMAGE_VERSION: "v25.01"
   REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations"
   PROFILE_TESTS:
@@ -75,7 +76,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 -PmavenRepositoryProxy=$MAVEN_REPOSITORY_PROXY"
+    - export GRADLE_ARGS=" --build-cache --stacktrace --no-daemon --parallel --max-workers=$GRADLE_WORKERS -PmavenRepositoryProxy=$MAVEN_REPOSITORY_PROXY -PgradlePluginProxy=$GRADLE_PLUGIN_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

build.gradle

@@ -32,6 +32,7 @@ description = 'dd-trace-java'
 
 def isCI = System.getenv("CI") != null
 
+apply from: "$rootDir/gradle/repositories.gradle"
 apply from: "$rootDir/gradle/scm.gradle"
 spotless {
   // only resolve the spotless dependencies once in the build
@@ -79,12 +80,6 @@ allprojects {
   }
 }
 
-repositories {
-  mavenLocal()
-  mavenCentral()
-  gradlePluginPortal()
-}
-
 tasks.register("latestDepTest")
 
 nexusPublishing {

buildSrc/build.gradle.kts

@@ -22,10 +22,8 @@ gradlePlugin {
   }
 }
 
-repositories {
-  mavenLocal()
-  mavenCentral()
-  gradlePluginPortal()
+apply {
+  from("$rootDir/../gradle/repositories.gradle")
 }
 
 dependencies {

buildSrc/call-site-instrumentation-plugin/build.gradle.kts

@@ -24,10 +24,8 @@ spotless {
   }
 }
 
-repositories {
-  mavenLocal()
-  mavenCentral()
-  gradlePluginPortal()
+apply {
+  from("$rootDir/../gradle/repositories.gradle")
 }
 
 dependencies {

dd-java-agent/agent-ci-visibility/build.gradle

@@ -1,5 +1,19 @@
 buildscript {
   repositories {
+    mavenLocal()
+    if (project.rootProject.hasProperty("gradlePluginProxy")) {
+      maven {
+        url project.rootProject.property("gradlePluginProxy")
+        allowInsecureProtocol true
+      }
+    }
+    if (project.rootProject.hasProperty("mavenRepositoryProxy")) {
+      maven {
+        url project.rootProject.property("mavenRepositoryProxy")
+        allowInsecureProtocol true
+      }
+    }
+    gradlePluginPortal()
     mavenCentral()
   }
 

dd-java-agent/benchmark-integration/build.gradle

@@ -1,7 +1,20 @@
 buildscript {
   repositories {
-    mavenCentral()
+    mavenLocal()
+    if (project.rootProject.hasProperty("gradlePluginProxy")) {
+      maven {
+        url project.rootProject.property("gradlePluginProxy")
+        allowInsecureProtocol true
+      }
+    }
+    if (project.rootProject.hasProperty("mavenRepositoryProxy")) {
+      maven {
+        url project.rootProject.property("mavenRepositoryProxy")
+        allowInsecureProtocol true
+      }
+    }
     gradlePluginPortal()
+    mavenCentral()
   }
   dependencies {
     classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.1'

dd-java-agent/benchmark-integration/play-perftest/build.gradle

@@ -26,8 +26,14 @@ dependencies {
 }
 
 repositories {
+  mavenLocal()
+  if (project.rootProject.hasProperty("mavenRepositoryProxy")) {
+    maven {
+      url project.rootProject.property("mavenRepositoryProxy")
+      allowInsecureProtocol true
+    }
+  }
   mavenCentral()
-  gradlePluginPortal()
   maven {
     name "lightbend-maven-releases"
     url "https://repo.lightbend.com/lightbend/maven-release"

dd-java-agent/instrumentation/build.gradle

@@ -2,6 +2,20 @@
 buildscript {
 
   repositories {
+    mavenLocal()
+    if (project.rootProject.hasProperty("gradlePluginProxy")) {
+      maven {
+        url project.rootProject.property("gradlePluginProxy")
+        allowInsecureProtocol true
+      }
+    }
+    if (project.rootProject.hasProperty("mavenRepositoryProxy")) {
+      maven {
+        url project.rootProject.property("mavenRepositoryProxy")
+        allowInsecureProtocol true
+      }
+    }
+    gradlePluginPortal()
     mavenCentral()
   }
 

dd-java-agent/instrumentation/datanucleus-4/build.gradle

@@ -2,6 +2,13 @@ import org.datanucleus.enhancer.DataNucleusEnhancer
 
 buildscript {
   repositories {
+    mavenLocal()
+    if (project.rootProject.hasProperty("mavenRepositoryProxy")) {
+      maven {
+        url project.rootProject.property("mavenRepositoryProxy")
+        allowInsecureProtocol true
+      }
+    }
     mavenCentral()
   }
 

dd-java-agent/instrumentation/mule-4/application/pom.xml

@@ -99,4 +99,26 @@
       </snapshots>
     </pluginRepository>
   </pluginRepositories>
+  <profiles>
+    <profile>
+      <id>maven-proxy-profile</id>
+      <activation>
+        <property>
+          <name>env.MAVEN_REPOSITORY_PROXY</name>
+        </property>
+      </activation>
+      <repositories>
+        <repository>
+          <id>maven-proxy-repo</id>
+          <url>${env.MAVEN_REPOSITORY_PROXY}</url>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>maven-plugin-proxy</id>
+          <url>${env.MAVEN_REPOSITORY_PROXY}</url>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+  </profiles>
 </project>