From 8bf6fc91ad6e2444c402128671508b07e8d4dcba Mon Sep 17 00:00:00 2001 From: weil <152274067+wl2027@users.noreply.github.com> Date: Mon, 30 Jun 2025 11:31:44 +0800 Subject: [PATCH 1/2] Fix muzzle2 task failure in restlet-1.1 module --- instrumentation/restlet/restlet-1.1/javaagent/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instrumentation/restlet/restlet-1.1/javaagent/build.gradle.kts b/instrumentation/restlet/restlet-1.1/javaagent/build.gradle.kts index 7ab2a1289494..ee26c1a52e59 100644 --- a/instrumentation/restlet/restlet-1.1/javaagent/build.gradle.kts +++ b/instrumentation/restlet/restlet-1.1/javaagent/build.gradle.kts @@ -9,7 +9,7 @@ muzzle { versions.set("[1.1.0, 1.2-M1)") extraDependency("com.noelios.restlet:com.noelios.restlet") // missing dependencies - skip("2.5.0", "2.5.1", "2.5.2") + skip("2.5.0", "2.5.1", "2.5.2", "2.6.0") assertInverse.set(true) } } From 70d5b9d6abde7aca4ea4736e908fca0c31eead51 Mon Sep 17 00:00:00 2001 From: weil <152274067+wl2027@users.noreply.github.com> Date: Mon, 30 Jun 2025 20:42:28 +0800 Subject: [PATCH 2/2] Fix muzzle task failure in restlet-1.1 module assertInverse was removed because extraDependency is not available in later versions (e.g., 2.5.x),which causes exception during muzzle. #14159 --- .../restlet-1.1/javaagent/build.gradle.kts | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/instrumentation/restlet/restlet-1.1/javaagent/build.gradle.kts b/instrumentation/restlet/restlet-1.1/javaagent/build.gradle.kts index ee26c1a52e59..266635da52d0 100644 --- a/instrumentation/restlet/restlet-1.1/javaagent/build.gradle.kts +++ b/instrumentation/restlet/restlet-1.1/javaagent/build.gradle.kts @@ -8,9 +8,20 @@ muzzle { module.set("org.restlet") versions.set("[1.1.0, 1.2-M1)") extraDependency("com.noelios.restlet:com.noelios.restlet") - // missing dependencies - skip("2.5.0", "2.5.1", "2.5.2", "2.6.0") - assertInverse.set(true) + } + + // assertInverse was removed because extraDependency is not available in later versions (e.g., 2.5.x), + // which causes exception during muzzle. #14159 + fail { + group.set("org.restlet") + module.set("org.restlet") + versions.set("[,1.1.0)") + } + + fail { + group.set("org.restlet") + module.set("org.restlet") + versions.set("[1.2-M1,)") } }