Skip to content

Have muzzle checks use internal artifact proxy #8775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 7, 2025
Merged

Have muzzle checks use internal artifact proxy #8775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e543c88
Use internal proxy for muzzle checks
randomanderson May 6, 2025
07996ea
add back central as a fallback
randomanderson May 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions buildSrc/src/main/groovy/MuzzlePlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,15 @@ class MuzzlePlugin implements Plugin<Project> {

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, central))
}
}

static class TestedArtifact {
Expand Down
2 changes: 2 additions & 0 deletions dd-java-agent/instrumentation/play-2.3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ ext {
}

muzzle {
extraRepository("typesafe", "https://repo.typesafe.com/typesafe/maven-releases/")

pass {
group = 'com.typesafe.play'
module = 'play_2.11'
Expand Down
2 changes: 2 additions & 0 deletions dd-java-agent/instrumentation/play-2.4/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ ext {
}

muzzle {
extraRepository("typesafe", "https://repo.typesafe.com/typesafe/maven-releases/")

pass {
name = "play24and25"
group = 'com.typesafe.play'
Expand Down
2 changes: 2 additions & 0 deletions dd-java-agent/instrumentation/play-2.6/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 2 additions & 0 deletions dd-java-agent/instrumentation/restlet-2.2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
muzzle {
extraRepository("restlet", "https://maven.restlet.talend.com/")

pass {
group = "org.restlet.jse"
module = "org.restlet"
Expand Down