From 57dc9941485065ff31015a840983dc7e7080dbfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vandon?= Date: Mon, 30 Dec 2024 15:21:18 +0100 Subject: [PATCH 1/3] does this pass ? --- dd-java-agent/instrumentation/vertx-web-4.0/build.gradle | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/build.gradle b/dd-java-agent/instrumentation/vertx-web-4.0/build.gradle index ff0f792de7d..e34dffef8d5 100644 --- a/dd-java-agent/instrumentation/vertx-web-4.0/build.gradle +++ b/dd-java-agent/instrumentation/vertx-web-4.0/build.gradle @@ -1,9 +1,3 @@ -// Set properties before any plugins get loaded -ext { - // TODO Java 17: This version of vertx-web doesn't support Java 17 - maxJavaVersionForTests = JavaVersion.VERSION_15 -} - apply from: "$rootDir/gradle/java.gradle" muzzle { From 49701ef9e3144ac08d61bec128565b409e051ff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vandon?= Date: Tue, 31 Dec 2024 10:41:04 +0100 Subject: [PATCH 2/3] Revert "does this pass ?" This reverts commit 57dc9941485065ff31015a840983dc7e7080dbfa. --- dd-java-agent/instrumentation/vertx-web-4.0/build.gradle | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/build.gradle b/dd-java-agent/instrumentation/vertx-web-4.0/build.gradle index e34dffef8d5..ff0f792de7d 100644 --- a/dd-java-agent/instrumentation/vertx-web-4.0/build.gradle +++ b/dd-java-agent/instrumentation/vertx-web-4.0/build.gradle @@ -1,3 +1,9 @@ +// Set properties before any plugins get loaded +ext { + // TODO Java 17: This version of vertx-web doesn't support Java 17 + maxJavaVersionForTests = JavaVersion.VERSION_15 +} + apply from: "$rootDir/gradle/java.gradle" muzzle { From d3eef233a24973a2360ac1aa447917aa759fb04c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vandon?= Date: Tue, 31 Dec 2024 10:56:52 +0100 Subject: [PATCH 3/3] use java 17 only for latest dep tests --- dd-java-agent/instrumentation/vertx-web-4.0/build.gradle | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/instrumentation/vertx-web-4.0/build.gradle b/dd-java-agent/instrumentation/vertx-web-4.0/build.gradle index ff0f792de7d..1f3deaca347 100644 --- a/dd-java-agent/instrumentation/vertx-web-4.0/build.gradle +++ b/dd-java-agent/instrumentation/vertx-web-4.0/build.gradle @@ -1,7 +1,8 @@ // Set properties before any plugins get loaded ext { - // TODO Java 17: This version of vertx-web doesn't support Java 17 + // vertx-web doesn't support Java 17 until v4.2 maxJavaVersionForTests = JavaVersion.VERSION_15 + latestDepTestMaxJavaVersionForTests = JavaVersion.VERSION_17 } apply from: "$rootDir/gradle/java.gradle" @@ -29,7 +30,7 @@ artifacts { dependencies { api project(':dd-java-agent:instrumentation:netty-4.1-shared') - compileOnly group: 'io.vertx', name: 'vertx-web', version: '4.2.7' + compileOnly group: 'io.vertx', name: 'vertx-web', version: '4.0.0' testImplementation project(':dd-java-agent:instrumentation:netty-4.1') testImplementation project(':dd-java-agent:instrumentation:trace-annotation') @@ -44,6 +45,7 @@ dependencies { testRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core') testRuntimeOnly project(':dd-java-agent:instrumentation:netty-buffer-4') + // TODO support v>=4.5 latestDepTestImplementation group: 'io.vertx', name: 'vertx-web', version: '4.4.+' latestDepTestImplementation group: 'io.vertx', name: 'vertx-web-client', version: '4.4.+' }