Skip to content

Commit c780493

Browse files
ygreeygree
authored
chore: fix cxf-2.1 tests after jetty dep update from 12.0 to 12.1 (#10688)
Update org.eclipse.jetty from 12.0 to 12.1 breaks cxf tests Fix cxf test that started failing after jetty dependency update 12.0 to 12.1 Co-authored-by: yury.gribkov <yury.gribkov@datadoghq.com>
1 parent 695b02c commit c780493

2 files changed

Lines changed: 23 additions & 28 deletions

File tree

‎dd-java-agent/instrumentation/cxf-2.1/build.gradle‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,6 @@ dependencies {
8080
latestDepTestImplementation group: 'org.apache.cxf', name:'cxf-rt-transports-http-jetty', version: '+'
8181
}
8282

83-
configurations.named('latestDepTestRuntimeClasspath') {
84-
resolutionStrategy {
85-
force libs.slf4j
86-
}
87-
}
88-
8983
configurations.named('cxf3LatestDepTestRuntimeClasspath') {
9084
resolutionStrategy {
9185
force libs.slf4j

‎dd-java-agent/instrumentation/cxf-2.1/gradle.lockfile‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ io.sqreen:libsqreen:17.3.0=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntim
5959
jakarta.activation:jakarta.activation-api:1.2.2=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
6060
jakarta.activation:jakarta.activation-api:2.1.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
6161
jakarta.annotation:jakarta.annotation-api:1.3.5=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
62-
jakarta.annotation:jakarta.annotation-api:2.1.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
63-
jakarta.servlet:jakarta.servlet-api:6.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
62+
jakarta.annotation:jakarta.annotation-api:3.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
63+
jakarta.servlet:jakarta.servlet-api:6.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
6464
jakarta.ws.rs:jakarta.ws.rs-api:2.1.6=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
65-
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
65+
jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
6666
jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
6767
jakarta.xml.bind:jakarta.xml.bind-api:4.0.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
6868
javax.activation:javax.activation-api:1.2.0=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
@@ -89,19 +89,19 @@ org.apache.cxf:cxf-api:2.1=compileClasspath
8989
org.apache.cxf:cxf-common-schemas:2.1=compileClasspath
9090
org.apache.cxf:cxf-common-utilities:2.1=compileClasspath
9191
org.apache.cxf:cxf-core:3.0.0=testCompileClasspath,testRuntimeClasspath
92-
org.apache.cxf:cxf-core:3.6.9=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
93-
org.apache.cxf:cxf-core:4.1.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
92+
org.apache.cxf:cxf-core:3.6.10=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
93+
org.apache.cxf:cxf-core:4.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
9494
org.apache.cxf:cxf-rt-frontend-jaxrs:3.0.0=testCompileClasspath,testRuntimeClasspath
95-
org.apache.cxf:cxf-rt-frontend-jaxrs:3.6.9=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
96-
org.apache.cxf:cxf-rt-frontend-jaxrs:4.1.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
97-
org.apache.cxf:cxf-rt-security:3.6.9=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
98-
org.apache.cxf:cxf-rt-security:4.1.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
95+
org.apache.cxf:cxf-rt-frontend-jaxrs:3.6.10=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
96+
org.apache.cxf:cxf-rt-frontend-jaxrs:4.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
97+
org.apache.cxf:cxf-rt-security:3.6.10=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
98+
org.apache.cxf:cxf-rt-security:4.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
9999
org.apache.cxf:cxf-rt-transports-http-jetty:3.0.0=testCompileClasspath,testRuntimeClasspath
100-
org.apache.cxf:cxf-rt-transports-http-jetty:3.6.9=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
101-
org.apache.cxf:cxf-rt-transports-http-jetty:4.1.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
100+
org.apache.cxf:cxf-rt-transports-http-jetty:3.6.10=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
101+
org.apache.cxf:cxf-rt-transports-http-jetty:4.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
102102
org.apache.cxf:cxf-rt-transports-http:3.0.0=testCompileClasspath,testRuntimeClasspath
103-
org.apache.cxf:cxf-rt-transports-http:3.6.9=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
104-
org.apache.cxf:cxf-rt-transports-http:4.1.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
103+
org.apache.cxf:cxf-rt-transports-http:3.6.10=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
104+
org.apache.cxf:cxf-rt-transports-http:4.2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
105105
org.apache.geronimo.specs:geronimo-activation_1.1_spec:1.0.2=compileClasspath
106106
org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.1.1=compileClasspath
107107
org.apache.geronimo.specs:geronimo-servlet_3.0_spec:1.0=testCompileClasspath,testRuntimeClasspath
@@ -130,25 +130,25 @@ org.codehaus.woodstox:wstx-asl:3.2.4=compileClasspath
130130
org.codenarc:CodeNarc:3.7.0=codenarc
131131
org.dom4j:dom4j:2.2.0=spotbugs
132132
org.eclipse.angus:angus-activation:2.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
133-
org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
133+
org.eclipse.jetty.ee11:jetty-ee11-servlet:12.1.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
134134
org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016=testCompileClasspath,testRuntimeClasspath
135135
org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
136136
org.eclipse.jetty:jetty-continuation:8.1.15.v20140411=testCompileClasspath,testRuntimeClasspath
137137
org.eclipse.jetty:jetty-http:10.0.26=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
138-
org.eclipse.jetty:jetty-http:12.0.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
138+
org.eclipse.jetty:jetty-http:12.1.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
139139
org.eclipse.jetty:jetty-http:8.1.15.v20140411=testCompileClasspath,testRuntimeClasspath
140140
org.eclipse.jetty:jetty-io:10.0.26=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
141-
org.eclipse.jetty:jetty-io:12.0.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
141+
org.eclipse.jetty:jetty-io:12.1.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
142142
org.eclipse.jetty:jetty-io:8.1.15.v20140411=testCompileClasspath,testRuntimeClasspath
143143
org.eclipse.jetty:jetty-security:10.0.26=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
144-
org.eclipse.jetty:jetty-security:12.0.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
144+
org.eclipse.jetty:jetty-security:12.1.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
145145
org.eclipse.jetty:jetty-security:8.1.15.v20140411=testCompileClasspath,testRuntimeClasspath
146146
org.eclipse.jetty:jetty-server:10.0.26=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
147-
org.eclipse.jetty:jetty-server:12.0.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
147+
org.eclipse.jetty:jetty-server:12.1.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
148148
org.eclipse.jetty:jetty-server:8.1.15.v20140411=testCompileClasspath,testRuntimeClasspath
149-
org.eclipse.jetty:jetty-session:12.0.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
149+
org.eclipse.jetty:jetty-session:12.1.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
150150
org.eclipse.jetty:jetty-util:10.0.26=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
151-
org.eclipse.jetty:jetty-util:12.0.29=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
151+
org.eclipse.jetty:jetty-util:12.1.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
152152
org.eclipse.jetty:jetty-util:8.1.15.v20140411=testCompileClasspath,testRuntimeClasspath
153153
org.glassfish.jaxb:jaxb-core:4.0.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
154154
org.glassfish.jaxb:jaxb-runtime:2.3.5=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath
@@ -159,6 +159,7 @@ org.gmetrics:GMetrics:2.1.0=codenarc
159159
org.hamcrest:hamcrest-core:1.3=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
160160
org.hamcrest:hamcrest:3.0=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
161161
org.jctools:jctools-core:3.3.0=buildTimeInstrumentationPlugin,cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
162+
org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
162163
org.junit.jupiter:junit-jupiter-api:5.14.1=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
163164
org.junit.jupiter:junit-jupiter-engine:5.14.1=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
164165
org.junit.jupiter:junit-jupiter-params:5.14.1=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -190,10 +191,10 @@ org.ow2.asm:asm:9.9.1=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClas
190191
org.slf4j:jcl-over-slf4j:1.7.30=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
191192
org.slf4j:jul-to-slf4j:1.7.30=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
192193
org.slf4j:log4j-over-slf4j:1.7.30=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
193-
org.slf4j:slf4j-api:1.7.30=buildTimeInstrumentationPlugin,compileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath
194+
org.slf4j:slf4j-api:1.7.30=buildTimeInstrumentationPlugin,compileClasspath,cxf3LatestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath
194195
org.slf4j:slf4j-api:1.7.32=testCompileClasspath,testRuntimeClasspath
195196
org.slf4j:slf4j-api:2.0.13=cxf3LatestDepTestCompileClasspath
196-
org.slf4j:slf4j-api:2.0.17=latestDepTestCompileClasspath,spotbugs,spotbugsSlf4j
197+
org.slf4j:slf4j-api:2.0.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,spotbugsSlf4j
197198
org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
198199
org.snakeyaml:snakeyaml-engine:2.9=buildTimeInstrumentationPlugin,cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
199200
org.spockframework:spock-bom:2.4-groovy-3.0=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath

0 commit comments

Comments
 (0)