瀏覽代碼

Limit cxf latest dep version (#7470)

Lauri Tulmin 2 年之前
父節點
當前提交
983b9dddff

+ 1 - 0
instrumentation/jaxrs-client/jaxrs-client-2.0-testing/build.gradle.kts

@@ -21,6 +21,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.+")
 }
 
 // Requires old Guava. Can't use enforcedPlatform since predates BOM

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

@@ -8,7 +8,7 @@ muzzle {
   pass {
     group.set("org.apache.cxf")
     module.set("cxf-rt-frontend-jaxrs")
-    versions.set("[3.2,)")
+    versions.set("[3.2,4)")
     extraDependency("javax.servlet:javax.servlet-api:3.1.0")
   }
   pass {
@@ -42,6 +42,9 @@ dependencies {
   testLibrary("org.apache.cxf:cxf-rt-ws-policy:3.2.0")
 
   latestDepTestLibrary("org.eclipse.jetty:jetty-webapp:9.+")
+  latestDepTestLibrary("org.apache.cxf:cxf-rt-frontend-jaxrs:3.+")
+  latestDepTestLibrary("org.apache.cxf:cxf-rt-transports-http-jetty:3.+")
+  latestDepTestLibrary("org.apache.cxf:cxf-rt-ws-policy:3.+")
 }
 
 tasks.withType<Test>().configureEach {

+ 4 - 1
instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/build.gradle.kts

@@ -8,7 +8,7 @@ muzzle {
     module.set("cxf-rt-frontend-jaxws")
     // all earlier versions in maven central also pass muzzle check,
     // but 3.0.0 is already 8 years old and testing earlier versions adds complexity
-    versions.set("[3.0.0,)")
+    versions.set("[3.0.0,4)")
     extraDependency("javax.servlet:javax.servlet-api:3.0.1")
   }
 }
@@ -36,6 +36,9 @@ dependencies {
   testImplementation("javax.activation:javax.activation-api:1.2.0")
   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.+")
+  latestDepTestLibrary("org.apache.cxf:cxf-rt-transports-http:3.+")
 }
 
 tasks.withType<Test>().configureEach {