Skip to content

Remove cxf latest dep limit #13926

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
merged 2 commits into from
May 27, 2025
Merged

Remove cxf latest dep limit #13926

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
74da3d7
Remove cxf latest dep limit
laurit May 27, 2025
f1a0651
work around test failure
laurit May 27, 2025
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
14 changes: 9 additions & 5 deletions instrumentation/jaxrs-client/jaxrs-client-2.0-testing/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ dependencies {
testLibrary("org.glassfish.jersey.core:jersey-client:2.0")
testLibrary("org.jboss.resteasy:resteasy-client:3.0.5.Final")
// ^ This version has timeouts https://issues.redhat.com/browse/RESTEASY-975
// testLibrary("org.apache.cxf:cxf-rt-rs-client:3.1.0")
testImplementation("org.apache.cxf:cxf-rt-rs-client:3.1.0")
testLibrary("org.apache.cxf:cxf-rt-rs-client:3.1.0")
// Doesn't work with CXF 3.0.x because their context is wrong:
// https://github.com/apache/cxf/commit/335c7bad2436f08d6d54180212df5a52157c9f21

Expand All @@ -25,8 +24,7 @@ dependencies {
latestDepTestLibrary("org.glassfish.jersey.inject:jersey-hk2:2.+")
latestDepTestLibrary("org.glassfish.jersey.core:jersey-client:2.+")
latestDepTestLibrary("org.jboss.resteasy:resteasy-client:3.0.26.Final")
// latestDepTestLibrary("org.apache.cxf:cxf-rt-rs-client:3.+")
latestDepTestLibrary("org.apache.cxf:cxf-rt-rs-client:3.6.6")
latestDepTestLibrary("org.apache.cxf:cxf-rt-rs-client:3.+")
}

// Requires old Guava. Can't use enforcedPlatform since predates BOM
Expand All @@ -37,5 +35,11 @@ tasks.withType<Test>().configureEach {
jvmArgs("--add-opens=java.base/java.net=ALL-UNNAMED")
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")

systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
val latestDepTest = findProperty("testLatestDeps") as Boolean
systemProperty("testLatestDeps", latestDepTest)
// in default configuration 3.6.7 retries http request in connectionErrorUnopenedPort test
// which creates a duplicate span
if (latestDepTest) {
systemProperty("org.apache.cxf.transport.http.forceURLConnection", true)
}
}
8 changes: 2 additions & 6 deletions instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ muzzle {
module.set("cxf-rt-frontend-jaxrs")
versions.set("[3.2,4)")
extraDependency("javax.servlet:javax.servlet-api:3.1.0")
skip("3.6.7") // version is present in maven metadata, but pom and jar are missing
}
pass {
group.set("org.apache.tomee")
Expand All @@ -27,9 +26,7 @@ dependencies {

compileOnly("javax.ws.rs:javax.ws.rs-api:2.0")
compileOnly("javax.servlet:javax.servlet-api:3.1.0")
// library("org.apache.cxf:cxf-rt-frontend-jaxrs:3.2.0")
compileOnly("org.apache.cxf:cxf-rt-frontend-jaxrs:3.2.0")
testImplementation("org.apache.cxf:cxf-rt-frontend-jaxrs:3.2.0")
library("org.apache.cxf:cxf-rt-frontend-jaxrs:3.2.0")

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

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

latestDepTestLibrary("org.eclipse.jetty:jetty-webapp:10.+") // documented limitation
latestDepTestLibrary("org.apache.cxf:cxf-rt-frontend-jaxrs:3.6.6") // documented limitation
// latestDepTestLibrary("org.apache.cxf:cxf-rt-frontend-jaxrs:3.+") // documented limitation
latestDepTestLibrary("org.apache.cxf:cxf-rt-frontend-jaxrs:3.+") // documented limitation
latestDepTestLibrary("org.apache.cxf:cxf-rt-transports-http-jetty:3.+") // documented limitation
latestDepTestLibrary("org.apache.cxf:cxf-rt-ws-policy:3.+") // documented limitation
}
Expand Down
8 changes: 2 additions & 6 deletions instrumentation/jaxws/jaxws-cxf-3.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,13 @@ muzzle {
versions.set("[3.0.0,)")
extraDependency("javax.servlet:javax.servlet-api:3.0.1")
extraDependency("jakarta.servlet:jakarta.servlet-api:5.0.0")
skip("3.6.7") // version is present in maven metadata, but pom and jar are missing
}
}

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

// library("org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0")
compileOnly("org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0")
testImplementation("org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0")
library("org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0")

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

latestDepTestLibrary("org.apache.cxf:cxf-rt-frontend-jaxws:3.6.6") // documented limitation
// latestDepTestLibrary("org.apache.cxf:cxf-rt-frontend-jaxws:3.+") // documented limitation
latestDepTestLibrary("org.apache.cxf:cxf-rt-frontend-jaxws:3.+") // documented limitation
latestDepTestLibrary("org.apache.cxf:cxf-rt-transports-http:3.+") // documented limitation
}

Expand Down
Loading