Skip to content

chore: fix cxf-2.1 tests after jetty dep update from 12.0 to 12.1 #10688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gh-worker-dd-mergequeue-cf854d merged 2 commits into from
Feb 26, 2026
Merged

chore: fix cxf-2.1 tests after jetty dep update from 12.0 to 12.1 #10688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e50bc40
Update org.eclipse.jetty from 12.0 to 12.1 breaks cxf tests
ygree Feb 26, 2026
de58ec5
Fix cxf test that started failing after jetty dependency update 12.0 …
ygree Feb 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions dd-java-agent/instrumentation/cxf-2.1/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,6 @@ dependencies {
latestDepTestImplementation group: 'org.apache.cxf', name:'cxf-rt-transports-http-jetty', version: '+'
}

configurations.named('latestDepTestRuntimeClasspath') {
resolutionStrategy {
force libs.slf4j
Copy link
Copy Markdown
Contributor Author

@ygree ygree Feb 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was forcing slf4j v1 but jetty 12.1 depends on slf4j v2 that makes use of the method that doesn't exist in v1.

}
}

configurations.named('cxf3LatestDepTestRuntimeClasspath') {
resolutionStrategy {
force libs.slf4j
Copy link
Copy Markdown
Contributor Author

@ygree ygree Feb 26, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't need to update this because cxf3LatestDepTest passes anyways

Expand Down
45 changes: 23 additions & 22 deletions dd-java-agent/instrumentation/cxf-2.1/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ io.sqreen:libsqreen:17.3.0=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntim
jakarta.activation:jakarta.activation-api:1.2.2=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
jakarta.activation:jakarta.activation-api:2.1.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
jakarta.annotation:jakarta.annotation-api:1.3.5=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
jakarta.annotation:jakarta.annotation-api:2.1.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
jakarta.servlet:jakarta.servlet-api:6.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
jakarta.annotation:jakarta.annotation-api:3.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
jakarta.servlet:jakarta.servlet-api:6.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
jakarta.ws.rs:jakarta.ws.rs-api:2.1.6=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
jakarta.xml.bind:jakarta.xml.bind-api:4.0.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
javax.activation:javax.activation-api:1.2.0=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
Expand All @@ -89,19 +89,19 @@ org.apache.cxf:cxf-api:2.1=compileClasspath
org.apache.cxf:cxf-common-schemas:2.1=compileClasspath
org.apache.cxf:cxf-common-utilities:2.1=compileClasspath
org.apache.cxf:cxf-core:3.0.0=testCompileClasspath,testRuntimeClasspath
org.apache.cxf:cxf-core:3.6.9=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
org.apache.cxf:cxf-core:4.1.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.apache.cxf:cxf-core:3.6.10=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
org.apache.cxf:cxf-core:4.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.apache.cxf:cxf-rt-frontend-jaxrs:3.0.0=testCompileClasspath,testRuntimeClasspath
org.apache.cxf:cxf-rt-frontend-jaxrs:3.6.9=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
org.apache.cxf:cxf-rt-frontend-jaxrs:4.1.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.apache.cxf:cxf-rt-security:3.6.9=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
org.apache.cxf:cxf-rt-security:4.1.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.apache.cxf:cxf-rt-frontend-jaxrs:3.6.10=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
org.apache.cxf:cxf-rt-frontend-jaxrs:4.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.apache.cxf:cxf-rt-security:3.6.10=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
org.apache.cxf:cxf-rt-security:4.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.apache.cxf:cxf-rt-transports-http-jetty:3.0.0=testCompileClasspath,testRuntimeClasspath
org.apache.cxf:cxf-rt-transports-http-jetty:3.6.9=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
org.apache.cxf:cxf-rt-transports-http-jetty:4.1.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.apache.cxf:cxf-rt-transports-http-jetty:3.6.10=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
org.apache.cxf:cxf-rt-transports-http-jetty:4.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.apache.cxf:cxf-rt-transports-http:3.0.0=testCompileClasspath,testRuntimeClasspath
org.apache.cxf:cxf-rt-transports-http:3.6.9=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
org.apache.cxf:cxf-rt-transports-http:4.1.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.apache.cxf:cxf-rt-transports-http:3.6.10=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
org.apache.cxf:cxf-rt-transports-http:4.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.apache.geronimo.specs:geronimo-activation_1.1_spec:1.0.2=compileClasspath
org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.1.1=compileClasspath
org.apache.geronimo.specs:geronimo-servlet_3.0_spec:1.0=testCompileClasspath,testRuntimeClasspath
Expand Down Expand Up @@ -130,25 +130,25 @@ org.codehaus.woodstox:wstx-asl:3.2.4=compileClasspath
org.codenarc:CodeNarc:3.7.0=codenarc
org.dom4j:dom4j:2.2.0=spotbugs
org.eclipse.angus:angus-activation:2.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.eclipse.jetty.ee11:jetty-ee11-servlet:12.1.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016=testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
org.eclipse.jetty:jetty-continuation:8.1.15.v20140411=testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-http:10.0.26=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
org.eclipse.jetty:jetty-http:12.0.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.eclipse.jetty:jetty-http:12.1.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.eclipse.jetty:jetty-http:8.1.15.v20140411=testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-io:10.0.26=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
org.eclipse.jetty:jetty-io:12.0.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.eclipse.jetty:jetty-io:12.1.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.eclipse.jetty:jetty-io:8.1.15.v20140411=testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-security:10.0.26=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
org.eclipse.jetty:jetty-security:12.0.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.eclipse.jetty:jetty-security:12.1.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.eclipse.jetty:jetty-security:8.1.15.v20140411=testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-server:10.0.26=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
org.eclipse.jetty:jetty-server:12.0.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.eclipse.jetty:jetty-server:12.1.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.eclipse.jetty:jetty-server:8.1.15.v20140411=testCompileClasspath,testRuntimeClasspath
org.eclipse.jetty:jetty-session:12.0.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.eclipse.jetty:jetty-session:12.1.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.eclipse.jetty:jetty-util:10.0.26=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
org.eclipse.jetty:jetty-util:12.0.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.eclipse.jetty:jetty-util:12.1.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.eclipse.jetty:jetty-util:8.1.15.v20140411=testCompileClasspath,testRuntimeClasspath
org.glassfish.jaxb:jaxb-core:4.0.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.glassfish.jaxb:jaxb-runtime:2.3.5=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
Expand All @@ -159,6 +159,7 @@ org.gmetrics:GMetrics:2.1.0=codenarc
org.hamcrest:hamcrest-core:1.3=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
org.hamcrest:hamcrest:3.0=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.jctools:jctools-core:3.3.0=buildTimeInstrumentationPlugin,cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.junit.jupiter:junit-jupiter-api:5.14.1=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.junit.jupiter:junit-jupiter-engine:5.14.1=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
org.junit.jupiter:junit-jupiter-params:5.14.1=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand Down Expand Up @@ -190,10 +191,10 @@ org.ow2.asm:asm:9.9.1=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClas
org.slf4j:jcl-over-slf4j:1.7.30=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.slf4j:jul-to-slf4j:1.7.30=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.slf4j:log4j-over-slf4j:1.7.30=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.slf4j:slf4j-api:1.7.30=buildTimeInstrumentationPlugin,compileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath
org.slf4j:slf4j-api:1.7.30=buildTimeInstrumentationPlugin,compileClasspath,cxf3LatestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath
org.slf4j:slf4j-api:1.7.32=testCompileClasspath,testRuntimeClasspath
org.slf4j:slf4j-api:2.0.13=cxf3LatestDepTestCompileClasspath
org.slf4j:slf4j-api:2.0.17=latestDepTestCompileClasspath,spotbugs,spotbugsSlf4j
org.slf4j:slf4j-api:2.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,spotbugsSlf4j
org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
org.snakeyaml:snakeyaml-engine:2.9=buildTimeInstrumentationPlugin,cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
org.spockframework:spock-bom:2.4-groovy-3.0=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand Down
Loading