Skip to content

Commit 74da3d7

Browse files
committed
Remove cxf latest dep limit
1 parent b77a2d7 commit 74da3d7

File tree

3 files changed

+6
-16
lines changed

3 files changed

+6
-16
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ 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")
12-
testImplementation("org.apache.cxf:cxf-rt-rs-client:3.1.0")
11+
testLibrary("org.apache.cxf:cxf-rt-rs-client:3.1.0")
1312
// Doesn't work with CXF 3.0.x because their context is wrong:
1413
// https://github.com/apache/cxf/commit/335c7bad2436f08d6d54180212df5a52157c9f21
1514

@@ -25,8 +24,7 @@ dependencies {
2524
latestDepTestLibrary("org.glassfish.jersey.inject:jersey-hk2:2.+")
2625
latestDepTestLibrary("org.glassfish.jersey.core:jersey-client:2.+")
2726
latestDepTestLibrary("org.jboss.resteasy:resteasy-client:3.0.26.Final")
28-
// latestDepTestLibrary("org.apache.cxf:cxf-rt-rs-client:3.+")
29-
latestDepTestLibrary("org.apache.cxf:cxf-rt-rs-client:3.6.6")
27+
latestDepTestLibrary("org.apache.cxf:cxf-rt-rs-client:3.+")
3028
}
3129

3230
// 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: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ 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
1413
}
1514
pass {
1615
group.set("org.apache.tomee")
@@ -27,9 +26,7 @@ dependencies {
2726

2827
compileOnly("javax.ws.rs:javax.ws.rs-api:2.0")
2928
compileOnly("javax.servlet:javax.servlet-api:3.1.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")
29+
library("org.apache.cxf:cxf-rt-frontend-jaxrs:3.2.0")
3330

3431
implementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent"))
3532

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

5249
latestDepTestLibrary("org.eclipse.jetty:jetty-webapp:10.+") // 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
50+
latestDepTestLibrary("org.apache.cxf:cxf-rt-frontend-jaxrs:3.+") // documented limitation
5551
latestDepTestLibrary("org.apache.cxf:cxf-rt-transports-http-jetty:3.+") // documented limitation
5652
latestDepTestLibrary("org.apache.cxf:cxf-rt-ws-policy:3.+") // documented limitation
5753
}

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,13 @@ 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
1514
}
1615
}
1716

1817
dependencies {
1918
bootstrap(project(":instrumentation:servlet:servlet-common:bootstrap"))
2019

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")
20+
library("org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0")
2421

2522
compileOnly("javax.servlet:javax.servlet-api:3.0.1")
2623
compileOnly("jakarta.servlet:jakarta.servlet-api:5.0.0")
@@ -44,8 +41,7 @@ dependencies {
4441
testImplementation("javax.annotation:javax.annotation-api:1.2")
4542
testImplementation("com.sun.xml.messaging.saaj:saaj-impl:1.5.2")
4643

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
44+
latestDepTestLibrary("org.apache.cxf:cxf-rt-frontend-jaxws:3.+") // documented limitation
4945
latestDepTestLibrary("org.apache.cxf:cxf-rt-transports-http:3.+") // documented limitation
5046
}
5147

0 commit comments

Comments
 (0)