From 97d5bc6aea1883d9c185d68682735d299d378f87 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Wed, 19 Mar 2025 15:08:13 -0400 Subject: [PATCH 1/7] Cleanup repositories {} blocks --- build.gradle | 7 +------ buildSrc/build.gradle.kts | 6 ++---- .../build.gradle.kts | 6 ++---- dd-java-agent/agent-ci-visibility/build.gradle | 6 ++++++ dd-java-agent/benchmark-integration/build.gradle | 6 ++++++ .../play-perftest/build.gradle | 7 ++++++- dd-java-agent/instrumentation/build.gradle | 6 ++++++ .../instrumentation/datanucleus-4/build.gradle | 7 +++++++ dd-java-agent/testing/build.gradle | 7 ------- dd-smoke-tests/apm-tracing-disabled/build.gradle | 4 ---- .../armeria-grpc/application/settings.gradle | 5 +++++ .../datastreams/kafkaschemaregistry/build.gradle | 8 -------- dd-smoke-tests/grpc-1.5/build.gradle | 5 ----- dd-smoke-tests/kafka-3/application/settings.gradle | 5 +++++ dd-smoke-tests/play-2.4/build.gradle | 7 ++++++- dd-smoke-tests/play-2.5/build.gradle | 7 ++++++- dd-smoke-tests/play-2.6/build.gradle | 7 ++++++- dd-smoke-tests/play-2.7/build.gradle | 7 ++++++- dd-smoke-tests/play-2.8-otel/build.gradle | 7 ++++++- dd-smoke-tests/play-2.8-split-routes/build.gradle | 7 ++++++- dd-smoke-tests/play-2.8/build.gradle | 7 ++++++- .../quarkus-native/application/settings.gradle | 5 +++++ dd-smoke-tests/quarkus/application/settings.gradle | 5 +++++ .../spring-boot-2.5-webflux/build.gradle | 6 ------ .../application/settings.gradle | 5 +++++ .../application/settings.gradle | 5 +++++ .../application/settings.gradle | 5 +++++ .../application/settings.gradle | 5 +++++ .../application/settings.gradle | 5 +++++ dd-smoke-tests/springboot-freemarker/build.gradle | 4 ---- dd-smoke-tests/springboot-java-11/build.gradle | 4 ---- dd-smoke-tests/springboot-java-17/build.gradle | 4 ---- dd-smoke-tests/springboot-jetty-jsp/build.gradle | 4 ---- dd-smoke-tests/springboot-thymeleaf/build.gradle | 4 ---- dd-smoke-tests/springboot-tomcat-jsp/build.gradle | 4 ---- dd-smoke-tests/wildfly/spring-ear/settings.gradle | 5 +++++ dd-smoke-tests/wildfly/spring-ear/war/build.gradle | 6 ++++++ gradle/repositories.gradle | 14 +++++++++++++- remote-config/remote-config-core/build.gradle | 6 ------ settings.gradle | 13 +++++++++++++ test-published-dependencies/build.gradle | 7 +------ 41 files changed, 161 insertions(+), 89 deletions(-) diff --git a/build.gradle b/build.gradle index f655620bb00..8629065f394 100644 --- a/build.gradle +++ b/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 { diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 3b67df19176..e88a6807bcf 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -22,10 +22,8 @@ gradlePlugin { } } -repositories { - mavenLocal() - mavenCentral() - gradlePluginPortal() +apply { + from("$rootDir/../gradle/repositories.gradle") } dependencies { diff --git a/buildSrc/call-site-instrumentation-plugin/build.gradle.kts b/buildSrc/call-site-instrumentation-plugin/build.gradle.kts index 8e21a9af7ab..d955d11cd26 100644 --- a/buildSrc/call-site-instrumentation-plugin/build.gradle.kts +++ b/buildSrc/call-site-instrumentation-plugin/build.gradle.kts @@ -24,10 +24,8 @@ spotless { } } -repositories { - mavenLocal() - mavenCentral() - gradlePluginPortal() +apply { + from("$rootDir/../gradle/repositories.gradle") } dependencies { diff --git a/dd-java-agent/agent-ci-visibility/build.gradle b/dd-java-agent/agent-ci-visibility/build.gradle index 4cd0f623c03..39663f247ce 100644 --- a/dd-java-agent/agent-ci-visibility/build.gradle +++ b/dd-java-agent/agent-ci-visibility/build.gradle @@ -1,5 +1,11 @@ buildscript { repositories { + mavenLocal() + if (project.rootProject.hasProperty("mavenRepositoryProxy")) { + maven { + url project.rootProject.property("mavenRepositoryProxy") + } + } mavenCentral() } diff --git a/dd-java-agent/benchmark-integration/build.gradle b/dd-java-agent/benchmark-integration/build.gradle index c367c4fa342..8e020260d5e 100644 --- a/dd-java-agent/benchmark-integration/build.gradle +++ b/dd-java-agent/benchmark-integration/build.gradle @@ -1,5 +1,11 @@ buildscript { repositories { + mavenLocal() + if (project.rootProject.hasProperty("mavenRepositoryProxy")) { + maven { + url project.rootProject.property("mavenRepositoryProxy") + } + } mavenCentral() gradlePluginPortal() } diff --git a/dd-java-agent/benchmark-integration/play-perftest/build.gradle b/dd-java-agent/benchmark-integration/play-perftest/build.gradle index 52540ef3ef5..9fe22103921 100644 --- a/dd-java-agent/benchmark-integration/play-perftest/build.gradle +++ b/dd-java-agent/benchmark-integration/play-perftest/build.gradle @@ -26,8 +26,13 @@ dependencies { } repositories { + mavenLocal() + if (project.rootProject.hasProperty("mavenRepositoryProxy")) { + maven { + url project.rootProject.property("mavenRepositoryProxy") + } + } mavenCentral() - gradlePluginPortal() maven { name "lightbend-maven-releases" url "https://repo.lightbend.com/lightbend/maven-release" diff --git a/dd-java-agent/instrumentation/build.gradle b/dd-java-agent/instrumentation/build.gradle index 777de23d76f..1852c7a6854 100644 --- a/dd-java-agent/instrumentation/build.gradle +++ b/dd-java-agent/instrumentation/build.gradle @@ -2,6 +2,12 @@ buildscript { repositories { + mavenLocal() + if (project.rootProject.hasProperty("mavenRepositoryProxy")) { + maven { + url project.rootProject.property("mavenRepositoryProxy") + } + } mavenCentral() } diff --git a/dd-java-agent/instrumentation/datanucleus-4/build.gradle b/dd-java-agent/instrumentation/datanucleus-4/build.gradle index 5d999846521..330489573b4 100644 --- a/dd-java-agent/instrumentation/datanucleus-4/build.gradle +++ b/dd-java-agent/instrumentation/datanucleus-4/build.gradle @@ -2,7 +2,14 @@ import org.datanucleus.enhancer.DataNucleusEnhancer buildscript { repositories { + mavenLocal() + if (project.rootProject.hasProperty("mavenRepositoryProxy")) { + maven { + url project.rootProject.property("mavenRepositoryProxy") + } + } mavenCentral() + gradlePluginPortal() } dependencies { diff --git a/dd-java-agent/testing/build.gradle b/dd-java-agent/testing/build.gradle index 859a5d9ecd5..3403b5ca8b9 100644 --- a/dd-java-agent/testing/build.gradle +++ b/dd-java-agent/testing/build.gradle @@ -9,13 +9,6 @@ ext { apply from: "$rootDir/gradle/java.gradle" -repositories { - ivy { - artifactPattern 'https://sqreen-ci-java.s3.amazonaws.com/jars/[organisation]/[artifact]-[revision](-[classifier]).[ext]' - ivyPattern 'https://sqreen-ci-java.s3.amazonaws.com/jars/[organisation]/[module]-[revision].xml' - } -} - minimumBranchCoverage = 0.5 minimumInstructionCoverage = 0.5 excludedClassesCoverage += [ diff --git a/dd-smoke-tests/apm-tracing-disabled/build.gradle b/dd-smoke-tests/apm-tracing-disabled/build.gradle index d5f5774ef34..6035c46a8b9 100644 --- a/dd-smoke-tests/apm-tracing-disabled/build.gradle +++ b/dd-smoke-tests/apm-tracing-disabled/build.gradle @@ -12,10 +12,6 @@ java { sourceCompatibility = '1.8' } -repositories { - mavenCentral() -} - dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' implementation group: 'io.opentracing', name: 'opentracing-api', version: '0.32.0' diff --git a/dd-smoke-tests/armeria-grpc/application/settings.gradle b/dd-smoke-tests/armeria-grpc/application/settings.gradle index 6ec6749fcad..387db3f06d9 100644 --- a/dd-smoke-tests/armeria-grpc/application/settings.gradle +++ b/dd-smoke-tests/armeria-grpc/application/settings.gradle @@ -1,6 +1,11 @@ pluginManagement { repositories { mavenLocal() + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + } + } mavenCentral() gradlePluginPortal() } diff --git a/dd-smoke-tests/datastreams/kafkaschemaregistry/build.gradle b/dd-smoke-tests/datastreams/kafkaschemaregistry/build.gradle index d09cb263e6f..ad707301e3b 100644 --- a/dd-smoke-tests/datastreams/kafkaschemaregistry/build.gradle +++ b/dd-smoke-tests/datastreams/kafkaschemaregistry/build.gradle @@ -4,14 +4,6 @@ plugins { id 'org.springframework.boot' version '2.6.3' } -repositories { - mavenCentral() - maven { - url 'https://packages.confluent.io/maven/' - } - maven { url 'https://repo.spring.io/libs-milestone' } -} - apply from: "$rootDir/gradle/java.gradle" description = 'Kafka Smoke Tests.' diff --git a/dd-smoke-tests/grpc-1.5/build.gradle b/dd-smoke-tests/grpc-1.5/build.gradle index 0b1c81d99a8..88fb250c622 100644 --- a/dd-smoke-tests/grpc-1.5/build.gradle +++ b/dd-smoke-tests/grpc-1.5/build.gradle @@ -10,11 +10,6 @@ plugins { apply from: "$rootDir/gradle/java.gradle" -repositories { - // Use Maven Central for resolving dependencies. - mavenCentral() -} - def grpcVersion = '1.58.0' def protobufVersion = '3.24.0' def protocVersion = protobufVersion diff --git a/dd-smoke-tests/kafka-3/application/settings.gradle b/dd-smoke-tests/kafka-3/application/settings.gradle index c115e2b5db1..18d3cc89555 100644 --- a/dd-smoke-tests/kafka-3/application/settings.gradle +++ b/dd-smoke-tests/kafka-3/application/settings.gradle @@ -1,6 +1,11 @@ pluginManagement { repositories { mavenLocal() + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + } + } mavenCentral() gradlePluginPortal() } diff --git a/dd-smoke-tests/play-2.4/build.gradle b/dd-smoke-tests/play-2.4/build.gradle index cbb2a0d97cf..ae28bc2e495 100644 --- a/dd-smoke-tests/play-2.4/build.gradle +++ b/dd-smoke-tests/play-2.4/build.gradle @@ -32,8 +32,13 @@ distributions { } repositories { + mavenLocal() + if (project.rootProject.hasProperty("mavenRepositoryProxy")) { + maven { + url project.rootProject.property("mavenRepositoryProxy") + } + } mavenCentral() - gradlePluginPortal() maven { name "lightbend-maven-releases" url "https://repo.lightbend.com/lightbend/maven-release" diff --git a/dd-smoke-tests/play-2.5/build.gradle b/dd-smoke-tests/play-2.5/build.gradle index 55b187fb769..b52f8c1f042 100644 --- a/dd-smoke-tests/play-2.5/build.gradle +++ b/dd-smoke-tests/play-2.5/build.gradle @@ -32,8 +32,13 @@ distributions { } repositories { + mavenLocal() + if (project.rootProject.hasProperty("mavenRepositoryProxy")) { + maven { + url project.rootProject.property("mavenRepositoryProxy") + } + } mavenCentral() - gradlePluginPortal() maven { name "lightbend-maven-releases" url "https://repo.lightbend.com/lightbend/maven-release" diff --git a/dd-smoke-tests/play-2.6/build.gradle b/dd-smoke-tests/play-2.6/build.gradle index d3d18b56f2a..cf4605af069 100644 --- a/dd-smoke-tests/play-2.6/build.gradle +++ b/dd-smoke-tests/play-2.6/build.gradle @@ -32,8 +32,13 @@ distributions { } repositories { + mavenLocal() + if (project.rootProject.hasProperty("mavenRepositoryProxy")) { + maven { + url project.rootProject.property("mavenRepositoryProxy") + } + } mavenCentral() - gradlePluginPortal() maven { name "lightbend-maven-releases" url "https://repo.lightbend.com/lightbend/maven-release" diff --git a/dd-smoke-tests/play-2.7/build.gradle b/dd-smoke-tests/play-2.7/build.gradle index 357c7be9a60..64340d29733 100644 --- a/dd-smoke-tests/play-2.7/build.gradle +++ b/dd-smoke-tests/play-2.7/build.gradle @@ -32,8 +32,13 @@ distributions { } repositories { + mavenLocal() + if (project.rootProject.hasProperty("mavenRepositoryProxy")) { + maven { + url project.rootProject.property("mavenRepositoryProxy") + } + } mavenCentral() - gradlePluginPortal() maven { name "lightbend-maven-releases" url "https://repo.lightbend.com/lightbend/maven-release" diff --git a/dd-smoke-tests/play-2.8-otel/build.gradle b/dd-smoke-tests/play-2.8-otel/build.gradle index 13ed0848d71..6160d167a7a 100644 --- a/dd-smoke-tests/play-2.8-otel/build.gradle +++ b/dd-smoke-tests/play-2.8-otel/build.gradle @@ -27,8 +27,13 @@ distributions { } repositories { + mavenLocal() + if (project.rootProject.hasProperty("mavenRepositoryProxy")) { + maven { + url project.rootProject.property("mavenRepositoryProxy") + } + } mavenCentral() - gradlePluginPortal() maven { name "lightbend-maven-releases" url "https://repo.lightbend.com/lightbend/maven-release" diff --git a/dd-smoke-tests/play-2.8-split-routes/build.gradle b/dd-smoke-tests/play-2.8-split-routes/build.gradle index 0c831c70fbd..df4b4dae14e 100644 --- a/dd-smoke-tests/play-2.8-split-routes/build.gradle +++ b/dd-smoke-tests/play-2.8-split-routes/build.gradle @@ -27,8 +27,13 @@ distributions { } repositories { + mavenLocal() + if (project.rootProject.hasProperty("mavenRepositoryProxy")) { + maven { + url project.rootProject.property("mavenRepositoryProxy") + } + } mavenCentral() - gradlePluginPortal() maven { name "lightbend-maven-releases" url "https://repo.lightbend.com/lightbend/maven-release" diff --git a/dd-smoke-tests/play-2.8/build.gradle b/dd-smoke-tests/play-2.8/build.gradle index 75dcdae7913..09dd2a31002 100644 --- a/dd-smoke-tests/play-2.8/build.gradle +++ b/dd-smoke-tests/play-2.8/build.gradle @@ -27,8 +27,13 @@ distributions { } repositories { + mavenLocal() + if (project.rootProject.hasProperty("mavenRepositoryProxy")) { + maven { + url project.rootProject.property("mavenRepositoryProxy") + } + } mavenCentral() - gradlePluginPortal() maven { name "lightbend-maven-releases" url "https://repo.lightbend.com/lightbend/maven-release" diff --git a/dd-smoke-tests/quarkus-native/application/settings.gradle b/dd-smoke-tests/quarkus-native/application/settings.gradle index 5b6c7b616d3..54d8314939a 100644 --- a/dd-smoke-tests/quarkus-native/application/settings.gradle +++ b/dd-smoke-tests/quarkus-native/application/settings.gradle @@ -1,6 +1,11 @@ pluginManagement { repositories { mavenLocal() + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + } + } mavenCentral() gradlePluginPortal() } diff --git a/dd-smoke-tests/quarkus/application/settings.gradle b/dd-smoke-tests/quarkus/application/settings.gradle index eb582e9be9e..a61d3c14925 100644 --- a/dd-smoke-tests/quarkus/application/settings.gradle +++ b/dd-smoke-tests/quarkus/application/settings.gradle @@ -1,6 +1,11 @@ pluginManagement { repositories { mavenLocal() + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + } + } mavenCentral() gradlePluginPortal() } diff --git a/dd-smoke-tests/spring-boot-2.5-webflux/build.gradle b/dd-smoke-tests/spring-boot-2.5-webflux/build.gradle index 9de2ebaa7f2..99420989357 100644 --- a/dd-smoke-tests/spring-boot-2.5-webflux/build.gradle +++ b/dd-smoke-tests/spring-boot-2.5-webflux/build.gradle @@ -17,12 +17,6 @@ shadowJar { configurations = [project.configurations.runtimeClasspath] } -// Only needed until the final release of 2.5.0 -repositories { - mavenCentral() - maven { url 'https://repo.spring.io/milestone' } -} - dependencies { implementation group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: '2.5.0+' testImplementation project(':dd-smoke-tests') diff --git a/dd-smoke-tests/spring-boot-2.7-webflux/application/settings.gradle b/dd-smoke-tests/spring-boot-2.7-webflux/application/settings.gradle index e91a7f738ef..0cd51889884 100644 --- a/dd-smoke-tests/spring-boot-2.7-webflux/application/settings.gradle +++ b/dd-smoke-tests/spring-boot-2.7-webflux/application/settings.gradle @@ -1,6 +1,11 @@ pluginManagement { repositories { mavenLocal() + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + } + } mavenCentral() gradlePluginPortal() } diff --git a/dd-smoke-tests/spring-boot-3.0-native/application/settings.gradle b/dd-smoke-tests/spring-boot-3.0-native/application/settings.gradle index 47224987ea1..ba75f4a860a 100644 --- a/dd-smoke-tests/spring-boot-3.0-native/application/settings.gradle +++ b/dd-smoke-tests/spring-boot-3.0-native/application/settings.gradle @@ -1,6 +1,11 @@ pluginManagement { repositories { mavenLocal() + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + } + } mavenCentral() gradlePluginPortal() } diff --git a/dd-smoke-tests/spring-boot-3.0-webflux/application/settings.gradle b/dd-smoke-tests/spring-boot-3.0-webflux/application/settings.gradle index d0ed8fbc660..693f570cf88 100644 --- a/dd-smoke-tests/spring-boot-3.0-webflux/application/settings.gradle +++ b/dd-smoke-tests/spring-boot-3.0-webflux/application/settings.gradle @@ -1,6 +1,11 @@ pluginManagement { repositories { mavenLocal() + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + } + } mavenCentral() gradlePluginPortal() } diff --git a/dd-smoke-tests/spring-boot-3.0-webmvc/application/settings.gradle b/dd-smoke-tests/spring-boot-3.0-webmvc/application/settings.gradle index eefefc8b056..7abd3b491e2 100644 --- a/dd-smoke-tests/spring-boot-3.0-webmvc/application/settings.gradle +++ b/dd-smoke-tests/spring-boot-3.0-webmvc/application/settings.gradle @@ -1,6 +1,11 @@ pluginManagement { repositories { mavenLocal() + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + } + } mavenCentral() gradlePluginPortal() } diff --git a/dd-smoke-tests/spring-boot-3.3-webmvc/application/settings.gradle b/dd-smoke-tests/spring-boot-3.3-webmvc/application/settings.gradle index b67b84505e6..f0fab663f1d 100644 --- a/dd-smoke-tests/spring-boot-3.3-webmvc/application/settings.gradle +++ b/dd-smoke-tests/spring-boot-3.3-webmvc/application/settings.gradle @@ -1,6 +1,11 @@ pluginManagement { repositories { mavenLocal() + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + } + } mavenCentral() gradlePluginPortal() } diff --git a/dd-smoke-tests/springboot-freemarker/build.gradle b/dd-smoke-tests/springboot-freemarker/build.gradle index 9cbd3352d80..e9e6d962c19 100644 --- a/dd-smoke-tests/springboot-freemarker/build.gradle +++ b/dd-smoke-tests/springboot-freemarker/build.gradle @@ -12,10 +12,6 @@ java { sourceCompatibility = '1.8' } -repositories { - mavenCentral() -} - dependencies { implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '1.5.18.RELEASE' implementation group: 'org.freemarker', name: 'freemarker', version: '2.3.24-incubating' diff --git a/dd-smoke-tests/springboot-java-11/build.gradle b/dd-smoke-tests/springboot-java-11/build.gradle index 031e6615c5c..336ce124b67 100644 --- a/dd-smoke-tests/springboot-java-11/build.gradle +++ b/dd-smoke-tests/springboot-java-11/build.gradle @@ -12,10 +12,6 @@ ext { apply from: "$rootDir/gradle/java.gradle" description = 'SpringBoot Java 11 Smoke Tests.' -repositories { - mavenCentral() -} - dependencies { implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.2.0.RELEASE' diff --git a/dd-smoke-tests/springboot-java-17/build.gradle b/dd-smoke-tests/springboot-java-17/build.gradle index c6d99c2de64..b138ccfb383 100644 --- a/dd-smoke-tests/springboot-java-17/build.gradle +++ b/dd-smoke-tests/springboot-java-17/build.gradle @@ -12,10 +12,6 @@ ext { apply from: "$rootDir/gradle/java.gradle" description = 'SpringBoot Java 17 Smoke Tests.' -repositories { - mavenCentral() -} - dependencies { implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.2.0.RELEASE' diff --git a/dd-smoke-tests/springboot-jetty-jsp/build.gradle b/dd-smoke-tests/springboot-jetty-jsp/build.gradle index a953ed4adc1..aa99cd77534 100644 --- a/dd-smoke-tests/springboot-jetty-jsp/build.gradle +++ b/dd-smoke-tests/springboot-jetty-jsp/build.gradle @@ -13,10 +13,6 @@ java { sourceCompatibility = '1.8' } -repositories { - mavenCentral() -} - sourceSets { main { resources.srcDir("src/main/webapp") diff --git a/dd-smoke-tests/springboot-thymeleaf/build.gradle b/dd-smoke-tests/springboot-thymeleaf/build.gradle index 61977c12bf1..80cfcedc0c4 100644 --- a/dd-smoke-tests/springboot-thymeleaf/build.gradle +++ b/dd-smoke-tests/springboot-thymeleaf/build.gradle @@ -12,10 +12,6 @@ java { sourceCompatibility = '1.8' } -repositories { - mavenCentral() -} - dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' diff --git a/dd-smoke-tests/springboot-tomcat-jsp/build.gradle b/dd-smoke-tests/springboot-tomcat-jsp/build.gradle index 31e6db4bebd..c80b878adfc 100644 --- a/dd-smoke-tests/springboot-tomcat-jsp/build.gradle +++ b/dd-smoke-tests/springboot-tomcat-jsp/build.gradle @@ -13,10 +13,6 @@ java { sourceCompatibility = '1.8' } -repositories { - mavenCentral() -} - sourceSets { main { resources.srcDir("src/main/webapp") diff --git a/dd-smoke-tests/wildfly/spring-ear/settings.gradle b/dd-smoke-tests/wildfly/spring-ear/settings.gradle index 734bb11b017..05402fe766b 100644 --- a/dd-smoke-tests/wildfly/spring-ear/settings.gradle +++ b/dd-smoke-tests/wildfly/spring-ear/settings.gradle @@ -1,6 +1,11 @@ pluginManagement { repositories { mavenLocal() + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + } + } mavenCentral() gradlePluginPortal() } diff --git a/dd-smoke-tests/wildfly/spring-ear/war/build.gradle b/dd-smoke-tests/wildfly/spring-ear/war/build.gradle index 2ebbfebc77b..2c32e3b8d86 100644 --- a/dd-smoke-tests/wildfly/spring-ear/war/build.gradle +++ b/dd-smoke-tests/wildfly/spring-ear/war/build.gradle @@ -2,6 +2,12 @@ apply plugin: 'java' apply plugin: 'war' repositories { + mavenLocal() + if (project.rootProject.hasProperty("mavenRepositoryProxy")) { + maven { + url project.rootProject.property("mavenRepositoryProxy") + } + } mavenCentral() } diff --git a/gradle/repositories.gradle b/gradle/repositories.gradle index 0b0a3e7ecd8..b35471e4041 100644 --- a/gradle/repositories.gradle +++ b/gradle/repositories.gradle @@ -1,10 +1,10 @@ repositories { + mavenLocal() if (project.rootProject.hasProperty("mavenRepositoryProxy")) { maven { url project.rootProject.property("mavenRepositoryProxy") } } - mavenLocal() mavenCentral() // add sonatype repository for snapshot dependencies maven { @@ -23,4 +23,16 @@ repositories { includeGroup 'io.sqreen' } } + maven { + url 'https://packages.confluent.io/maven/' + content { + includeGroupAndSubgroups "io.confluent" + } + } + maven { + url 'https://repo.spring.io/libs-milestone' + content { + includeGroupAndSubgroups "org.springframework" + } + } } diff --git a/remote-config/remote-config-core/build.gradle b/remote-config/remote-config-core/build.gradle index 35bc61dbd96..3836370a512 100644 --- a/remote-config/remote-config-core/build.gradle +++ b/remote-config/remote-config-core/build.gradle @@ -1,9 +1,3 @@ -buildscript { - repositories { - mavenCentral() - } -} - apply from: "$rootDir/gradle/java.gradle" ext { diff --git a/settings.gradle b/settings.gradle index 4df68ccfc00..d277a597e9f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,16 @@ +pluginManagement { + repositories { + mavenLocal() + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + } + } + mavenCentral() + gradlePluginPortal() + } +} + plugins { id 'com.gradle.develocity' version '3.18' } diff --git a/test-published-dependencies/build.gradle b/test-published-dependencies/build.gradle index 8e28c12b8d5..83811be6b8e 100644 --- a/test-published-dependencies/build.gradle +++ b/test-published-dependencies/build.gradle @@ -12,11 +12,6 @@ allprojects { group = 'com.datadoghq' version = versionFromFile - repositories { - mavenLocal() - mavenCentral() - gradlePluginPortal() - } - + apply from: "$sharedConfigDirectory/repositories.gradle" apply from: "$sharedConfigDirectory/spotless.gradle" } From 2b37e3bd93d375e6da7a3299d783b0acfc8e5db2 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Wed, 19 Mar 2025 15:24:43 -0400 Subject: [PATCH 2/7] update proxy url to use internal routing --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 267fe3347d3..c1a474e1ebd 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: "https://artifactual.us1.prod.dog/repository/maven-central/" + MAVEN_REPOSITORY_PROXY: "https://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/global-maven-proxy/" JAVA_BUILD_IMAGE_VERSION: "v25.01" REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations" PROFILE_TESTS: From 7092cd0a350843994e130144eea7e2cd2d2bddfc Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Wed, 19 Mar 2025 15:45:05 -0400 Subject: [PATCH 3/7] no "s" --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c1a474e1ebd..ca983dd28bc 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: "https://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/global-maven-proxy/" + MAVEN_REPOSITORY_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/global-maven-proxy/" JAVA_BUILD_IMAGE_VERSION: "v25.01" REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations" PROFILE_TESTS: From 391d0c3221b74d8960d3e1b6034144f05d7536d0 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Wed, 19 Mar 2025 15:54:23 -0400 Subject: [PATCH 4/7] allow insecure everywhere --- dd-java-agent/agent-ci-visibility/build.gradle | 1 + dd-java-agent/benchmark-integration/build.gradle | 1 + dd-java-agent/benchmark-integration/play-perftest/build.gradle | 1 + dd-java-agent/instrumentation/build.gradle | 1 + dd-java-agent/instrumentation/datanucleus-4/build.gradle | 1 + dd-smoke-tests/armeria-grpc/application/settings.gradle | 1 + dd-smoke-tests/kafka-3/application/settings.gradle | 1 + dd-smoke-tests/play-2.4/build.gradle | 1 + dd-smoke-tests/play-2.5/build.gradle | 1 + dd-smoke-tests/play-2.6/build.gradle | 1 + dd-smoke-tests/play-2.7/build.gradle | 1 + dd-smoke-tests/play-2.8-otel/build.gradle | 1 + dd-smoke-tests/play-2.8-split-routes/build.gradle | 1 + dd-smoke-tests/play-2.8/build.gradle | 1 + dd-smoke-tests/quarkus-native/application/settings.gradle | 1 + dd-smoke-tests/quarkus/application/settings.gradle | 1 + .../spring-boot-2.7-webflux/application/settings.gradle | 1 + .../spring-boot-3.0-native/application/settings.gradle | 1 + .../spring-boot-3.0-webflux/application/settings.gradle | 1 + .../spring-boot-3.0-webmvc/application/settings.gradle | 1 + .../spring-boot-3.3-webmvc/application/settings.gradle | 1 + dd-smoke-tests/wildfly/spring-ear/settings.gradle | 1 + dd-smoke-tests/wildfly/spring-ear/war/build.gradle | 1 + gradle/repositories.gradle | 1 + settings.gradle | 1 + 25 files changed, 25 insertions(+) diff --git a/dd-java-agent/agent-ci-visibility/build.gradle b/dd-java-agent/agent-ci-visibility/build.gradle index 39663f247ce..84b6ac370f0 100644 --- a/dd-java-agent/agent-ci-visibility/build.gradle +++ b/dd-java-agent/agent-ci-visibility/build.gradle @@ -4,6 +4,7 @@ buildscript { if (project.rootProject.hasProperty("mavenRepositoryProxy")) { maven { url project.rootProject.property("mavenRepositoryProxy") + allowInsecureProtocol true } } mavenCentral() diff --git a/dd-java-agent/benchmark-integration/build.gradle b/dd-java-agent/benchmark-integration/build.gradle index 8e020260d5e..342d57a916b 100644 --- a/dd-java-agent/benchmark-integration/build.gradle +++ b/dd-java-agent/benchmark-integration/build.gradle @@ -4,6 +4,7 @@ buildscript { if (project.rootProject.hasProperty("mavenRepositoryProxy")) { maven { url project.rootProject.property("mavenRepositoryProxy") + allowInsecureProtocol true } } mavenCentral() diff --git a/dd-java-agent/benchmark-integration/play-perftest/build.gradle b/dd-java-agent/benchmark-integration/play-perftest/build.gradle index 9fe22103921..3a6e79dadeb 100644 --- a/dd-java-agent/benchmark-integration/play-perftest/build.gradle +++ b/dd-java-agent/benchmark-integration/play-perftest/build.gradle @@ -30,6 +30,7 @@ repositories { if (project.rootProject.hasProperty("mavenRepositoryProxy")) { maven { url project.rootProject.property("mavenRepositoryProxy") + allowInsecureProtocol true } } mavenCentral() diff --git a/dd-java-agent/instrumentation/build.gradle b/dd-java-agent/instrumentation/build.gradle index 1852c7a6854..5e04ed9d098 100644 --- a/dd-java-agent/instrumentation/build.gradle +++ b/dd-java-agent/instrumentation/build.gradle @@ -6,6 +6,7 @@ buildscript { if (project.rootProject.hasProperty("mavenRepositoryProxy")) { maven { url project.rootProject.property("mavenRepositoryProxy") + allowInsecureProtocol true } } mavenCentral() diff --git a/dd-java-agent/instrumentation/datanucleus-4/build.gradle b/dd-java-agent/instrumentation/datanucleus-4/build.gradle index 330489573b4..f6d215fce93 100644 --- a/dd-java-agent/instrumentation/datanucleus-4/build.gradle +++ b/dd-java-agent/instrumentation/datanucleus-4/build.gradle @@ -6,6 +6,7 @@ buildscript { if (project.rootProject.hasProperty("mavenRepositoryProxy")) { maven { url project.rootProject.property("mavenRepositoryProxy") + allowInsecureProtocol true } } mavenCentral() diff --git a/dd-smoke-tests/armeria-grpc/application/settings.gradle b/dd-smoke-tests/armeria-grpc/application/settings.gradle index 387db3f06d9..0bad037caf9 100644 --- a/dd-smoke-tests/armeria-grpc/application/settings.gradle +++ b/dd-smoke-tests/armeria-grpc/application/settings.gradle @@ -4,6 +4,7 @@ pluginManagement { if (settings.hasProperty("mavenRepositoryProxy")) { maven { url settings["mavenRepositoryProxy"] + allowInsecureProtocol true } } mavenCentral() diff --git a/dd-smoke-tests/kafka-3/application/settings.gradle b/dd-smoke-tests/kafka-3/application/settings.gradle index 18d3cc89555..b6478078496 100644 --- a/dd-smoke-tests/kafka-3/application/settings.gradle +++ b/dd-smoke-tests/kafka-3/application/settings.gradle @@ -4,6 +4,7 @@ pluginManagement { if (settings.hasProperty("mavenRepositoryProxy")) { maven { url settings["mavenRepositoryProxy"] + allowInsecureProtocol true } } mavenCentral() diff --git a/dd-smoke-tests/play-2.4/build.gradle b/dd-smoke-tests/play-2.4/build.gradle index ae28bc2e495..9be50043bde 100644 --- a/dd-smoke-tests/play-2.4/build.gradle +++ b/dd-smoke-tests/play-2.4/build.gradle @@ -36,6 +36,7 @@ repositories { if (project.rootProject.hasProperty("mavenRepositoryProxy")) { maven { url project.rootProject.property("mavenRepositoryProxy") + allowInsecureProtocol true } } mavenCentral() diff --git a/dd-smoke-tests/play-2.5/build.gradle b/dd-smoke-tests/play-2.5/build.gradle index b52f8c1f042..6c992889cd0 100644 --- a/dd-smoke-tests/play-2.5/build.gradle +++ b/dd-smoke-tests/play-2.5/build.gradle @@ -36,6 +36,7 @@ repositories { if (project.rootProject.hasProperty("mavenRepositoryProxy")) { maven { url project.rootProject.property("mavenRepositoryProxy") + allowInsecureProtocol true } } mavenCentral() diff --git a/dd-smoke-tests/play-2.6/build.gradle b/dd-smoke-tests/play-2.6/build.gradle index cf4605af069..2c50adfcb96 100644 --- a/dd-smoke-tests/play-2.6/build.gradle +++ b/dd-smoke-tests/play-2.6/build.gradle @@ -36,6 +36,7 @@ repositories { if (project.rootProject.hasProperty("mavenRepositoryProxy")) { maven { url project.rootProject.property("mavenRepositoryProxy") + allowInsecureProtocol true } } mavenCentral() diff --git a/dd-smoke-tests/play-2.7/build.gradle b/dd-smoke-tests/play-2.7/build.gradle index 64340d29733..ac64c0f6f01 100644 --- a/dd-smoke-tests/play-2.7/build.gradle +++ b/dd-smoke-tests/play-2.7/build.gradle @@ -36,6 +36,7 @@ repositories { if (project.rootProject.hasProperty("mavenRepositoryProxy")) { maven { url project.rootProject.property("mavenRepositoryProxy") + allowInsecureProtocol true } } mavenCentral() diff --git a/dd-smoke-tests/play-2.8-otel/build.gradle b/dd-smoke-tests/play-2.8-otel/build.gradle index 6160d167a7a..44421b6e91f 100644 --- a/dd-smoke-tests/play-2.8-otel/build.gradle +++ b/dd-smoke-tests/play-2.8-otel/build.gradle @@ -31,6 +31,7 @@ repositories { if (project.rootProject.hasProperty("mavenRepositoryProxy")) { maven { url project.rootProject.property("mavenRepositoryProxy") + allowInsecureProtocol true } } mavenCentral() diff --git a/dd-smoke-tests/play-2.8-split-routes/build.gradle b/dd-smoke-tests/play-2.8-split-routes/build.gradle index df4b4dae14e..3c540f3f436 100644 --- a/dd-smoke-tests/play-2.8-split-routes/build.gradle +++ b/dd-smoke-tests/play-2.8-split-routes/build.gradle @@ -31,6 +31,7 @@ repositories { if (project.rootProject.hasProperty("mavenRepositoryProxy")) { maven { url project.rootProject.property("mavenRepositoryProxy") + allowInsecureProtocol true } } mavenCentral() diff --git a/dd-smoke-tests/play-2.8/build.gradle b/dd-smoke-tests/play-2.8/build.gradle index 09dd2a31002..acea44b532a 100644 --- a/dd-smoke-tests/play-2.8/build.gradle +++ b/dd-smoke-tests/play-2.8/build.gradle @@ -31,6 +31,7 @@ repositories { if (project.rootProject.hasProperty("mavenRepositoryProxy")) { maven { url project.rootProject.property("mavenRepositoryProxy") + allowInsecureProtocol true } } mavenCentral() diff --git a/dd-smoke-tests/quarkus-native/application/settings.gradle b/dd-smoke-tests/quarkus-native/application/settings.gradle index 54d8314939a..ff115e0cadf 100644 --- a/dd-smoke-tests/quarkus-native/application/settings.gradle +++ b/dd-smoke-tests/quarkus-native/application/settings.gradle @@ -4,6 +4,7 @@ pluginManagement { if (settings.hasProperty("mavenRepositoryProxy")) { maven { url settings["mavenRepositoryProxy"] + allowInsecureProtocol true } } mavenCentral() diff --git a/dd-smoke-tests/quarkus/application/settings.gradle b/dd-smoke-tests/quarkus/application/settings.gradle index a61d3c14925..bc6492d81fd 100644 --- a/dd-smoke-tests/quarkus/application/settings.gradle +++ b/dd-smoke-tests/quarkus/application/settings.gradle @@ -4,6 +4,7 @@ pluginManagement { if (settings.hasProperty("mavenRepositoryProxy")) { maven { url settings["mavenRepositoryProxy"] + allowInsecureProtocol true } } mavenCentral() diff --git a/dd-smoke-tests/spring-boot-2.7-webflux/application/settings.gradle b/dd-smoke-tests/spring-boot-2.7-webflux/application/settings.gradle index 0cd51889884..ded06a39f3e 100644 --- a/dd-smoke-tests/spring-boot-2.7-webflux/application/settings.gradle +++ b/dd-smoke-tests/spring-boot-2.7-webflux/application/settings.gradle @@ -4,6 +4,7 @@ pluginManagement { if (settings.hasProperty("mavenRepositoryProxy")) { maven { url settings["mavenRepositoryProxy"] + allowInsecureProtocol true } } mavenCentral() diff --git a/dd-smoke-tests/spring-boot-3.0-native/application/settings.gradle b/dd-smoke-tests/spring-boot-3.0-native/application/settings.gradle index ba75f4a860a..ba2988ac170 100644 --- a/dd-smoke-tests/spring-boot-3.0-native/application/settings.gradle +++ b/dd-smoke-tests/spring-boot-3.0-native/application/settings.gradle @@ -4,6 +4,7 @@ pluginManagement { if (settings.hasProperty("mavenRepositoryProxy")) { maven { url settings["mavenRepositoryProxy"] + allowInsecureProtocol true } } mavenCentral() diff --git a/dd-smoke-tests/spring-boot-3.0-webflux/application/settings.gradle b/dd-smoke-tests/spring-boot-3.0-webflux/application/settings.gradle index 693f570cf88..1fe3ceca980 100644 --- a/dd-smoke-tests/spring-boot-3.0-webflux/application/settings.gradle +++ b/dd-smoke-tests/spring-boot-3.0-webflux/application/settings.gradle @@ -4,6 +4,7 @@ pluginManagement { if (settings.hasProperty("mavenRepositoryProxy")) { maven { url settings["mavenRepositoryProxy"] + allowInsecureProtocol true } } mavenCentral() diff --git a/dd-smoke-tests/spring-boot-3.0-webmvc/application/settings.gradle b/dd-smoke-tests/spring-boot-3.0-webmvc/application/settings.gradle index 7abd3b491e2..ed95d363660 100644 --- a/dd-smoke-tests/spring-boot-3.0-webmvc/application/settings.gradle +++ b/dd-smoke-tests/spring-boot-3.0-webmvc/application/settings.gradle @@ -4,6 +4,7 @@ pluginManagement { if (settings.hasProperty("mavenRepositoryProxy")) { maven { url settings["mavenRepositoryProxy"] + allowInsecureProtocol true } } mavenCentral() diff --git a/dd-smoke-tests/spring-boot-3.3-webmvc/application/settings.gradle b/dd-smoke-tests/spring-boot-3.3-webmvc/application/settings.gradle index f0fab663f1d..b66984ca2e6 100644 --- a/dd-smoke-tests/spring-boot-3.3-webmvc/application/settings.gradle +++ b/dd-smoke-tests/spring-boot-3.3-webmvc/application/settings.gradle @@ -4,6 +4,7 @@ pluginManagement { if (settings.hasProperty("mavenRepositoryProxy")) { maven { url settings["mavenRepositoryProxy"] + allowInsecureProtocol true } } mavenCentral() diff --git a/dd-smoke-tests/wildfly/spring-ear/settings.gradle b/dd-smoke-tests/wildfly/spring-ear/settings.gradle index 05402fe766b..754fdd42b8e 100644 --- a/dd-smoke-tests/wildfly/spring-ear/settings.gradle +++ b/dd-smoke-tests/wildfly/spring-ear/settings.gradle @@ -4,6 +4,7 @@ pluginManagement { if (settings.hasProperty("mavenRepositoryProxy")) { maven { url settings["mavenRepositoryProxy"] + allowInsecureProtocol true } } mavenCentral() diff --git a/dd-smoke-tests/wildfly/spring-ear/war/build.gradle b/dd-smoke-tests/wildfly/spring-ear/war/build.gradle index 2c32e3b8d86..b5600006fa0 100644 --- a/dd-smoke-tests/wildfly/spring-ear/war/build.gradle +++ b/dd-smoke-tests/wildfly/spring-ear/war/build.gradle @@ -6,6 +6,7 @@ repositories { if (project.rootProject.hasProperty("mavenRepositoryProxy")) { maven { url project.rootProject.property("mavenRepositoryProxy") + allowInsecureProtocol true } } mavenCentral() diff --git a/gradle/repositories.gradle b/gradle/repositories.gradle index b35471e4041..e7a68c92e11 100644 --- a/gradle/repositories.gradle +++ b/gradle/repositories.gradle @@ -3,6 +3,7 @@ repositories { if (project.rootProject.hasProperty("mavenRepositoryProxy")) { maven { url project.rootProject.property("mavenRepositoryProxy") + allowInsecureProtocol true } } mavenCentral() diff --git a/settings.gradle b/settings.gradle index d277a597e9f..86ba5e9789d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,6 +4,7 @@ pluginManagement { if (settings.hasProperty("mavenRepositoryProxy")) { maven { url settings["mavenRepositoryProxy"] + allowInsecureProtocol true } } mavenCentral() From e2257572e79ceff5eafbf883f7f1ec4e50e048ca Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Wed, 19 Mar 2025 18:56:34 -0400 Subject: [PATCH 5/7] include apache with confluence --- gradle/repositories.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/gradle/repositories.gradle b/gradle/repositories.gradle index e7a68c92e11..cdcbb792a2d 100644 --- a/gradle/repositories.gradle +++ b/gradle/repositories.gradle @@ -28,6 +28,7 @@ repositories { url 'https://packages.confluent.io/maven/' content { includeGroupAndSubgroups "io.confluent" + includeGroupAndSubgroups "org.apache.kafka" } } maven { From 08a85b0e812462a27e90fa862c5cbd6dc2548aa5 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Thu, 20 Mar 2025 19:35:34 -0400 Subject: [PATCH 6/7] use gradlePluginCache, mavenCentral after pluginportal --- .gitlab-ci.yml | 5 +++-- dd-java-agent/agent-ci-visibility/build.gradle | 7 +++++++ dd-java-agent/benchmark-integration/build.gradle | 8 +++++++- dd-java-agent/instrumentation/build.gradle | 7 +++++++ dd-java-agent/instrumentation/datanucleus-4/build.gradle | 1 - dd-smoke-tests/armeria-grpc/application/settings.gradle | 8 +++++++- dd-smoke-tests/kafka-3/application/settings.gradle | 8 +++++++- dd-smoke-tests/quarkus-native/application/settings.gradle | 8 +++++++- dd-smoke-tests/quarkus/application/settings.gradle | 8 +++++++- .../spring-boot-2.7-webflux/application/settings.gradle | 8 +++++++- .../spring-boot-3.0-native/application/settings.gradle | 8 +++++++- .../spring-boot-3.0-webflux/application/settings.gradle | 8 +++++++- .../spring-boot-3.0-webmvc/application/settings.gradle | 8 +++++++- .../spring-boot-3.3-webmvc/application/settings.gradle | 8 +++++++- dd-smoke-tests/wildfly/spring-ear/settings.gradle | 8 +++++++- settings.gradle | 8 +++++++- 16 files changed, 101 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ca983dd28bc..b85d3205718 100644 --- a/.gitlab-ci.yml +++ b/.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: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/global-maven-proxy/" + 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 diff --git a/dd-java-agent/agent-ci-visibility/build.gradle b/dd-java-agent/agent-ci-visibility/build.gradle index 84b6ac370f0..44b0f25d875 100644 --- a/dd-java-agent/agent-ci-visibility/build.gradle +++ b/dd-java-agent/agent-ci-visibility/build.gradle @@ -1,12 +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() } diff --git a/dd-java-agent/benchmark-integration/build.gradle b/dd-java-agent/benchmark-integration/build.gradle index 342d57a916b..bd1262e17fe 100644 --- a/dd-java-agent/benchmark-integration/build.gradle +++ b/dd-java-agent/benchmark-integration/build.gradle @@ -1,14 +1,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 } } - mavenCentral() gradlePluginPortal() + mavenCentral() } dependencies { classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.1' diff --git a/dd-java-agent/instrumentation/build.gradle b/dd-java-agent/instrumentation/build.gradle index 5e04ed9d098..0cc4e692e3f 100644 --- a/dd-java-agent/instrumentation/build.gradle +++ b/dd-java-agent/instrumentation/build.gradle @@ -3,12 +3,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() } diff --git a/dd-java-agent/instrumentation/datanucleus-4/build.gradle b/dd-java-agent/instrumentation/datanucleus-4/build.gradle index f6d215fce93..f550936c4b1 100644 --- a/dd-java-agent/instrumentation/datanucleus-4/build.gradle +++ b/dd-java-agent/instrumentation/datanucleus-4/build.gradle @@ -10,7 +10,6 @@ buildscript { } } mavenCentral() - gradlePluginPortal() } dependencies { diff --git a/dd-smoke-tests/armeria-grpc/application/settings.gradle b/dd-smoke-tests/armeria-grpc/application/settings.gradle index 0bad037caf9..61b0c5ba72e 100644 --- a/dd-smoke-tests/armeria-grpc/application/settings.gradle +++ b/dd-smoke-tests/armeria-grpc/application/settings.gradle @@ -1,14 +1,20 @@ pluginManagement { repositories { mavenLocal() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol true + } + } if (settings.hasProperty("mavenRepositoryProxy")) { maven { url settings["mavenRepositoryProxy"] allowInsecureProtocol true } } - mavenCentral() gradlePluginPortal() + mavenCentral() } } diff --git a/dd-smoke-tests/kafka-3/application/settings.gradle b/dd-smoke-tests/kafka-3/application/settings.gradle index b6478078496..72681ccb63f 100644 --- a/dd-smoke-tests/kafka-3/application/settings.gradle +++ b/dd-smoke-tests/kafka-3/application/settings.gradle @@ -1,14 +1,20 @@ pluginManagement { repositories { mavenLocal() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol true + } + } if (settings.hasProperty("mavenRepositoryProxy")) { maven { url settings["mavenRepositoryProxy"] allowInsecureProtocol true } } - mavenCentral() gradlePluginPortal() + mavenCentral() } } diff --git a/dd-smoke-tests/quarkus-native/application/settings.gradle b/dd-smoke-tests/quarkus-native/application/settings.gradle index ff115e0cadf..889da068c92 100644 --- a/dd-smoke-tests/quarkus-native/application/settings.gradle +++ b/dd-smoke-tests/quarkus-native/application/settings.gradle @@ -1,14 +1,20 @@ pluginManagement { repositories { mavenLocal() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol true + } + } if (settings.hasProperty("mavenRepositoryProxy")) { maven { url settings["mavenRepositoryProxy"] allowInsecureProtocol true } } - mavenCentral() gradlePluginPortal() + mavenCentral() } plugins { id 'io.quarkus' version "${quarkusPluginVersion}" diff --git a/dd-smoke-tests/quarkus/application/settings.gradle b/dd-smoke-tests/quarkus/application/settings.gradle index bc6492d81fd..73ecd2bfcc8 100644 --- a/dd-smoke-tests/quarkus/application/settings.gradle +++ b/dd-smoke-tests/quarkus/application/settings.gradle @@ -1,14 +1,20 @@ pluginManagement { repositories { mavenLocal() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol true + } + } if (settings.hasProperty("mavenRepositoryProxy")) { maven { url settings["mavenRepositoryProxy"] allowInsecureProtocol true } } - mavenCentral() gradlePluginPortal() + mavenCentral() } plugins { id 'io.quarkus' version "${quarkusPluginVersion}" diff --git a/dd-smoke-tests/spring-boot-2.7-webflux/application/settings.gradle b/dd-smoke-tests/spring-boot-2.7-webflux/application/settings.gradle index ded06a39f3e..d6db824f713 100644 --- a/dd-smoke-tests/spring-boot-2.7-webflux/application/settings.gradle +++ b/dd-smoke-tests/spring-boot-2.7-webflux/application/settings.gradle @@ -1,14 +1,20 @@ pluginManagement { repositories { mavenLocal() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol true + } + } if (settings.hasProperty("mavenRepositoryProxy")) { maven { url settings["mavenRepositoryProxy"] allowInsecureProtocol true } } - mavenCentral() gradlePluginPortal() + mavenCentral() } } diff --git a/dd-smoke-tests/spring-boot-3.0-native/application/settings.gradle b/dd-smoke-tests/spring-boot-3.0-native/application/settings.gradle index ba2988ac170..5bdbdea2fd8 100644 --- a/dd-smoke-tests/spring-boot-3.0-native/application/settings.gradle +++ b/dd-smoke-tests/spring-boot-3.0-native/application/settings.gradle @@ -1,14 +1,20 @@ pluginManagement { repositories { mavenLocal() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol true + } + } if (settings.hasProperty("mavenRepositoryProxy")) { maven { url settings["mavenRepositoryProxy"] allowInsecureProtocol true } } - mavenCentral() gradlePluginPortal() + mavenCentral() } } diff --git a/dd-smoke-tests/spring-boot-3.0-webflux/application/settings.gradle b/dd-smoke-tests/spring-boot-3.0-webflux/application/settings.gradle index 1fe3ceca980..2ddbb5ba1c2 100644 --- a/dd-smoke-tests/spring-boot-3.0-webflux/application/settings.gradle +++ b/dd-smoke-tests/spring-boot-3.0-webflux/application/settings.gradle @@ -1,14 +1,20 @@ pluginManagement { repositories { mavenLocal() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol true + } + } if (settings.hasProperty("mavenRepositoryProxy")) { maven { url settings["mavenRepositoryProxy"] allowInsecureProtocol true } } - mavenCentral() gradlePluginPortal() + mavenCentral() } } diff --git a/dd-smoke-tests/spring-boot-3.0-webmvc/application/settings.gradle b/dd-smoke-tests/spring-boot-3.0-webmvc/application/settings.gradle index ed95d363660..bce01bccc03 100644 --- a/dd-smoke-tests/spring-boot-3.0-webmvc/application/settings.gradle +++ b/dd-smoke-tests/spring-boot-3.0-webmvc/application/settings.gradle @@ -1,14 +1,20 @@ pluginManagement { repositories { mavenLocal() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol true + } + } if (settings.hasProperty("mavenRepositoryProxy")) { maven { url settings["mavenRepositoryProxy"] allowInsecureProtocol true } } - mavenCentral() gradlePluginPortal() + mavenCentral() } } diff --git a/dd-smoke-tests/spring-boot-3.3-webmvc/application/settings.gradle b/dd-smoke-tests/spring-boot-3.3-webmvc/application/settings.gradle index b66984ca2e6..81cf6e29659 100644 --- a/dd-smoke-tests/spring-boot-3.3-webmvc/application/settings.gradle +++ b/dd-smoke-tests/spring-boot-3.3-webmvc/application/settings.gradle @@ -1,14 +1,20 @@ pluginManagement { repositories { mavenLocal() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol true + } + } if (settings.hasProperty("mavenRepositoryProxy")) { maven { url settings["mavenRepositoryProxy"] allowInsecureProtocol true } } - mavenCentral() gradlePluginPortal() + mavenCentral() } } diff --git a/dd-smoke-tests/wildfly/spring-ear/settings.gradle b/dd-smoke-tests/wildfly/spring-ear/settings.gradle index 754fdd42b8e..fb85720eee8 100644 --- a/dd-smoke-tests/wildfly/spring-ear/settings.gradle +++ b/dd-smoke-tests/wildfly/spring-ear/settings.gradle @@ -1,14 +1,20 @@ pluginManagement { repositories { mavenLocal() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol true + } + } if (settings.hasProperty("mavenRepositoryProxy")) { maven { url settings["mavenRepositoryProxy"] allowInsecureProtocol true } } - mavenCentral() gradlePluginPortal() + mavenCentral() } } diff --git a/settings.gradle b/settings.gradle index 86ba5e9789d..73d11f28c94 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,14 +1,20 @@ pluginManagement { repositories { mavenLocal() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol true + } + } if (settings.hasProperty("mavenRepositoryProxy")) { maven { url settings["mavenRepositoryProxy"] allowInsecureProtocol true } } - mavenCentral() gradlePluginPortal() + mavenCentral() } } From 525031a7f512d07d0ca672de5cc6b32b7d2fb08f Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Thu, 20 Mar 2025 19:59:27 -0400 Subject: [PATCH 7/7] proxy mule as well --- .../mule-4/application/pom.xml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dd-java-agent/instrumentation/mule-4/application/pom.xml b/dd-java-agent/instrumentation/mule-4/application/pom.xml index 39f32ab235d..192b37fbf84 100644 --- a/dd-java-agent/instrumentation/mule-4/application/pom.xml +++ b/dd-java-agent/instrumentation/mule-4/application/pom.xml @@ -99,4 +99,26 @@ + + + maven-proxy-profile + + + env.MAVEN_REPOSITORY_PROXY + + + + + maven-proxy-repo + ${env.MAVEN_REPOSITORY_PROXY} + + + + + maven-plugin-proxy + ${env.MAVEN_REPOSITORY_PROXY} + + + +