diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 267fe3347d3..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: "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 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..44b0f25d875 100644 --- a/dd-java-agent/agent-ci-visibility/build.gradle +++ b/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() } diff --git a/dd-java-agent/benchmark-integration/build.gradle b/dd-java-agent/benchmark-integration/build.gradle index c367c4fa342..bd1262e17fe 100644 --- a/dd-java-agent/benchmark-integration/build.gradle +++ b/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' diff --git a/dd-java-agent/benchmark-integration/play-perftest/build.gradle b/dd-java-agent/benchmark-integration/play-perftest/build.gradle index 52540ef3ef5..3a6e79dadeb 100644 --- a/dd-java-agent/benchmark-integration/play-perftest/build.gradle +++ b/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" diff --git a/dd-java-agent/instrumentation/build.gradle b/dd-java-agent/instrumentation/build.gradle index 777de23d76f..0cc4e692e3f 100644 --- a/dd-java-agent/instrumentation/build.gradle +++ b/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() } diff --git a/dd-java-agent/instrumentation/datanucleus-4/build.gradle b/dd-java-agent/instrumentation/datanucleus-4/build.gradle index 5d999846521..f550936c4b1 100644 --- a/dd-java-agent/instrumentation/datanucleus-4/build.gradle +++ b/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() } 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} + + + + diff --git a/dd-java-agent/testing/build.gradle b/dd-java-agent/testing/build.gradle index f5f1039ebe2..a38cbb30819 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..61b0c5ba72e 100644 --- a/dd-smoke-tests/armeria-grpc/application/settings.gradle +++ b/dd-smoke-tests/armeria-grpc/application/settings.gradle @@ -1,8 +1,20 @@ pluginManagement { repositories { mavenLocal() - mavenCentral() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol true + } + } + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + allowInsecureProtocol true + } + } gradlePluginPortal() + mavenCentral() } } 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..72681ccb63f 100644 --- a/dd-smoke-tests/kafka-3/application/settings.gradle +++ b/dd-smoke-tests/kafka-3/application/settings.gradle @@ -1,8 +1,20 @@ pluginManagement { repositories { mavenLocal() - mavenCentral() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol true + } + } + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + allowInsecureProtocol true + } + } gradlePluginPortal() + mavenCentral() } } diff --git a/dd-smoke-tests/play-2.4/build.gradle b/dd-smoke-tests/play-2.4/build.gradle index cbb2a0d97cf..9be50043bde 100644 --- a/dd-smoke-tests/play-2.4/build.gradle +++ b/dd-smoke-tests/play-2.4/build.gradle @@ -32,8 +32,14 @@ distributions { } 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" diff --git a/dd-smoke-tests/play-2.5/build.gradle b/dd-smoke-tests/play-2.5/build.gradle index 55b187fb769..6c992889cd0 100644 --- a/dd-smoke-tests/play-2.5/build.gradle +++ b/dd-smoke-tests/play-2.5/build.gradle @@ -32,8 +32,14 @@ distributions { } 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" diff --git a/dd-smoke-tests/play-2.6/build.gradle b/dd-smoke-tests/play-2.6/build.gradle index d3d18b56f2a..2c50adfcb96 100644 --- a/dd-smoke-tests/play-2.6/build.gradle +++ b/dd-smoke-tests/play-2.6/build.gradle @@ -32,8 +32,14 @@ distributions { } 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" diff --git a/dd-smoke-tests/play-2.7/build.gradle b/dd-smoke-tests/play-2.7/build.gradle index 357c7be9a60..ac64c0f6f01 100644 --- a/dd-smoke-tests/play-2.7/build.gradle +++ b/dd-smoke-tests/play-2.7/build.gradle @@ -32,8 +32,14 @@ distributions { } 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" diff --git a/dd-smoke-tests/play-2.8-otel/build.gradle b/dd-smoke-tests/play-2.8-otel/build.gradle index 13ed0848d71..44421b6e91f 100644 --- a/dd-smoke-tests/play-2.8-otel/build.gradle +++ b/dd-smoke-tests/play-2.8-otel/build.gradle @@ -27,8 +27,14 @@ distributions { } 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" 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..3c540f3f436 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,14 @@ distributions { } 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" diff --git a/dd-smoke-tests/play-2.8/build.gradle b/dd-smoke-tests/play-2.8/build.gradle index 75dcdae7913..acea44b532a 100644 --- a/dd-smoke-tests/play-2.8/build.gradle +++ b/dd-smoke-tests/play-2.8/build.gradle @@ -27,8 +27,14 @@ distributions { } 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" diff --git a/dd-smoke-tests/quarkus-native/application/settings.gradle b/dd-smoke-tests/quarkus-native/application/settings.gradle index 5b6c7b616d3..889da068c92 100644 --- a/dd-smoke-tests/quarkus-native/application/settings.gradle +++ b/dd-smoke-tests/quarkus-native/application/settings.gradle @@ -1,8 +1,20 @@ pluginManagement { repositories { mavenLocal() - mavenCentral() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol true + } + } + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + allowInsecureProtocol true + } + } 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 eb582e9be9e..73ecd2bfcc8 100644 --- a/dd-smoke-tests/quarkus/application/settings.gradle +++ b/dd-smoke-tests/quarkus/application/settings.gradle @@ -1,8 +1,20 @@ pluginManagement { repositories { mavenLocal() - mavenCentral() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol true + } + } + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + allowInsecureProtocol true + } + } gradlePluginPortal() + mavenCentral() } plugins { id 'io.quarkus' version "${quarkusPluginVersion}" 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..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,8 +1,20 @@ pluginManagement { repositories { mavenLocal() - mavenCentral() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol true + } + } + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + allowInsecureProtocol true + } + } 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 47224987ea1..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,8 +1,20 @@ pluginManagement { repositories { mavenLocal() - mavenCentral() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol true + } + } + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + allowInsecureProtocol true + } + } 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 d0ed8fbc660..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,8 +1,20 @@ pluginManagement { repositories { mavenLocal() - mavenCentral() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol true + } + } + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + allowInsecureProtocol true + } + } 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 eefefc8b056..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,8 +1,20 @@ pluginManagement { repositories { mavenLocal() - mavenCentral() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol true + } + } + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + allowInsecureProtocol true + } + } 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 b67b84505e6..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,8 +1,20 @@ pluginManagement { repositories { mavenLocal() - mavenCentral() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol true + } + } + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + allowInsecureProtocol true + } + } gradlePluginPortal() + mavenCentral() } } 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..fb85720eee8 100644 --- a/dd-smoke-tests/wildfly/spring-ear/settings.gradle +++ b/dd-smoke-tests/wildfly/spring-ear/settings.gradle @@ -1,8 +1,20 @@ pluginManagement { repositories { mavenLocal() - mavenCentral() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol true + } + } + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + allowInsecureProtocol true + } + } gradlePluginPortal() + mavenCentral() } } diff --git a/dd-smoke-tests/wildfly/spring-ear/war/build.gradle b/dd-smoke-tests/wildfly/spring-ear/war/build.gradle index 2ebbfebc77b..b5600006fa0 100644 --- a/dd-smoke-tests/wildfly/spring-ear/war/build.gradle +++ b/dd-smoke-tests/wildfly/spring-ear/war/build.gradle @@ -2,6 +2,13 @@ apply plugin: 'java' apply plugin: 'war' repositories { + mavenLocal() + 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 0b0a3e7ecd8..cdcbb792a2d 100644 --- a/gradle/repositories.gradle +++ b/gradle/repositories.gradle @@ -1,10 +1,11 @@ repositories { + mavenLocal() if (project.rootProject.hasProperty("mavenRepositoryProxy")) { maven { url project.rootProject.property("mavenRepositoryProxy") + allowInsecureProtocol true } } - mavenLocal() mavenCentral() // add sonatype repository for snapshot dependencies maven { @@ -23,4 +24,17 @@ repositories { includeGroup 'io.sqreen' } } + maven { + url 'https://packages.confluent.io/maven/' + content { + includeGroupAndSubgroups "io.confluent" + includeGroupAndSubgroups "org.apache.kafka" + } + } + 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 602cf8bb669..5cf6d37e8f8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,23 @@ +pluginManagement { + repositories { + mavenLocal() + if (settings.hasProperty("gradlePluginProxy")) { + maven { + url settings["gradlePluginProxy"] + allowInsecureProtocol true + } + } + if (settings.hasProperty("mavenRepositoryProxy")) { + maven { + url settings["mavenRepositoryProxy"] + allowInsecureProtocol true + } + } + gradlePluginPortal() + mavenCentral() + } +} + plugins { id 'com.gradle.develocity' version '3.19.2' } 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" }