Skip to content

Commit 814fbef

Browse files
authored
Fix latest dep tests (#13910)
1 parent 2d555ad commit 814fbef

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

instrumentation/jaxrs-client/jaxrs-client-2.0-testing/build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ dependencies {
88
testLibrary("org.glassfish.jersey.core:jersey-client:2.0")
99
testLibrary("org.jboss.resteasy:resteasy-client:3.0.5.Final")
1010
// ^ This version has timeouts https://issues.redhat.com/browse/RESTEASY-975
11-
testLibrary("org.apache.cxf:cxf-rt-rs-client:3.1.0")
11+
// testLibrary("org.apache.cxf:cxf-rt-rs-client:3.1.0")
12+
testImplementation("org.apache.cxf:cxf-rt-rs-client:3.1.0")
1213
// Doesn't work with CXF 3.0.x because their context is wrong:
1314
// https://github.com/apache/cxf/commit/335c7bad2436f08d6d54180212df5a52157c9f21
1415

@@ -24,7 +25,8 @@ dependencies {
2425
latestDepTestLibrary("org.glassfish.jersey.inject:jersey-hk2:2.+")
2526
latestDepTestLibrary("org.glassfish.jersey.core:jersey-client:2.+")
2627
latestDepTestLibrary("org.jboss.resteasy:resteasy-client:3.0.26.Final")
27-
latestDepTestLibrary("org.apache.cxf:cxf-rt-rs-client:3.+")
28+
// latestDepTestLibrary("org.apache.cxf:cxf-rt-rs-client:3.+")
29+
latestDepTestLibrary("org.apache.cxf:cxf-rt-rs-client:3.6.6")
2830
}
2931

3032
// Requires old Guava. Can't use enforcedPlatform since predates BOM

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/build.gradle.kts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ muzzle {
1010
module.set("cxf-rt-frontend-jaxrs")
1111
versions.set("[3.2,4)")
1212
extraDependency("javax.servlet:javax.servlet-api:3.1.0")
13+
skip("3.6.7") // version is present in maven metadata, but pom and jar are missing
1314
}
1415
pass {
1516
group.set("org.apache.tomee")
@@ -26,7 +27,9 @@ dependencies {
2627

2728
compileOnly("javax.ws.rs:javax.ws.rs-api:2.0")
2829
compileOnly("javax.servlet:javax.servlet-api:3.1.0")
29-
library("org.apache.cxf:cxf-rt-frontend-jaxrs:3.2.0")
30+
// library("org.apache.cxf:cxf-rt-frontend-jaxrs:3.2.0")
31+
compileOnly("org.apache.cxf:cxf-rt-frontend-jaxrs:3.2.0")
32+
testImplementation("org.apache.cxf:cxf-rt-frontend-jaxrs:3.2.0")
3033

3134
implementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent"))
3235

@@ -47,7 +50,8 @@ dependencies {
4750
testLibrary("org.apache.cxf:cxf-rt-ws-policy:3.2.0")
4851

4952
latestDepTestLibrary("org.eclipse.jetty:jetty-webapp:10.+") // documented limitation
50-
latestDepTestLibrary("org.apache.cxf:cxf-rt-frontend-jaxrs:3.+") // documented limitation
53+
latestDepTestLibrary("org.apache.cxf:cxf-rt-frontend-jaxrs:3.6.6") // documented limitation
54+
// latestDepTestLibrary("org.apache.cxf:cxf-rt-frontend-jaxrs:3.+") // documented limitation
5155
latestDepTestLibrary("org.apache.cxf:cxf-rt-transports-http-jetty:3.+") // documented limitation
5256
latestDepTestLibrary("org.apache.cxf:cxf-rt-ws-policy:3.+") // documented limitation
5357
}

instrumentation/jaxws/jaxws-cxf-3.0/javaagent/build.gradle.kts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,17 @@ muzzle {
1111
versions.set("[3.0.0,)")
1212
extraDependency("javax.servlet:javax.servlet-api:3.0.1")
1313
extraDependency("jakarta.servlet:jakarta.servlet-api:5.0.0")
14+
skip("3.6.7") // version is present in maven metadata, but pom and jar are missing
1415
}
1516
}
1617

1718
dependencies {
1819
bootstrap(project(":instrumentation:servlet:servlet-common:bootstrap"))
1920

20-
library("org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0")
21+
// library("org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0")
22+
compileOnly("org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0")
23+
testImplementation("org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0")
24+
2125
compileOnly("javax.servlet:javax.servlet-api:3.0.1")
2226
compileOnly("jakarta.servlet:jakarta.servlet-api:5.0.0")
2327
compileOnly(project(":muzzle"))
@@ -40,7 +44,8 @@ dependencies {
4044
testImplementation("javax.annotation:javax.annotation-api:1.2")
4145
testImplementation("com.sun.xml.messaging.saaj:saaj-impl:1.5.2")
4246

43-
latestDepTestLibrary("org.apache.cxf:cxf-rt-frontend-jaxws:3.+") // documented limitation
47+
latestDepTestLibrary("org.apache.cxf:cxf-rt-frontend-jaxws:3.6.6") // documented limitation
48+
// latestDepTestLibrary("org.apache.cxf:cxf-rt-frontend-jaxws:3.+") // documented limitation
4449
latestDepTestLibrary("org.apache.cxf:cxf-rt-transports-http:3.+") // documented limitation
4550
}
4651

0 commit comments

Comments
 (0)