Skip to content

Commit 11df00c

Browse files
committed
fix: jersey-server-9.4.21 websocket tests
1 parent 410083d commit 11df00c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ dependencies {
2626
testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.3.0.M1'
2727
testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.3.0.M1'
2828
testImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '9.3.0.M1'
29-
testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
3029
testImplementation project(':dd-java-agent:appsec:appsec-test-fixtures')
3130
testImplementation testFixtures(project(":dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0"))
31+
testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
3232

3333
// Include all jetty-server instrumentation modules for testing. Only the version-compatible module will apply at runtime.
3434
testRuntimeOnly project(":dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0")

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
1616
dependencies {
1717
implementation project(':dd-java-agent:instrumentation:jetty:jetty-common')
1818
implementation project(":dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0")
19-
2019
compileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.4.21.v20190926'
2120

2221
// Don't want to conflict with jetty from the test server.
@@ -38,6 +37,7 @@ dependencies {
3837
testRuntimeOnly project(":dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.3")
3938
testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-2.2')
4039
testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
40+
testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:javax-websocket-1.0')
4141
// Include all appsec instrumentation modules for testing. Only the version-compatible module will apply at runtime.
4242
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-7.0')
4343
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-8.1.3')

0 commit comments

Comments
 (0)