From 1f64215f384ad76a3e360fc095285349b30e4d7e Mon Sep 17 00:00:00 2001 From: Mateusz Rzeszutek Date: Thu, 8 Jun 2023 13:23:16 +0200 Subject: [PATCH] Fix latestDepTest/muzzle after a broken undertow release (#8678) --- .../jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts | 4 ++-- instrumentation/undertow-1.4/javaagent/build.gradle.kts | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts index 1357b37b9384..9d87ce6bd674 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts @@ -59,7 +59,7 @@ dependencies { testLibrary("org.jboss.resteasy:resteasy-undertow:3.0.4.Final") { exclude("org.jboss.resteasy", "resteasy-client") } - testLibrary("io.undertow:undertow-servlet:1.4.28.Final") + testImplementation("io.undertow:undertow-servlet:1.4.28.Final") testLibrary("org.jboss.resteasy:resteasy-servlet-initializer:3.0.4.Final") latestDepTestLibrary("org.jboss.resteasy:resteasy-servlet-initializer:3.0.+") // see jaxrs-3.0-resteasy-3.1 module @@ -67,7 +67,7 @@ dependencies { latestDepTestLibrary("org.jboss.resteasy:resteasy-undertow:3.0.+") { // see jaxrs-3.0-resteasy-3.1 module exclude("org.jboss.resteasy", "resteasy-client") } - latestDepTestLibrary("io.undertow:undertow-servlet:2.2.+") // 2.3 switches to Servlet 5 / Jakarta namespace + latestDepTestLibrary("io.undertow:undertow-servlet:2.2.24.Final") // 2.3 switches to Servlet 5 / Jakarta namespace } tasks { diff --git a/instrumentation/undertow-1.4/javaagent/build.gradle.kts b/instrumentation/undertow-1.4/javaagent/build.gradle.kts index 4e4daaee1d73..1b90ab48ac8c 100644 --- a/instrumentation/undertow-1.4/javaagent/build.gradle.kts +++ b/instrumentation/undertow-1.4/javaagent/build.gradle.kts @@ -8,6 +8,8 @@ muzzle { module.set("undertow-core") versions.set("[1.4.0.Final,)") assertInverse.set(true) + // release missing in maven central + skip("2.2.25.Final") } }