Fix Jetty tests

nikita-tkachenko-datadog · nikita-tkachenko-datadog · commit 78500f7a0810 · 2025-08-08T14:46:11.000+02:00
diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-10.0/build.gradle b/dd-java-agent/instrumentation/jetty-client/jetty-client-10.0/build.gradle
@@ -43,6 +43,7 @@ dependencies {
     exclude group: 'org.eclipse.jetty'
   }
   testImplementation project(':dd-java-agent:instrumentation:jetty-util')
+  testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '10.0.0'
   testImplementation group: 'org.eclipse.jetty', name: 'jetty-client', version: '10.0.0'
   jetty10LatestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-client', version: '10.+'
   jetty11TestImplementation group: 'org.eclipse.jetty', name: 'jetty-client', version: '11.0.0'
diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/build.gradle b/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/build.gradle
@@ -31,7 +31,7 @@ dependencies {
   testImplementation(project(':dd-java-agent:instrumentation:jetty-client:jetty-client-9.1'))
   testImplementation(project(':dd-java-agent:instrumentation:jetty-client:jetty-client-10.0'))
 
-  testImplementation(project(path:':dd-java-agent:instrumentation-testing', configuration:'shadow')) {
+  testImplementation(project(path:':dd-java-agent:instrumentation-testing')) {
     // explicitly declared below.
     exclude group: 'org.eclipse.jetty'
   }

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ dependencies {`
`43`	`43`	`exclude group: 'org.eclipse.jetty'`
`44`	`44`	`}`
`45`	`45`	`testImplementation project(':dd-java-agent:instrumentation:jetty-util')`
	`46`	`+ testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '10.0.0'`
`46`	`47`	`testImplementation group: 'org.eclipse.jetty', name: 'jetty-client', version: '10.0.0'`
`47`	`48`	`jetty10LatestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-client', version: '10.+'`
`48`	`49`	`jetty11TestImplementation group: 'org.eclipse.jetty', name: 'jetty-client', version: '11.0.0'`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ dependencies {`
`31`	`31`	`testImplementation(project(':dd-java-agent:instrumentation:jetty-client:jetty-client-9.1'))`
`32`	`32`	`testImplementation(project(':dd-java-agent:instrumentation:jetty-client:jetty-client-10.0'))`
`33`	`33`
`34`		`- testImplementation(project(path:':dd-java-agent:instrumentation-testing', configuration:'shadow')) {`
	`34`	`+ testImplementation(project(path:':dd-java-agent:instrumentation-testing')) {`
`35`	`35`	`// explicitly declared below.`
`36`	`36`	`exclude group: 'org.eclipse.jetty'`
`37`	`37`	`}`