From 1e1d3f4a578574ecb6327f5b1e401d6958493b33 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Mon, 16 Mar 2026 13:09:25 -0400 Subject: [PATCH 1/2] Remove Tyrus version pin in jakarta-websocket latestDepTest --- .../websocket/jakarta-websocket-2.0/build.gradle | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/build.gradle b/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/build.gradle index 326c397a648..98c3921acfd 100644 --- a/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/build.gradle +++ b/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/build.gradle @@ -22,10 +22,7 @@ dependencies { testRuntimeOnly project(":dd-java-agent:instrumentation:websocket:javax-websocket-1.0") testImplementation group: 'org.glassfish.tyrus', name: 'tyrus-container-inmemory', version: '2.0.0' - // `tyrus 2.3.0-M1` pulls `grizzly 5.0.0`, whose POM imports a missing `grizzly-bom 5.0.0-SNAPSHOT`. - // See issue: https://github.com/eclipse-ee4j/glassfish-grizzly/issues/2278 - // This fix must be revisited once correct version of `grizzly-bom` will be released. - latestDepTestImplementation group: 'org.glassfish.tyrus', name: 'tyrus-container-inmemory', version: '2.2.+' + latestDepTestImplementation group: 'org.glassfish.tyrus', name: 'tyrus-container-inmemory', version: '+' } tasks.named('latestDepTest', Test) { From 9fb3095630e518e485cf498f298b477f5cd6d087 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 6 May 2026 15:23:13 -0400 Subject: [PATCH 2/2] Idiomatic way to skip broken dependencies. --- .../websocket/jakarta-websocket-2.0/build.gradle | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/build.gradle b/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/build.gradle index 98c3921acfd..8b3bacba81f 100644 --- a/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/build.gradle +++ b/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/build.gradle @@ -22,7 +22,12 @@ dependencies { testRuntimeOnly project(":dd-java-agent:instrumentation:websocket:javax-websocket-1.0") testImplementation group: 'org.glassfish.tyrus', name: 'tyrus-container-inmemory', version: '2.0.0' - latestDepTestImplementation group: 'org.glassfish.tyrus', name: 'tyrus-container-inmemory', version: '+' + latestDepTestImplementation(group: 'org.glassfish.tyrus', name: 'tyrus-container-inmemory', version: '+') { + version { + reject '2.3.0-M1' + } + because 'Tyrus 2.3.0-M1 depends on broken Grizzly 5.0.0 POM metadata' + } } tasks.named('latestDepTest', Test) {