From 953fd106a796782cf7c3e8b1e83cf09804728352 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 25 Jan 2022 20:58:48 -0800 Subject: [PATCH] Fix vertx-http-client testLatestDeps Xlint errors (#5228) * Fix vertx-http-client testLatestDeps * fix --- .../vertx-http-client-3.0/javaagent/build.gradle.kts | 9 +++++---- .../vertx-http-client-4.0/javaagent/build.gradle.kts | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/build.gradle.kts b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/build.gradle.kts index 8bb85af41fb0..758f5f24379f 100644 --- a/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/build.gradle.kts +++ b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/build.gradle.kts @@ -14,10 +14,9 @@ muzzle { dependencies { library("io.vertx:vertx-core:3.0.0") - compileOnly("io.vertx:vertx-codegen:3.0.0") - testCompileOnly("io.vertx:vertx-codegen:3.0.0") - compileOnly("io.vertx:vertx-docgen:3.0.0") - testCompileOnly("io.vertx:vertx-docgen:3.0.0") + // vertx-codegen and vertx-docgen dependencies are needed for Xlint's annotation checking + library("io.vertx:vertx-codegen:3.0.0") + testLibrary("io.vertx:vertx-docgen:3.0.0") compileOnly("com.google.auto.value:auto-value-annotations") annotationProcessor("com.google.auto.value:auto-value") @@ -32,6 +31,8 @@ dependencies { // 3.9.7 Requires Netty 4.1.60, no other version works with it. latestDepTestLibrary(enforcedPlatform("io.netty:netty-bom:4.1.60.Final")) latestDepTestLibrary("io.vertx:vertx-core:3.+") + latestDepTestLibrary("io.vertx:vertx-codegen:3.+") + latestDepTestLibrary("io.vertx:vertx-docgen:3.+") } tasks { diff --git a/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/build.gradle.kts b/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/build.gradle.kts index 738278707e7a..021419b09699 100644 --- a/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/build.gradle.kts +++ b/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/build.gradle.kts @@ -14,8 +14,8 @@ muzzle { dependencies { library("io.vertx:vertx-core:4.0.0") - compileOnly("io.vertx:vertx-codegen:4.0.0") - testCompileOnly("io.vertx:vertx-codegen:4.0.0") + // vertx-codegen dependency is needed for Xlint's annotation checking + library("io.vertx:vertx-codegen:4.0.0") implementation(project(":instrumentation:vertx:vertx-http-client:vertx-http-client-common:javaagent"))