Skip to content

Commit 3bc435b

Browse files
committed
relocate jetty class on testing module
1 parent a8c8b0e commit 3bc435b

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

dd-java-agent/instrumentation/jetty-client-9.1/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ configurations{
6363
dependencies {
6464
compileOnly group: 'org.eclipse.jetty', name: 'jetty-client', version: '9.1.0.v20131115'
6565

66-
testImplementation(project(':dd-java-agent:testing')) {
66+
testImplementation(project(path:':dd-java-agent:testing', configuration: 'shadow')) {
6767
// explicitly declared below.
6868
exclude module: 'jetty-server'
6969
}

dd-java-agent/testing/build.gradle

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
plugins {
2+
id 'com.github.johnrengelman.shadow'
3+
}
4+
15
ext {
26
// need access to sun.misc package
37
skipSettingCompilerRelease = true
@@ -75,6 +79,15 @@ dependencies {
7579
testCompileOnly deps.autoserviceAnnotation
7680
}
7781

82+
shadowJar {
83+
dependencies {
84+
include(dependency {
85+
it.moduleGroup == 'org.eclipse.jetty'
86+
})
87+
}
88+
relocate "org.eclipse.jetty", "datadog.eclipse.jetty"
89+
}
90+
7891
tasks.withType(Test).configureEach {
7992
// SpockRunner that we use to run agent tests cannot be properly ported to JUnit 5,
8093
// since the framework does not provide the hooks / extension points

0 commit comments

Comments
 (0)