@@ -12,9 +12,9 @@ apply from: "$rootDir/gradle/java.gradle"
1212addTestSuiteForDir(" latestDepTest" , " test" )
1313addTestSuiteExtendingForDir(" latestDepForkedTest" , " latestDepTest" , " test" )
1414
15- // Exclude servlet 3.x API from test runtime to ensure servlet 2.x instrumentation applies.
16- // Only exclude from testRuntimeClasspath (not testImplementation) to avoid propagating to latestDep* configs
17- // which need servlet 3.1 API for Jetty 9.2.x.
15+ // Exclude servlet 3.x API (coming from dd-java-agent:testing) to ensure servlet 2.x instrumentation applies.
16+ // Using testRuntimeClasspath instead of testImplementation because exclusions on testImplementation
17+ // propagate to latestDep* configurations, which need servlet 3.1 API for Jetty 9.2.x.
1818configurations. testRuntimeClasspath {
1919 exclude group : ' javax.servlet' , module : ' javax.servlet-api'
2020}
@@ -29,16 +29,9 @@ dependencies {
2929 testImplementation group : ' org.eclipse.jetty' , name : ' jetty-server' , version : ' 9.0.4.v20130625'
3030 testImplementation group : ' org.eclipse.jetty' , name : ' jetty-servlet' , version : ' 9.0.4.v20130625'
3131 testImplementation group : ' org.eclipse.jetty' , name : ' jetty-continuation' , version : ' 9.0.4.v20130625'
32- // Exclude servlet 3.x API (coming from dd-java-agent:testing) to ensure servlet 2.x instrumentation applies
33- testImplementation(project(' :dd-java-agent:appsec:appsec-test-fixtures' )) {
34- exclude group : ' javax.servlet' , module : ' javax.servlet-api'
35- }
36- testImplementation(testFixtures(project(" :dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0" ))) {
37- exclude group : ' javax.servlet' , module : ' javax.servlet-api'
38- }
39- testImplementation(testFixtures(project(' :dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0' ))) {
40- exclude group : ' javax.servlet' , module : ' javax.servlet-api'
41- }
32+ testImplementation project(' :dd-java-agent:appsec:appsec-test-fixtures' )
33+ testImplementation testFixtures(project(" :dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0" ))
34+ testImplementation testFixtures(project(' :dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0' ))
4235
4336 // Include all jetty-server instrumentation modules for testing. Only the version-compatible module will apply at runtime.
4437 testRuntimeOnly project(" :dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0" )
0 commit comments