Exclude more weird versions.
MODIFY
buildSrc/src/main/groovy/MuzzlePlugin.groovy
buildSrc/src/main/groovy/MuzzlePlugin.groovy
@@ -37,9 +37,14 @@ class MuzzlePlugin implements Plugin<Project> {
private static final AtomicReference<ClassLoader> TOOLING_LOADER = new AtomicReference<>()
static {
RemoteRepository central = new RemoteRepository.Builder("central", "default", "https://repo1.maven.org/maven2/").build()
+ RemoteRepository sonatype = new RemoteRepository.Builder("sonatype", "default", "https://oss.sonatype.org/content/repositories/releases/").build()
RemoteRepository jcenter = new RemoteRepository.Builder("jcenter", "default", "https://jcenter.bintray.com/").build()
+ RemoteRepository spring = new RemoteRepository.Builder("spring", "default", "https://repo.spring.io/libs-release/").build()
+ RemoteRepository jboss = new RemoteRepository.Builder("jboss", "default", "https://repository.jboss.org/nexus/content/repositories/releases/").build()
RemoteRepository typesafe = new RemoteRepository.Builder("typesafe", "default", "https://repo.typesafe.com/typesafe/releases").build()
- MUZZLE_REPOS = new ArrayList<RemoteRepository>(Arrays.asList(central, jcenter, typesafe))
+ RemoteRepository akka = new RemoteRepository.Builder("akka", "default", "https://dl.bintray.com/akka/maven/").build()
+ RemoteRepository atlassian = new RemoteRepository.Builder("atlassian", "default", "https://maven.atlassian.com/content/repositories/atlassian-public/").build()
+ MUZZLE_REPOS = Arrays.asList(central, sonatype, jcenter, spring, jboss, typesafe, akka, atlassian)
}
@Override
@@ -206,6 +211,9 @@ class MuzzlePlugin implements Plugin<Project> {
rangeRequest.setArtifact(directiveArtifact)
final VersionRangeResult rangeResult = system.resolveVersionRange(session, rangeRequest)
+// println "Range Request: " + rangeRequest
+// println "Range Result: " + rangeResult
+
final List<Artifact> allVersionArtifacts = filterVersion(rangeResult.versions, muzzleDirective.skipVersions).collect { version ->
new DefaultArtifact(muzzleDirective.group, muzzleDirective.module, "jar", version.toString())
}
@@ -362,6 +370,8 @@ class MuzzlePlugin implements Plugin<Project> {
version.contains(".m") ||
version.contains("-m") ||
version.contains("-dev") ||
+ version.contains("-ea") ||
+ version.contains("-atlassian-") ||
version.contains("public_draft") ||
skipVersions.contains(version) ||
version.matches(GIT_SHA_PATTERN)

MODIFY
dd-java-agent/instrumentation/apache-httpclient-4/apache-httpclient-4.gradle
dd-java-agent/instrumentation/apache-httpclient-4/apache-httpclient-4.gradle
@@ -3,6 +3,7 @@ muzzle {
group = "commons-httpclient"
module = "commons-httpclient"
versions = "[,4.0)"
+ skipVersions += '3.1-jenkins-1'
}
pass {
group = "org.apache.httpcomponents"

MODIFY
dd-java-agent/instrumentation/elasticsearch/transport-6/transport-6.gradle
dd-java-agent/instrumentation/elasticsearch/transport-6/transport-6.gradle
@@ -7,13 +7,13 @@ muzzle {
pass {
group = "org.elasticsearch.client"
module = "transport"
- versions = "[6.0.0,6.8.4)"
+ versions = "[6.0.0,]"
assertInverse = true
}
pass {
group = "org.elasticsearch"
module = "elasticsearch"
- versions = "[6.0.0,)"
+ versions = "[6.0.0,]"
assertInverse = true
}
}

MODIFY
dd-java-agent/instrumentation/jax-rs-client-1.1/jax-rs-client-1.1.gradle
dd-java-agent/instrumentation/jax-rs-client-1.1/jax-rs-client-1.1.gradle
@@ -2,7 +2,9 @@ muzzle {
pass {
group = "com.sun.jersey"
module = "jersey-client"
- versions = "[,]"
+ versions = "[1.1,]"
+ skipVersions += ['1.0.3-atlassian-1-logpatch', '1.8-atlassian-6']
+ assertInverse = true
}
}

MODIFY
dd-java-agent/instrumentation/servlet/servlet.gradle
dd-java-agent/instrumentation/servlet/servlet.gradle
@@ -9,6 +9,8 @@ muzzle {
group = "javax.servlet"
module = 'servlet-api'
versions = "[,]"
+ skipVersions += '0'
+ assertInverse = true
}
}

Exclude more weird versions.