From e543c88664a21ca175e8b559874035a7b9faa36f Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Tue, 6 May 2025 15:47:42 -0400 Subject: [PATCH 1/2] Use internal proxy for muzzle checks --- buildSrc/src/main/groovy/MuzzlePlugin.groovy | 14 +++++++++----- .../instrumentation/play-2.3/build.gradle | 2 ++ .../instrumentation/play-2.4/build.gradle | 2 ++ .../instrumentation/play-2.6/build.gradle | 2 ++ .../instrumentation/restlet-2.2/build.gradle | 2 ++ 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/buildSrc/src/main/groovy/MuzzlePlugin.groovy b/buildSrc/src/main/groovy/MuzzlePlugin.groovy index 81a3bb28c2d..f9e6fc96c91 100644 --- a/buildSrc/src/main/groovy/MuzzlePlugin.groovy +++ b/buildSrc/src/main/groovy/MuzzlePlugin.groovy @@ -55,11 +55,15 @@ class MuzzlePlugin implements Plugin { static { RemoteRepository central = new RemoteRepository.Builder("central", "default", "https://repo1.maven.org/maven2/").build() - // Only needed for restlet - RemoteRepository restlet = new RemoteRepository.Builder("restlet", "default", "https://maven.restlet.talend.com/").build() - // Only needed for play-2.3 - RemoteRepository typesafe = new RemoteRepository.Builder("typesafe", "default", "https://repo.typesafe.com/typesafe/maven-releases/").build() - MUZZLE_REPOS = Collections.unmodifiableList(Arrays.asList(central, restlet, typesafe)) + + String mavenProxyUrl = System.getenv("MAVEN_REPOSITORY_PROXY") + + if (mavenProxyUrl == null) { + MUZZLE_REPOS = Collections.singletonList(central) + } else { + RemoteRepository proxy = new RemoteRepository.Builder("central-proxy", "default", mavenProxyUrl).build() + MUZZLE_REPOS = Collections.unmodifiableList(Arrays.asList(proxy)) + } } static class TestedArtifact { diff --git a/dd-java-agent/instrumentation/play-2.3/build.gradle b/dd-java-agent/instrumentation/play-2.3/build.gradle index b583b26ccb0..5ad4017433c 100644 --- a/dd-java-agent/instrumentation/play-2.3/build.gradle +++ b/dd-java-agent/instrumentation/play-2.3/build.gradle @@ -4,6 +4,8 @@ ext { } muzzle { + extraRepository("typesafe", "https://repo.typesafe.com/typesafe/maven-releases/") + pass { group = 'com.typesafe.play' module = 'play_2.11' diff --git a/dd-java-agent/instrumentation/play-2.4/build.gradle b/dd-java-agent/instrumentation/play-2.4/build.gradle index b2ab0d7cd28..ca19673809c 100644 --- a/dd-java-agent/instrumentation/play-2.4/build.gradle +++ b/dd-java-agent/instrumentation/play-2.4/build.gradle @@ -4,6 +4,8 @@ ext { } muzzle { + extraRepository("typesafe", "https://repo.typesafe.com/typesafe/maven-releases/") + pass { name = "play24and25" group = 'com.typesafe.play' diff --git a/dd-java-agent/instrumentation/play-2.6/build.gradle b/dd-java-agent/instrumentation/play-2.6/build.gradle index a13487d0063..44a2f500471 100644 --- a/dd-java-agent/instrumentation/play-2.6/build.gradle +++ b/dd-java-agent/instrumentation/play-2.6/build.gradle @@ -7,6 +7,8 @@ def scalaVersion = '2.11' def playVersion = '2.6.0' muzzle { + extraRepository("typesafe", "https://repo.typesafe.com/typesafe/maven-releases/") + pass { name = 'play26Plus' group = 'com.typesafe.play' diff --git a/dd-java-agent/instrumentation/restlet-2.2/build.gradle b/dd-java-agent/instrumentation/restlet-2.2/build.gradle index 7df6fec3fbe..e72acf7effc 100644 --- a/dd-java-agent/instrumentation/restlet-2.2/build.gradle +++ b/dd-java-agent/instrumentation/restlet-2.2/build.gradle @@ -1,4 +1,6 @@ muzzle { + extraRepository("restlet", "https://maven.restlet.talend.com/") + pass { group = "org.restlet.jse" module = "org.restlet" From 07996ea361295134170c383ffe0bf4885f6eec68 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Tue, 6 May 2025 19:21:37 -0400 Subject: [PATCH 2/2] add back central as a fallback --- buildSrc/src/main/groovy/MuzzlePlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/groovy/MuzzlePlugin.groovy b/buildSrc/src/main/groovy/MuzzlePlugin.groovy index f9e6fc96c91..bd37653f056 100644 --- a/buildSrc/src/main/groovy/MuzzlePlugin.groovy +++ b/buildSrc/src/main/groovy/MuzzlePlugin.groovy @@ -62,7 +62,7 @@ class MuzzlePlugin implements Plugin { MUZZLE_REPOS = Collections.singletonList(central) } else { RemoteRepository proxy = new RemoteRepository.Builder("central-proxy", "default", mavenProxyUrl).build() - MUZZLE_REPOS = Collections.unmodifiableList(Arrays.asList(proxy)) + MUZZLE_REPOS = Collections.unmodifiableList(Arrays.asList(proxy, central)) } }