Skip to content

Commit ee5a7ed

Browse files
committed
fix: javax servlet required by spring weblux tests
1 parent 73e0938 commit ee5a7ed

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ dependencies {
8585
testImplementation project(':dd-java-agent:instrumentation:reactor-core-3.1')
8686
testImplementation project(':dd-java-agent:instrumentation:reactive-streams')
8787
testImplementation project(':dd-java-agent:instrumentation:reactor-netty-1')
88+
testImplementation group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
8889

8990
testImplementation group: 'org.springframework', name: 'spring-webflux', version: '5.0.0.RELEASE'
9091
testImplementation group: 'io.projectreactor.ipc', name: 'reactor-netty', version: '0.7.0.RELEASE'

dd-java-agent/testing/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ dependencies {
3838
api libs.bundles.test.logging
3939
api libs.guava
4040

41-
// Jetty is bundled (relocated) in the shadow jar, not exposed as transitive dependency
42-
// This avoids version conflicts with instrumentation tests that use different jetty versions
41+
// Do not expose jetty as a transitive dependency, as it conflicts
42+
// with versions used to test instrumentions
4343
compileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.4.56.v20240826'
4444
runtimeOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.4.56.v20240826'
4545
// ^ 9.4 last to support java 8

0 commit comments

Comments
 (0)