From fbfdc7e9d2089fda4155ef97d74d86df797ac45f Mon Sep 17 00:00:00 2001 From: Mike Duigou Date: Wed, 11 May 2022 15:16:18 -0700 Subject: [PATCH 1/5] Use `servicetalk-dependencies` BOM internally Motivation: The new `dependencies` BOM introduced in #2210 can be used to improve the management of external dependencies by reducing use of explicit versions within the module `build.gradle` files. Modification: Use `dependencies` BOM for every module which includes `api` or `implementation` external dependencies. The BOM is imported as `api` platform only in cases where the external dependency is also imported `api`. `implementation` platform is used in cases where the external dependencies are only `implementation` dependencies themselves. Result: Fewer explicit version specifications and better managed dependency versioning. --- servicetalk-annotations/build.gradle | 4 +++- servicetalk-benchmarks/build.gradle | 8 +++++--- servicetalk-buffer-api/build.gradle | 3 ++- servicetalk-buffer-netty/build.gradle | 6 +++--- servicetalk-client-api-internal/build.gradle | 5 +++-- servicetalk-client-api/build.gradle | 5 +++-- .../build.gradle | 5 +++-- servicetalk-concurrent-api-test/build.gradle | 3 ++- servicetalk-concurrent-api/build.gradle | 5 +++-- servicetalk-concurrent-internal/build.gradle | 5 +++-- servicetalk-concurrent-jdkflow/build.gradle | 5 +++-- .../build.gradle | 5 +++-- .../build.gradle | 3 ++- servicetalk-concurrent/build.gradle | 3 ++- servicetalk-context-api/build.gradle | 3 ++- servicetalk-data-jackson-jersey/build.gradle | 8 ++++---- servicetalk-data-jackson/build.gradle | 5 +++-- servicetalk-data-protobuf-jersey/build.gradle | 10 +++++----- servicetalk-data-protobuf/build.gradle | 5 +++-- servicetalk-dependencies/build.gradle | 18 +++++++++--------- servicetalk-dns-discovery-netty/build.gradle | 6 +++--- servicetalk-encoding-api-internal/build.gradle | 3 ++- servicetalk-encoding-api/build.gradle | 5 +++-- servicetalk-encoding-netty/build.gradle | 6 +++--- servicetalk-grpc-api/build.gradle | 7 ++++--- servicetalk-grpc-internal/build.gradle | 3 ++- servicetalk-grpc-netty/build.gradle | 7 ++++--- servicetalk-grpc-protobuf/build.gradle | 7 ++++--- servicetalk-grpc-protoc/build.gradle | 3 ++- servicetalk-grpc-utils/build.gradle | 3 ++- servicetalk-http-api/build.gradle | 5 +++-- servicetalk-http-netty/build.gradle | 5 +++-- .../build.gradle | 6 +++--- servicetalk-http-router-jersey/build.gradle | 17 +++++++++-------- servicetalk-http-router-predicate/build.gradle | 3 ++- servicetalk-http-security-jersey/build.gradle | 6 +++--- servicetalk-http-utils/build.gradle | 5 +++-- servicetalk-loadbalancer/build.gradle | 5 +++-- servicetalk-log4j2-mdc-utils/build.gradle | 5 +++-- servicetalk-log4j2-mdc/build.gradle | 3 ++- .../build.gradle | 4 +++- servicetalk-oio-api-internal/build.gradle | 6 ++++-- servicetalk-oio-api/build.gradle | 3 ++- .../build.gradle | 3 ++- servicetalk-opentracing-http/build.gradle | 7 ++++--- .../build.gradle | 6 ++++-- servicetalk-opentracing-inmemory/build.gradle | 5 +++-- servicetalk-opentracing-internal/build.gradle | 6 ++++-- servicetalk-opentracing-log4j2/build.gradle | 8 ++++---- .../build.gradle | 8 ++++---- servicetalk-router-api/build.gradle | 4 +++- servicetalk-router-utils-internal/build.gradle | 5 +++-- servicetalk-serialization-api/build.gradle | 3 ++- servicetalk-serializer-api/build.gradle | 4 +++- servicetalk-serializer-utils/build.gradle | 3 ++- servicetalk-tcp-netty-internal/build.gradle | 6 ++++-- servicetalk-test-resources/build.gradle | 7 ++++--- servicetalk-transport-api/build.gradle | 5 +++-- .../build.gradle | 6 +++--- servicetalk-transport-netty/build.gradle | 4 ++-- servicetalk-utils-internal/build.gradle | 7 ++++--- 61 files changed, 196 insertions(+), 138 deletions(-) diff --git a/servicetalk-annotations/build.gradle b/servicetalk-annotations/build.gradle index 019f2b5748..47bca10683 100644 --- a/servicetalk-annotations/build.gradle +++ b/servicetalk-annotations/build.gradle @@ -17,5 +17,7 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation platform(project(":servicetalk-dependencies")) + + implementation "com.google.code.findbugs:jsr305" } diff --git a/servicetalk-benchmarks/build.gradle b/servicetalk-benchmarks/build.gradle index f996359ba5..640bbee964 100644 --- a/servicetalk-benchmarks/build.gradle +++ b/servicetalk-benchmarks/build.gradle @@ -22,6 +22,8 @@ plugins { apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) + implementation project(":servicetalk-annotations") implementation project(":servicetalk-buffer-netty") implementation project(":servicetalk-concurrent-api") @@ -30,9 +32,9 @@ dependencies { implementation project(":servicetalk-http-netty") implementation project(":servicetalk-transport-netty-internal") implementation project(":servicetalk-loadbalancer") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" - implementation "io.netty:netty-codec-http:$nettyVersion" - implementation "org.openjdk.jmh:jmh-core:$jmhCoreVersion" + implementation "com.google.code.findbugs:jsr305" + implementation "io.netty:netty-codec-http" + implementation "org.openjdk.jmh:jmh-core" testImplementation testFixtures(project(":servicetalk-concurrent-internal")) testImplementation project(":servicetalk-concurrent-internal") diff --git a/servicetalk-buffer-api/build.gradle b/servicetalk-buffer-api/build.gradle index 6c3aefa6a8..acdb038286 100644 --- a/servicetalk-buffer-api/build.gradle +++ b/servicetalk-buffer-api/build.gradle @@ -17,11 +17,12 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") implementation project(":servicetalk-annotations") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" testImplementation "org.junit.jupiter:junit-jupiter-api" testImplementation "org.junit.jupiter:junit-jupiter-params" diff --git a/servicetalk-buffer-netty/build.gradle b/servicetalk-buffer-netty/build.gradle index bca2a6a143..b52fc9445e 100644 --- a/servicetalk-buffer-netty/build.gradle +++ b/servicetalk-buffer-netty/build.gradle @@ -17,7 +17,7 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { - api platform("io.netty:netty-bom:$nettyVersion") + api platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-buffer-api") @@ -25,8 +25,8 @@ dependencies { implementation project(":servicetalk-annotations") implementation project(":servicetalk-utils-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "com.google.code.findbugs:jsr305" + implementation "org.slf4j:slf4j-api" testImplementation project(":servicetalk-test-resources") testImplementation "org.junit.jupiter:junit-jupiter-api" diff --git a/servicetalk-client-api-internal/build.gradle b/servicetalk-client-api-internal/build.gradle index 547104413e..a3da8f7ea7 100644 --- a/servicetalk-client-api-internal/build.gradle +++ b/servicetalk-client-api-internal/build.gradle @@ -17,6 +17,7 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-client-api") @@ -25,8 +26,8 @@ dependencies { implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent-api-internal") implementation project(":servicetalk-concurrent-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "com.google.code.findbugs:jsr305" + implementation "org.slf4j:slf4j-api" testImplementation testFixtures(project(":servicetalk-concurrent-api")) testImplementation testFixtures(project(":servicetalk-concurrent-internal")) diff --git a/servicetalk-client-api/build.gradle b/servicetalk-client-api/build.gradle index a58b1ed263..630f4b9f77 100644 --- a/servicetalk-client-api/build.gradle +++ b/servicetalk-client-api/build.gradle @@ -17,6 +17,7 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + api platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-concurrent-api") @@ -25,8 +26,8 @@ dependencies { implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent-api-internal") implementation project(":servicetalk-concurrent-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "com.google.code.findbugs:jsr305" + implementation "org.slf4j:slf4j-api" testImplementation testFixtures(project(":servicetalk-concurrent-api")) testImplementation testFixtures(project(":servicetalk-concurrent-internal")) diff --git a/servicetalk-concurrent-api-internal/build.gradle b/servicetalk-concurrent-api-internal/build.gradle index 4739e46687..ad73bc6e8b 100644 --- a/servicetalk-concurrent-api-internal/build.gradle +++ b/servicetalk-concurrent-api-internal/build.gradle @@ -17,6 +17,7 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-concurrent-api") @@ -27,8 +28,8 @@ dependencies { implementation project(":servicetalk-concurrent-api") implementation project(":servicetalk-concurrent-internal") implementation project(":servicetalk-utils-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "com.google.code.findbugs:jsr305" + implementation "org.slf4j:slf4j-api" testImplementation testFixtures(project(":servicetalk-concurrent-api")) testImplementation testFixtures(project(":servicetalk-concurrent-internal")) diff --git a/servicetalk-concurrent-api-test/build.gradle b/servicetalk-concurrent-api-test/build.gradle index 8cda2d7a99..a606d03441 100644 --- a/servicetalk-concurrent-api-test/build.gradle +++ b/servicetalk-concurrent-api-test/build.gradle @@ -17,6 +17,7 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-concurrent-api") @@ -25,7 +26,7 @@ dependencies { implementation project(":servicetalk-concurrent-internal") implementation project(":servicetalk-concurrent-test-internal") implementation project(":servicetalk-utils-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" testImplementation testFixtures(project(":servicetalk-concurrent-internal")) testImplementation testFixtures(project(":servicetalk-concurrent-api")) diff --git a/servicetalk-concurrent-api/build.gradle b/servicetalk-concurrent-api/build.gradle index daa2d078dc..9a50545254 100644 --- a/servicetalk-concurrent-api/build.gradle +++ b/servicetalk-concurrent-api/build.gradle @@ -17,6 +17,7 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + api platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testFixturesImplementation platform("org.junit:junit-bom:$junit5Version") @@ -26,8 +27,8 @@ dependencies { implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent-internal") implementation project(":servicetalk-utils-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "com.google.code.findbugs:jsr305" + implementation "org.slf4j:slf4j-api" testImplementation testFixtures(project(":servicetalk-concurrent-internal")) testImplementation project(":servicetalk-concurrent-test-internal") diff --git a/servicetalk-concurrent-internal/build.gradle b/servicetalk-concurrent-internal/build.gradle index 2488ccf759..2dc39ba8d4 100644 --- a/servicetalk-concurrent-internal/build.gradle +++ b/servicetalk-concurrent-internal/build.gradle @@ -17,6 +17,7 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testFixturesImplementation platform("org.junit:junit-bom:$junit5Version") @@ -25,8 +26,8 @@ dependencies { implementation project(":servicetalk-annotations") implementation project(":servicetalk-utils-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "com.google.code.findbugs:jsr305" + implementation "org.slf4j:slf4j-api" testImplementation project(":servicetalk-test-resources") testImplementation "org.junit.jupiter:junit-jupiter-api" diff --git a/servicetalk-concurrent-jdkflow/build.gradle b/servicetalk-concurrent-jdkflow/build.gradle index 17c7721e24..cb4a36b64f 100644 --- a/servicetalk-concurrent-jdkflow/build.gradle +++ b/servicetalk-concurrent-jdkflow/build.gradle @@ -30,13 +30,14 @@ compileJava { } dependencies { + implementation platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-concurrent-api") implementation project(":servicetalk-annotations") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "com.google.code.findbugs:jsr305" + implementation "org.slf4j:slf4j-api" testImplementation testFixtures(project(":servicetalk-concurrent-api")) testImplementation testFixtures(project(":servicetalk-concurrent-internal")) diff --git a/servicetalk-concurrent-reactivestreams/build.gradle b/servicetalk-concurrent-reactivestreams/build.gradle index ee6ef5ca97..09a2ba698a 100644 --- a/servicetalk-concurrent-reactivestreams/build.gradle +++ b/servicetalk-concurrent-reactivestreams/build.gradle @@ -17,6 +17,7 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-concurrent-api") @@ -25,8 +26,8 @@ dependencies { implementation project(":servicetalk-annotations") implementation project(":servicetalk-serializer-utils") implementation project(":servicetalk-buffer-netty") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "com.google.code.findbugs:jsr305" + implementation "org.slf4j:slf4j-api" testImplementation testFixtures(project(":servicetalk-concurrent-api")) testImplementation testFixtures(project(":servicetalk-concurrent-internal")) diff --git a/servicetalk-concurrent-test-internal/build.gradle b/servicetalk-concurrent-test-internal/build.gradle index f3b2f199e5..800f7d779d 100644 --- a/servicetalk-concurrent-test-internal/build.gradle +++ b/servicetalk-concurrent-test-internal/build.gradle @@ -17,6 +17,7 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + api platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-concurrent") @@ -24,7 +25,7 @@ dependencies { implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent-internal") implementation project(":servicetalk-utils-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" testImplementation testFixtures(project(":servicetalk-concurrent-internal")) testImplementation project(":servicetalk-test-resources") diff --git a/servicetalk-concurrent/build.gradle b/servicetalk-concurrent/build.gradle index 7c7c870cd6..b94d03fc2f 100644 --- a/servicetalk-concurrent/build.gradle +++ b/servicetalk-concurrent/build.gradle @@ -17,7 +17,8 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + api platform(project(":servicetalk-dependencies")) implementation project(":servicetalk-annotations") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" } diff --git a/servicetalk-context-api/build.gradle b/servicetalk-context-api/build.gradle index 654666c57f..724d75dd06 100644 --- a/servicetalk-context-api/build.gradle +++ b/servicetalk-context-api/build.gradle @@ -17,7 +17,8 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + api platform(project(":servicetalk-dependencies")) implementation project(":servicetalk-annotations") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" } diff --git a/servicetalk-data-jackson-jersey/build.gradle b/servicetalk-data-jackson-jersey/build.gradle index 781a4448fc..e8ea11ea1a 100644 --- a/servicetalk-data-jackson-jersey/build.gradle +++ b/servicetalk-data-jackson-jersey/build.gradle @@ -17,12 +17,12 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { - implementation platform("org.glassfish.jersey:jersey-bom:$jerseyVersion") + api platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.glassfish.jersey:jersey-bom:$jerseyVersion") testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-data-jackson") - api "jakarta.ws.rs:jakarta.ws.rs-api:$jaxRsVersion" // MediaType, Feature + api "jakarta.ws.rs:jakarta.ws.rs-api" // MediaType, Feature api "org.glassfish.jersey.core:jersey-common" // AutoDiscoverable implementation project(":servicetalk-annotations") @@ -34,9 +34,9 @@ dependencies { implementation project(":servicetalk-http-router-jersey-internal") implementation project(":servicetalk-http-utils") implementation project(":servicetalk-transport-netty") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" implementation "org.glassfish.jersey.core:jersey-server" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "org.slf4j:slf4j-api" testImplementation testFixtures(project(":servicetalk-concurrent-api")) testImplementation testFixtures(project(":servicetalk-concurrent-internal")) diff --git a/servicetalk-data-jackson/build.gradle b/servicetalk-data-jackson/build.gradle index 8bb4514147..7ce7ca11af 100644 --- a/servicetalk-data-jackson/build.gradle +++ b/servicetalk-data-jackson/build.gradle @@ -17,17 +17,18 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + api platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-serialization-api") api project(":servicetalk-serializer-api") - api "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" + api "com.fasterxml.jackson.core:jackson-databind" implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent-api-internal") implementation project(":servicetalk-concurrent-internal") implementation project(":servicetalk-utils-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" testImplementation testFixtures(project(":servicetalk-concurrent-api")) testImplementation testFixtures(project(":servicetalk-concurrent-internal")) diff --git a/servicetalk-data-protobuf-jersey/build.gradle b/servicetalk-data-protobuf-jersey/build.gradle index 9b02b274ad..7594a868d6 100644 --- a/servicetalk-data-protobuf-jersey/build.gradle +++ b/servicetalk-data-protobuf-jersey/build.gradle @@ -24,11 +24,11 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" apply plugin: "com.google.protobuf" dependencies { - implementation platform("org.glassfish.jersey:jersey-bom:$jerseyVersion") + api platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.glassfish.jersey:jersey-bom:$jerseyVersion") testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") - api "jakarta.ws.rs:jakarta.ws.rs-api:$jaxRsVersion" // MediaType, Feature + api "jakarta.ws.rs:jakarta.ws.rs-api" // MediaType, Feature api "org.glassfish.jersey.core:jersey-common" // AutoDiscoverable implementation project(":servicetalk-annotations") @@ -41,10 +41,10 @@ dependencies { implementation project(":servicetalk-http-router-jersey-internal") implementation project(":servicetalk-http-utils") implementation project(":servicetalk-transport-netty") - implementation "com.google.protobuf:protobuf-java:$protobufVersion" - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.protobuf:protobuf-java" + implementation "com.google.code.findbugs:jsr305" implementation "org.glassfish.jersey.core:jersey-server" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "org.slf4j:slf4j-api" testImplementation testFixtures(project(":servicetalk-concurrent-api")) testImplementation testFixtures(project(":servicetalk-concurrent-internal")) diff --git a/servicetalk-data-protobuf/build.gradle b/servicetalk-data-protobuf/build.gradle index f2e9ed9c99..62cdd8b163 100644 --- a/servicetalk-data-protobuf/build.gradle +++ b/servicetalk-data-protobuf/build.gradle @@ -26,19 +26,20 @@ apply plugin: "com.google.protobuf" ideaModule.dependsOn "generateTestProto" dependencies { + api platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-buffer-api") api project(":servicetalk-concurrent-api") api project(":servicetalk-serializer-api") - api "com.google.protobuf:protobuf-java:$protobufVersion" + api "com.google.protobuf:protobuf-java" implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent-api-internal") implementation project(":servicetalk-concurrent-internal") implementation project(":servicetalk-serialization-api") implementation project(":servicetalk-serializer-utils") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" testImplementation testFixtures(project(":servicetalk-concurrent-api")) testImplementation testFixtures(project(":servicetalk-concurrent-internal")) diff --git a/servicetalk-dependencies/build.gradle b/servicetalk-dependencies/build.gradle index f80433f724..1d392a3d2a 100644 --- a/servicetalk-dependencies/build.gradle +++ b/servicetalk-dependencies/build.gradle @@ -32,26 +32,26 @@ dependencies { // Use `api` only for dependencies whose types appear in ServiceTalk API. api "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" api "com.google.api.grpc:proto-google-common-protos:$protoGoogleCommonProtosVersion" + api "com.google.code.findbugs:jsr305:$jsr305Version" api "com.google.protobuf:protobuf-java:$protobufVersion" + api "com.google.protobuf:protobuf-java-util:$protobufVersion" + api "com.sun.activation:jakarta.activation:$javaxActivationVersion" + api "com.sun.xml.bind:jaxb-core:$javaxJaxbCoreVersion" api "io.opentracing:opentracing-api:$openTracingVersion" api "io.zipkin.reporter2:zipkin-reporter:$zipkinReporterVersion" // `spi` and `core` types exposed in `log4j2-mdc-utils` api "org.apache.logging.log4j:log4j-core:$log4jVersion" api "jakarta.ws.rs:jakarta.ws.rs-api:$jaxRsVersion" + api "jakarta.xml.bind:jakarta.xml.bind-api:$javaxJaxbApiVersion" // Matchers are exposed by `servicetalk-test-resources` api "org.hamcrest:hamcrest:$hamcrestVersion" + api "org.jctools:jctools-core:$jcToolsVersion" + api "org.openjdk.jmh:jmh-core:$jmhCoreVersion" api "org.reactivestreams:reactive-streams:$reactiveStreamsVersion" - // Use `runtime` for dependencies which are used for implementation - runtime "com.google.code.findbugs:jsr305:$jsr305Version" - runtime "com.google.protobuf:protobuf-java-util:$protobufVersion" - runtime "com.sun.activation:jakarta.activation:$javaxActivationVersion" - runtime "com.sun.xml.bind:jaxb-core:$javaxJaxbCoreVersion" + api "org.slf4j:slf4j-api:$slf4jVersion" + runtime "com.sun.xml.bind:jaxb-impl:$javaxJaxbImplVersion" - runtime "jakarta.xml.bind:jakarta.xml.bind-api:$javaxJaxbApiVersion" runtime "org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion" - runtime "org.jctools:jctools-core:$jcToolsVersion" - runtime "org.openjdk.jmh:jmh-core:$jmhCoreVersion" - runtime "org.slf4j:slf4j-api:$slf4jVersion" } } diff --git a/servicetalk-dns-discovery-netty/build.gradle b/servicetalk-dns-discovery-netty/build.gradle index 4202b56bb3..f04355762b 100644 --- a/servicetalk-dns-discovery-netty/build.gradle +++ b/servicetalk-dns-discovery-netty/build.gradle @@ -17,7 +17,7 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { - implementation platform("io.netty:netty-bom:$nettyVersion") + implementation platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-client-api") @@ -29,9 +29,9 @@ dependencies { implementation project(":servicetalk-transport-netty") implementation project(":servicetalk-transport-netty-internal") implementation project(":servicetalk-utils-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" implementation "io.netty:netty-resolver-dns" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "org.slf4j:slf4j-api" runtimeOnly( group:"io.netty", name:"netty-resolver-dns-native-macos", classifier:"osx-x86_64") runtimeOnly( group:"io.netty", name:"netty-resolver-dns-native-macos", classifier:"osx-aarch_64") diff --git a/servicetalk-encoding-api-internal/build.gradle b/servicetalk-encoding-api-internal/build.gradle index bc982b07e9..eeeb8ce237 100644 --- a/servicetalk-encoding-api-internal/build.gradle +++ b/servicetalk-encoding-api-internal/build.gradle @@ -17,8 +17,9 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) api project(":servicetalk-encoding-api") implementation project(":servicetalk-annotations") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" } diff --git a/servicetalk-encoding-api/build.gradle b/servicetalk-encoding-api/build.gradle index 574825c2d4..0f3c3f114c 100644 --- a/servicetalk-encoding-api/build.gradle +++ b/servicetalk-encoding-api/build.gradle @@ -17,6 +17,7 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-buffer-api") @@ -25,8 +26,8 @@ dependencies { implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "com.google.code.findbugs:jsr305" + implementation "org.slf4j:slf4j-api" testImplementation "org.junit.jupiter:junit-jupiter-api" testImplementation "org.junit.jupiter:junit-jupiter-params" diff --git a/servicetalk-encoding-netty/build.gradle b/servicetalk-encoding-netty/build.gradle index fbf8a40e08..7c2aaa9362 100644 --- a/servicetalk-encoding-netty/build.gradle +++ b/servicetalk-encoding-netty/build.gradle @@ -17,7 +17,7 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { - implementation platform("io.netty:netty-bom:$nettyVersion") + implementation platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-encoding-api") @@ -26,8 +26,8 @@ dependencies { implementation project(":servicetalk-buffer-netty") implementation project(":servicetalk-concurrent-internal") implementation "io.netty:netty-codec" - implementation "com.google.code.findbugs:jsr305:$jsr305Version" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "com.google.code.findbugs:jsr305" + implementation "org.slf4j:slf4j-api" testImplementation testFixtures(project(":servicetalk-concurrent-internal")) testImplementation "org.junit.jupiter:junit-jupiter-api" diff --git a/servicetalk-grpc-api/build.gradle b/servicetalk-grpc-api/build.gradle index 668c2b8666..51fc22681c 100644 --- a/servicetalk-grpc-api/build.gradle +++ b/servicetalk-grpc-api/build.gradle @@ -17,6 +17,7 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + api platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-concurrent-api") @@ -35,9 +36,9 @@ dependencies { implementation project(":servicetalk-grpc-internal") implementation project(":servicetalk-oio-api-internal") implementation project(":servicetalk-serializer-utils") - implementation "org.slf4j:slf4j-api:$slf4jVersion" - implementation "com.google.code.findbugs:jsr305:$jsr305Version" - implementation "com.google.protobuf:protobuf-java:$protobufVersion" + implementation "com.google.code.findbugs:jsr305" + implementation "com.google.protobuf:protobuf-java" + implementation "org.slf4j:slf4j-api" testImplementation project(":servicetalk-test-resources") testImplementation "org.junit.jupiter:junit-jupiter-api" diff --git a/servicetalk-grpc-internal/build.gradle b/servicetalk-grpc-internal/build.gradle index 04d5ef2ece..9468afbd50 100644 --- a/servicetalk-grpc-internal/build.gradle +++ b/servicetalk-grpc-internal/build.gradle @@ -17,13 +17,14 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-http-api") implementation project(":servicetalk-annotations") implementation project(":servicetalk-utils-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" testImplementation project(":servicetalk-test-resources") testImplementation "org.junit.jupiter:junit-jupiter-api" diff --git a/servicetalk-grpc-netty/build.gradle b/servicetalk-grpc-netty/build.gradle index a550a433e0..24cf052f61 100644 --- a/servicetalk-grpc-netty/build.gradle +++ b/servicetalk-grpc-netty/build.gradle @@ -24,6 +24,7 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" apply plugin: "com.google.protobuf" dependencies { + implementation platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testImplementation enforcedPlatform("io.grpc:grpc-bom:$grpcVersion") @@ -37,9 +38,9 @@ dependencies { implementation project(":servicetalk-transport-netty-internal") implementation project(":servicetalk-utils-internal") implementation project(":servicetalk-concurrent-internal") - implementation "org.slf4j:slf4j-api:$slf4jVersion" - implementation "com.google.code.findbugs:jsr305:$jsr305Version" - implementation "com.google.protobuf:protobuf-java:$protobufVersion" + implementation "org.slf4j:slf4j-api" + implementation "com.google.code.findbugs:jsr305" + implementation "com.google.protobuf:protobuf-java" testImplementation testFixtures(project(":servicetalk-concurrent-api")) testImplementation testFixtures(project(":servicetalk-concurrent-internal")) diff --git a/servicetalk-grpc-protobuf/build.gradle b/servicetalk-grpc-protobuf/build.gradle index ccb1b68042..b3a0d618e7 100644 --- a/servicetalk-grpc-protobuf/build.gradle +++ b/servicetalk-grpc-protobuf/build.gradle @@ -26,10 +26,11 @@ apply plugin: "com.google.protobuf" ideaModule.dependsOn "generateTestProto" dependencies { + api platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-grpc-api") - api "com.google.protobuf:protobuf-java:$protobufVersion" + api "com.google.protobuf:protobuf-java" api "com.google.api.grpc:proto-google-common-protos:$protoGoogleCommonProtosVersion" implementation project(":servicetalk-annotations") @@ -37,8 +38,8 @@ dependencies { implementation project(":servicetalk-serializer-api") implementation project(":servicetalk-data-protobuf") implementation project(":servicetalk-serializer-utils") - implementation "org.slf4j:slf4j-api:$slf4jVersion" - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "org.slf4j:slf4j-api" + implementation "com.google.code.findbugs:jsr305" testImplementation project(":servicetalk-test-resources") testImplementation "org.junit.jupiter:junit-jupiter-api" diff --git a/servicetalk-grpc-protoc/build.gradle b/servicetalk-grpc-protoc/build.gradle index fbfea22680..754d88292f 100644 --- a/servicetalk-grpc-protoc/build.gradle +++ b/servicetalk-grpc-protoc/build.gradle @@ -22,6 +22,7 @@ plugins { apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") implementation project(":servicetalk-annotations") @@ -29,7 +30,7 @@ dependencies { // Needed for the generated classes api project(":servicetalk-data-protobuf") - compileOnly "com.google.code.findbugs:jsr305:$jsr305Version" + compileOnly "com.google.code.findbugs:jsr305" compileOnly "com.squareup:javapoet:$javaPoetVersion" testImplementation project(":servicetalk-grpc-api") diff --git a/servicetalk-grpc-utils/build.gradle b/servicetalk-grpc-utils/build.gradle index 3597ad6641..50c07e28b9 100644 --- a/servicetalk-grpc-utils/build.gradle +++ b/servicetalk-grpc-utils/build.gradle @@ -17,10 +17,11 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) api project(":servicetalk-grpc-api") implementation project(":servicetalk-annotations") implementation project(":servicetalk-logging-slf4j-internal") implementation project(":servicetalk-utils-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" } diff --git a/servicetalk-http-api/build.gradle b/servicetalk-http-api/build.gradle index bf4e36b147..6614ee67c2 100644 --- a/servicetalk-http-api/build.gradle +++ b/servicetalk-http-api/build.gradle @@ -17,6 +17,7 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testFixturesImplementation platform("org.junit:junit-bom:$junit5Version") @@ -39,8 +40,8 @@ dependencies { implementation project(":servicetalk-serializer-utils") implementation project(":servicetalk-utils-internal") implementation project(":servicetalk-oio-api-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "com.google.code.findbugs:jsr305" + implementation "org.slf4j:slf4j-api" testImplementation testFixtures(project(":servicetalk-concurrent-api")) testImplementation testFixtures(project(":servicetalk-concurrent-internal")) diff --git a/servicetalk-http-netty/build.gradle b/servicetalk-http-netty/build.gradle index 7aa43e8222..334e534331 100644 --- a/servicetalk-http-netty/build.gradle +++ b/servicetalk-http-netty/build.gradle @@ -17,6 +17,7 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) implementation platform("io.netty:netty-bom:$nettyVersion") testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") @@ -36,10 +37,10 @@ dependencies { implementation project(":servicetalk-transport-netty") implementation project(":servicetalk-transport-netty-internal") implementation project(":servicetalk-utils-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" implementation "io.netty:netty-codec-http" implementation "io.netty:netty-codec-http2" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "org.slf4j:slf4j-api" testImplementation testFixtures(project(":servicetalk-buffer-api")) testImplementation testFixtures(project(":servicetalk-concurrent-api")) diff --git a/servicetalk-http-router-jersey-internal/build.gradle b/servicetalk-http-router-jersey-internal/build.gradle index 982a52b21d..dc956d13bb 100644 --- a/servicetalk-http-router-jersey-internal/build.gradle +++ b/servicetalk-http-router-jersey-internal/build.gradle @@ -17,15 +17,15 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { - implementation platform("org.glassfish.jersey:jersey-bom:$jerseyVersion") + api platform(project(":servicetalk-dependencies")) api project(":servicetalk-http-api") - api "jakarta.ws.rs:jakarta.ws.rs-api:$jaxRsVersion" + api "jakarta.ws.rs:jakarta.ws.rs-api" implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent-api-internal") implementation project(":servicetalk-concurrent-internal") implementation project(":servicetalk-http-utils") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" implementation "org.glassfish.jersey.core:jersey-common" } diff --git a/servicetalk-http-router-jersey/build.gradle b/servicetalk-http-router-jersey/build.gradle index 9ea140360c..0012a162d7 100644 --- a/servicetalk-http-router-jersey/build.gradle +++ b/servicetalk-http-router-jersey/build.gradle @@ -17,14 +17,14 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { - implementation platform("org.glassfish.jersey:jersey-bom:$jerseyVersion") + api platform(project(":servicetalk-dependencies")) testFixturesImplementation platform("org.glassfish.jersey:jersey-bom:$jerseyVersion") testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testFixturesImplementation platform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-http-api") api project(":servicetalk-router-api") - api "jakarta.ws.rs:jakarta.ws.rs-api:$jaxRsVersion" + api "jakarta.ws.rs:jakarta.ws.rs-api" implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent-api-internal") @@ -33,13 +33,14 @@ dependencies { implementation project(":servicetalk-http-router-jersey-internal") implementation project(":servicetalk-http-utils") implementation project(":servicetalk-router-utils-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" - implementation "com.sun.activation:jakarta.activation:$javaxActivationVersion" - implementation "com.sun.xml.bind:jaxb-core:$javaxJaxbCoreVersion" - implementation "com.sun.xml.bind:jaxb-impl:$javaxJaxbImplVersion" - implementation "jakarta.xml.bind:jakarta.xml.bind-api:$javaxJaxbApiVersion" + implementation "com.google.code.findbugs:jsr305" + implementation "com.sun.activation:jakarta.activation" + implementation "com.sun.xml.bind:jaxb-core" + implementation "jakarta.xml.bind:jakarta.xml.bind-api" implementation "org.glassfish.jersey.core:jersey-server" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "org.slf4j:slf4j-api" + + runtimeOnly "com.sun.xml.bind:jaxb-impl" testImplementation "org.junit.jupiter:junit-jupiter-api" testImplementation "org.mockito:mockito-core:$mockitoCoreVersion" diff --git a/servicetalk-http-router-predicate/build.gradle b/servicetalk-http-router-predicate/build.gradle index 43d3258231..8911b8da0e 100644 --- a/servicetalk-http-router-predicate/build.gradle +++ b/servicetalk-http-router-predicate/build.gradle @@ -17,12 +17,13 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-http-api") implementation project(":servicetalk-annotations") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" testImplementation testFixtures(project(":servicetalk-concurrent-api")) testImplementation testFixtures(project(":servicetalk-concurrent-internal")) diff --git a/servicetalk-http-security-jersey/build.gradle b/servicetalk-http-security-jersey/build.gradle index 200a9e7304..34df9ee1af 100644 --- a/servicetalk-http-security-jersey/build.gradle +++ b/servicetalk-http-security-jersey/build.gradle @@ -17,15 +17,15 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { - implementation platform("org.glassfish.jersey:jersey-bom:$jerseyVersion") + api platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.glassfish.jersey:jersey-bom:$jerseyVersion") testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") - api "jakarta.ws.rs:jakarta.ws.rs-api:$jaxRsVersion" + api "jakarta.ws.rs:jakarta.ws.rs-api" implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent-api") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" implementation "org.glassfish.jersey.core:jersey-common" testImplementation testFixtures(project(":servicetalk-concurrent-internal")) diff --git a/servicetalk-http-utils/build.gradle b/servicetalk-http-utils/build.gradle index 92618b5dfd..a66ff6215c 100644 --- a/servicetalk-http-utils/build.gradle +++ b/servicetalk-http-utils/build.gradle @@ -17,6 +17,7 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-concurrent-api") @@ -27,8 +28,8 @@ dependencies { implementation project(":servicetalk-concurrent-internal") implementation project(":servicetalk-logging-slf4j-internal") implementation project(":servicetalk-utils-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "com.google.code.findbugs:jsr305" + implementation "org.slf4j:slf4j-api" testImplementation testFixtures(project(":servicetalk-buffer-api")) testImplementation testFixtures(project(":servicetalk-concurrent-api")) diff --git a/servicetalk-loadbalancer/build.gradle b/servicetalk-loadbalancer/build.gradle index 242fb58c13..fca35ad40c 100644 --- a/servicetalk-loadbalancer/build.gradle +++ b/servicetalk-loadbalancer/build.gradle @@ -17,6 +17,7 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-client-api") @@ -26,8 +27,8 @@ dependencies { implementation project(":servicetalk-concurrent-api-internal") implementation project(":servicetalk-concurrent-internal") implementation project(":servicetalk-client-api-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "com.google.code.findbugs:jsr305" + implementation "org.slf4j:slf4j-api" testImplementation testFixtures(project(":servicetalk-concurrent-api")) testImplementation testFixtures(project(":servicetalk-concurrent-internal")) diff --git a/servicetalk-log4j2-mdc-utils/build.gradle b/servicetalk-log4j2-mdc-utils/build.gradle index 18c2639eff..4430abbd10 100644 --- a/servicetalk-log4j2-mdc-utils/build.gradle +++ b/servicetalk-log4j2-mdc-utils/build.gradle @@ -17,14 +17,15 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + api platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") - api "org.apache.logging.log4j:log4j-core:$log4jVersion" + api "org.apache.logging.log4j:log4j-core" implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent-api") implementation project(":servicetalk-concurrent-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" testImplementation project(":servicetalk-test-resources") testImplementation "org.junit.jupiter:junit-jupiter-api" diff --git a/servicetalk-log4j2-mdc/build.gradle b/servicetalk-log4j2-mdc/build.gradle index 9a148975fe..cfdb04a164 100644 --- a/servicetalk-log4j2-mdc/build.gradle +++ b/servicetalk-log4j2-mdc/build.gradle @@ -17,11 +17,12 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") implementation project(":servicetalk-annotations") implementation project(":servicetalk-log4j2-mdc-utils") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" testImplementation "org.junit.jupiter:junit-jupiter-api" testImplementation "org.hamcrest:hamcrest:$hamcrestVersion" diff --git a/servicetalk-logging-slf4j-internal/build.gradle b/servicetalk-logging-slf4j-internal/build.gradle index 66ae7a6bd8..dd72ae81fd 100644 --- a/servicetalk-logging-slf4j-internal/build.gradle +++ b/servicetalk-logging-slf4j-internal/build.gradle @@ -17,8 +17,10 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) + api project(":servicetalk-logging-api") implementation project(":servicetalk-annotations") - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "org.slf4j:slf4j-api" } diff --git a/servicetalk-oio-api-internal/build.gradle b/servicetalk-oio-api-internal/build.gradle index f4067f637c..52ca1f4f0c 100644 --- a/servicetalk-oio-api-internal/build.gradle +++ b/servicetalk-oio-api-internal/build.gradle @@ -17,9 +17,11 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) + api project(":servicetalk-oio-api") implementation project(":servicetalk-annotations") - implementation "org.slf4j:slf4j-api:$slf4jVersion" - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "org.slf4j:slf4j-api" + implementation "com.google.code.findbugs:jsr305" } diff --git a/servicetalk-oio-api/build.gradle b/servicetalk-oio-api/build.gradle index 294c156d5c..baf0b1dbd7 100644 --- a/servicetalk-oio-api/build.gradle +++ b/servicetalk-oio-api/build.gradle @@ -17,7 +17,8 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) implementation project(":servicetalk-annotations") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" } diff --git a/servicetalk-opentracing-asynccontext/build.gradle b/servicetalk-opentracing-asynccontext/build.gradle index 465af5051e..3357b860fc 100644 --- a/servicetalk-opentracing-asynccontext/build.gradle +++ b/servicetalk-opentracing-asynccontext/build.gradle @@ -17,13 +17,14 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-opentracing-inmemory") implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent-api") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" testImplementation project(":servicetalk-test-resources") testImplementation "org.junit.jupiter:junit-jupiter-api" diff --git a/servicetalk-opentracing-http/build.gradle b/servicetalk-opentracing-http/build.gradle index 4614b51037..016ebf9280 100644 --- a/servicetalk-opentracing-http/build.gradle +++ b/servicetalk-opentracing-http/build.gradle @@ -17,18 +17,19 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + api platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-http-api") - api "io.opentracing:opentracing-api:$openTracingVersion" + api "io.opentracing:opentracing-api" implementation project(":servicetalk-annotations") implementation project(":servicetalk-http-utils") implementation project(":servicetalk-opentracing-inmemory") implementation project(":servicetalk-opentracing-inmemory-api") implementation project(":servicetalk-opentracing-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "com.google.code.findbugs:jsr305" + implementation "org.slf4j:slf4j-api" testImplementation testFixtures(project(":servicetalk-concurrent-api")) testImplementation testFixtures(project(":servicetalk-concurrent-internal")) diff --git a/servicetalk-opentracing-inmemory-api/build.gradle b/servicetalk-opentracing-inmemory-api/build.gradle index d9de542016..59ca131b35 100644 --- a/servicetalk-opentracing-inmemory-api/build.gradle +++ b/servicetalk-opentracing-inmemory-api/build.gradle @@ -17,10 +17,12 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + api platform(project(":servicetalk-dependencies")) + api "io.opentracing:opentracing-api:$openTracingVersion" implementation project(":servicetalk-annotations") implementation project(":servicetalk-opentracing-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "com.google.code.findbugs:jsr305" + implementation "org.slf4j:slf4j-api" } diff --git a/servicetalk-opentracing-inmemory/build.gradle b/servicetalk-opentracing-inmemory/build.gradle index 78d9875346..8c4bae1c54 100644 --- a/servicetalk-opentracing-inmemory/build.gradle +++ b/servicetalk-opentracing-inmemory/build.gradle @@ -17,6 +17,7 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-opentracing-inmemory-api") @@ -26,8 +27,8 @@ dependencies { implementation project(":servicetalk-buffer-api") implementation project(":servicetalk-opentracing-internal") implementation project(":servicetalk-utils-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "com.google.code.findbugs:jsr305" + implementation "org.slf4j:slf4j-api" testImplementation "org.junit.jupiter:junit-jupiter-api" testImplementation "org.mockito:mockito-core:$mockitoCoreVersion" diff --git a/servicetalk-opentracing-internal/build.gradle b/servicetalk-opentracing-internal/build.gradle index 9e500a3f79..c82647517b 100644 --- a/servicetalk-opentracing-internal/build.gradle +++ b/servicetalk-opentracing-internal/build.gradle @@ -17,7 +17,9 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) + implementation project(":servicetalk-annotations") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "com.google.code.findbugs:jsr305" + implementation "org.slf4j:slf4j-api" } diff --git a/servicetalk-opentracing-log4j2/build.gradle b/servicetalk-opentracing-log4j2/build.gradle index e8a6cb5992..7ceb58188e 100644 --- a/servicetalk-opentracing-log4j2/build.gradle +++ b/servicetalk-opentracing-log4j2/build.gradle @@ -17,6 +17,7 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-log4j2-mdc-utils") @@ -26,10 +27,9 @@ dependencies { implementation project(":servicetalk-opentracing-inmemory-api") implementation project(":servicetalk-opentracing-internal") implementation project(":servicetalk-opentracing-asynccontext") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" - implementation "org.apache.logging.log4j:log4j-api:$log4jVersion" - implementation "org.apache.logging.log4j:log4j-core:$log4jVersion" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "com.google.code.findbugs:jsr305" + implementation "org.apache.logging.log4j:log4j-core" + implementation "org.slf4j:slf4j-api" testImplementation testFixtures(project(":servicetalk-log4j2-mdc-utils")) testImplementation "org.junit.jupiter:junit-jupiter-api" diff --git a/servicetalk-opentracing-zipkin-publisher/build.gradle b/servicetalk-opentracing-zipkin-publisher/build.gradle index 5e5165308b..17b1f81edb 100644 --- a/servicetalk-opentracing-zipkin-publisher/build.gradle +++ b/servicetalk-opentracing-zipkin-publisher/build.gradle @@ -17,6 +17,7 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + api platform(project(":servicetalk-dependencies")) implementation platform("io.netty:netty-bom:$nettyVersion") testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") @@ -25,18 +26,17 @@ dependencies { api project(":servicetalk-logging-api") api project(":servicetalk-http-api") api project(":servicetalk-transport-api") - - api "io.zipkin.reporter2:zipkin-reporter:$zipkinReporterVersion" + api "io.zipkin.reporter2:zipkin-reporter" implementation project(":servicetalk-annotations") implementation project(":servicetalk-transport-netty-internal") implementation project(":servicetalk-concurrent-api-internal") implementation project(":servicetalk-concurrent-internal") implementation project(":servicetalk-logging-slf4j-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" implementation "io.netty:netty-codec" implementation "io.netty:netty-transport" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "org.slf4j:slf4j-api" testImplementation testFixtures(project(":servicetalk-concurrent-api")) testImplementation testFixtures(project(":servicetalk-concurrent-internal")) diff --git a/servicetalk-router-api/build.gradle b/servicetalk-router-api/build.gradle index 7a73b3cd28..6afe230a23 100644 --- a/servicetalk-router-api/build.gradle +++ b/servicetalk-router-api/build.gradle @@ -17,6 +17,8 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) + implementation project(":servicetalk-annotations") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" } diff --git a/servicetalk-router-utils-internal/build.gradle b/servicetalk-router-utils-internal/build.gradle index 572de2bdb3..6d5ef5e489 100644 --- a/servicetalk-router-utils-internal/build.gradle +++ b/servicetalk-router-utils-internal/build.gradle @@ -17,10 +17,11 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) + implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent-api") implementation project(":servicetalk-router-api") implementation project(":servicetalk-transport-api") - - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" } diff --git a/servicetalk-serialization-api/build.gradle b/servicetalk-serialization-api/build.gradle index e6f9526997..cd770950a3 100644 --- a/servicetalk-serialization-api/build.gradle +++ b/servicetalk-serialization-api/build.gradle @@ -17,6 +17,7 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-buffer-api") @@ -27,7 +28,7 @@ dependencies { implementation project(":servicetalk-concurrent-api-internal") implementation project(":servicetalk-concurrent-internal") implementation project(":servicetalk-utils-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" testImplementation testFixtures(project(":servicetalk-concurrent-api")) testImplementation testFixtures(project(":servicetalk-concurrent-internal")) diff --git a/servicetalk-serializer-api/build.gradle b/servicetalk-serializer-api/build.gradle index 16d60f0b59..6f9efdd0ec 100644 --- a/servicetalk-serializer-api/build.gradle +++ b/servicetalk-serializer-api/build.gradle @@ -17,6 +17,8 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) + api project(":servicetalk-buffer-api") api project(":servicetalk-concurrent-api") api project(":servicetalk-oio-api") @@ -24,5 +26,5 @@ dependencies { implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent-api-internal") implementation project(":servicetalk-oio-api-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" } diff --git a/servicetalk-serializer-utils/build.gradle b/servicetalk-serializer-utils/build.gradle index 04bcc6bc30..24172e2550 100644 --- a/servicetalk-serializer-utils/build.gradle +++ b/servicetalk-serializer-utils/build.gradle @@ -17,6 +17,7 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-serializer-api") @@ -25,7 +26,7 @@ dependencies { implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent-internal") implementation project(":servicetalk-utils-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" testImplementation testFixtures(project(":servicetalk-concurrent-api")) testImplementation testFixtures(project(":servicetalk-concurrent-internal")) diff --git a/servicetalk-tcp-netty-internal/build.gradle b/servicetalk-tcp-netty-internal/build.gradle index 7721e88e4f..45b107e7fe 100644 --- a/servicetalk-tcp-netty-internal/build.gradle +++ b/servicetalk-tcp-netty-internal/build.gradle @@ -17,6 +17,8 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) + testImplementation enforcedPlatform("io.netty:netty-bom:$nettyVersion") testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testFixturesImplementation platform("io.netty:netty-bom:$nettyVersion") @@ -32,8 +34,8 @@ dependencies { implementation project(":servicetalk-concurrent-internal") implementation project(":servicetalk-logging-slf4j-internal") implementation project(":servicetalk-transport-netty") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "com.google.code.findbugs:jsr305" + implementation "org.slf4j:slf4j-api" testImplementation testFixtures(project(":servicetalk-concurrent-api")) testImplementation testFixtures(project(":servicetalk-concurrent-internal")) diff --git a/servicetalk-test-resources/build.gradle b/servicetalk-test-resources/build.gradle index 1130ac62a1..604c363fa7 100644 --- a/servicetalk-test-resources/build.gradle +++ b/servicetalk-test-resources/build.gradle @@ -17,15 +17,16 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + api platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") implementation project(":servicetalk-annotations") implementation project(":servicetalk-utils-internal") - api "org.hamcrest:hamcrest:$hamcrestVersion" + api "org.hamcrest:hamcrest" - implementation "org.apache.logging.log4j:log4j-core:$log4jVersion" - implementation "org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion" + implementation "org.apache.logging.log4j:log4j-core" + runtimeOnly "org.apache.logging.log4j:log4j-slf4j-impl" testImplementation "org.junit.jupiter:junit-jupiter-api" } diff --git a/servicetalk-transport-api/build.gradle b/servicetalk-transport-api/build.gradle index 3c356805d7..7a76b38573 100644 --- a/servicetalk-transport-api/build.gradle +++ b/servicetalk-transport-api/build.gradle @@ -17,6 +17,7 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") api project(":servicetalk-buffer-api") @@ -25,8 +26,8 @@ dependencies { implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent-internal") implementation project(":servicetalk-utils-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "com.google.code.findbugs:jsr305" + implementation "org.slf4j:slf4j-api" testImplementation testFixtures(project(":servicetalk-concurrent-api")) testImplementation testFixtures(project(":servicetalk-concurrent-internal")) diff --git a/servicetalk-transport-netty-internal/build.gradle b/servicetalk-transport-netty-internal/build.gradle index 39ef0cd5de..b1a109c789 100644 --- a/servicetalk-transport-netty-internal/build.gradle +++ b/servicetalk-transport-netty-internal/build.gradle @@ -17,7 +17,7 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { - api platform("io.netty:netty-bom:$nettyVersion") + api platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testFixturesImplementation platform("org.junit:junit-bom:$junit5Version") @@ -32,7 +32,7 @@ dependencies { implementation project(":servicetalk-concurrent-internal") implementation project(":servicetalk-logging-slf4j-internal") implementation project(":servicetalk-utils-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" implementation "io.netty:netty-transport-native-epoll" runtimeOnly( group:"io.netty", name:"netty-transport-native-epoll", classifier:"linux-x86_64") runtimeOnly( group:"io.netty", name:"netty-transport-native-epoll", classifier:"linux-aarch_64") @@ -46,7 +46,7 @@ dependencies { runtimeOnly( group:"io.netty", name:"netty-tcnative-boringssl-static", classifier:"linux-aarch_64") runtimeOnly( group:"io.netty", name:"netty-tcnative-boringssl-static", classifier:"osx-x86_64") runtimeOnly( group:"io.netty", name:"netty-tcnative-boringssl-static", classifier:"osx-aarch_64") - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "org.slf4j:slf4j-api" testImplementation testFixtures(project(":servicetalk-concurrent-api")) testImplementation testFixtures(project(":servicetalk-concurrent-internal")) diff --git a/servicetalk-transport-netty/build.gradle b/servicetalk-transport-netty/build.gradle index 8b09819b43..d1062349e3 100644 --- a/servicetalk-transport-netty/build.gradle +++ b/servicetalk-transport-netty/build.gradle @@ -17,7 +17,7 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { - implementation platform("io.netty:netty-bom:$nettyVersion") + implementation platform(project(":servicetalk-dependencies")) api project(":servicetalk-concurrent-api") api project(":servicetalk-transport-api") @@ -25,6 +25,6 @@ dependencies { implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent-internal") implementation project(":servicetalk-transport-netty-internal") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" + implementation "com.google.code.findbugs:jsr305" implementation "io.netty:netty-common" } diff --git a/servicetalk-utils-internal/build.gradle b/servicetalk-utils-internal/build.gradle index 4ef1ae5ec0..f8454eaa8f 100644 --- a/servicetalk-utils-internal/build.gradle +++ b/servicetalk-utils-internal/build.gradle @@ -17,13 +17,14 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { + implementation platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") implementation project(":servicetalk-annotations") implementation project(":servicetalk-buffer-api") - implementation "com.google.code.findbugs:jsr305:$jsr305Version" - implementation "org.jctools:jctools-core:$jcToolsVersion" - implementation "org.slf4j:slf4j-api:$slf4jVersion" + implementation "com.google.code.findbugs:jsr305" + implementation "org.jctools:jctools-core" + implementation "org.slf4j:slf4j-api" testImplementation "org.junit.jupiter:junit-jupiter-api" testImplementation "org.hamcrest:hamcrest:$hamcrestVersion" From 9d462ad6a71c66a8a0a0c272ef7f8a8390285467 Mon Sep 17 00:00:00 2001 From: Mike Duigou Date: Mon, 16 May 2022 17:55:44 -0700 Subject: [PATCH 2/5] fix dependency isuses around log4j and slf4j in log4j2 mdc utils --- servicetalk-dependencies/build.gradle | 4 ++-- servicetalk-log4j2-mdc-utils/build.gradle | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/servicetalk-dependencies/build.gradle b/servicetalk-dependencies/build.gradle index 1d392a3d2a..2960addec4 100644 --- a/servicetalk-dependencies/build.gradle +++ b/servicetalk-dependencies/build.gradle @@ -29,7 +29,6 @@ dependencies { api platform("org.glassfish.jersey:jersey-bom:$jerseyVersion") constraints { - // Use `api` only for dependencies whose types appear in ServiceTalk API. api "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" api "com.google.api.grpc:proto-google-common-protos:$protoGoogleCommonProtosVersion" api "com.google.code.findbugs:jsr305:$jsr305Version" @@ -39,7 +38,7 @@ dependencies { api "com.sun.xml.bind:jaxb-core:$javaxJaxbCoreVersion" api "io.opentracing:opentracing-api:$openTracingVersion" api "io.zipkin.reporter2:zipkin-reporter:$zipkinReporterVersion" - // `spi` and `core` types exposed in `log4j2-mdc-utils` + api "org.apache.logging.log4j:log4j-api:$log4jVersion" api "org.apache.logging.log4j:log4j-core:$log4jVersion" api "jakarta.ws.rs:jakarta.ws.rs-api:$jaxRsVersion" api "jakarta.xml.bind:jakarta.xml.bind-api:$javaxJaxbApiVersion" @@ -50,6 +49,7 @@ dependencies { api "org.reactivestreams:reactive-streams:$reactiveStreamsVersion" api "org.slf4j:slf4j-api:$slf4jVersion" + // Use `runtime` for dependencies which are used ONLY at runtime runtime "com.sun.xml.bind:jaxb-impl:$javaxJaxbImplVersion" runtime "org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion" } diff --git a/servicetalk-log4j2-mdc-utils/build.gradle b/servicetalk-log4j2-mdc-utils/build.gradle index 4430abbd10..b081399464 100644 --- a/servicetalk-log4j2-mdc-utils/build.gradle +++ b/servicetalk-log4j2-mdc-utils/build.gradle @@ -19,22 +19,26 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { api platform(project(":servicetalk-dependencies")) testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") + testFixturesImplementation enforcedPlatform(project(":servicetalk-dependencies")) - api "org.apache.logging.log4j:log4j-core" + api "org.apache.logging.log4j:log4j-api" implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent-api") implementation project(":servicetalk-concurrent-internal") implementation "com.google.code.findbugs:jsr305" + implementation "org.apache.logging.log4j:log4j-core" testImplementation project(":servicetalk-test-resources") testImplementation "org.junit.jupiter:junit-jupiter-api" testImplementation "org.slf4j:slf4j-api:$slf4jVersion" testImplementation "org.hamcrest:hamcrest:$hamcrestVersion" - testFixturesImplementation "com.google.code.findbugs:jsr305:$jsr305Version" - testFixturesImplementation "org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion" - testFixturesImplementation "org.hamcrest:hamcrest:$hamcrestVersion" + testFixturesImplementation "com.google.code.findbugs:jsr305" + testFixturesImplementation "org.apache.logging.log4j:log4j-core" + testFixturesImplementation "org.hamcrest:hamcrest" + testFixturesImplementation "org.slf4j:slf4j-api:$slf4jVersion" + testFixturesRuntimeOnly "org.apache.logging.log4j:log4j-slf4j-impl" } test { From fe12a0e43bbd5f83d33a6a35694802b04029a889 Mon Sep 17 00:00:00 2001 From: Mike Duigou Date: Tue, 17 May 2022 11:02:25 -0700 Subject: [PATCH 3/5] use jackson bom version which matches jackson-databind version we want --- servicetalk-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servicetalk-dependencies/build.gradle b/servicetalk-dependencies/build.gradle index 290cedcb9e..fc8b8f130e 100644 --- a/servicetalk-dependencies/build.gradle +++ b/servicetalk-dependencies/build.gradle @@ -26,7 +26,7 @@ javaPlatform { dependencies { api platform(project(":servicetalk-bom")) api platform("io.netty:netty-bom:${nettyVersion}") - api platform("com.fasterxml.jackson:jackson-bom:${jacksonVersion}") + api platform("com.fasterxml.jackson:jackson-bom:2.13.2.20220328") api platform("com.google.protobuf:protobuf-bom:${protobufVersion}") api platform("org.apache.logging.log4j:log4j-bom:${log4jVersion}") api platform("org.glassfish.jersey:jersey-bom:${jerseyVersion}") From 613f881148bbef860bc28f74f4959fd55c259081 Mon Sep 17 00:00:00 2001 From: Mike Duigou Date: Tue, 17 May 2022 15:16:50 -0700 Subject: [PATCH 4/5] remove jackson-bom and narrow use of log4j dependencies --- servicetalk-dependencies/build.gradle | 3 ++- servicetalk-http-netty/build.gradle | 1 + servicetalk-loadbalancer/build.gradle | 1 + servicetalk-test-resources/build.gradle | 3 --- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/servicetalk-dependencies/build.gradle b/servicetalk-dependencies/build.gradle index fc8b8f130e..141d12cba6 100644 --- a/servicetalk-dependencies/build.gradle +++ b/servicetalk-dependencies/build.gradle @@ -26,12 +26,13 @@ javaPlatform { dependencies { api platform(project(":servicetalk-bom")) api platform("io.netty:netty-bom:${nettyVersion}") - api platform("com.fasterxml.jackson:jackson-bom:2.13.2.20220328") api platform("com.google.protobuf:protobuf-bom:${protobufVersion}") api platform("org.apache.logging.log4j:log4j-bom:${log4jVersion}") api platform("org.glassfish.jersey:jersey-bom:${jerseyVersion}") constraints { + // We don't use the jackson-bom because we want to target specifically jackson-databind + api "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" api "com.google.api.grpc:proto-google-common-protos:$protoGoogleCommonProtosVersion" api "com.google.code.findbugs:jsr305:$jsr305Version" api "com.sun.activation:jakarta.activation:$javaxActivationVersion" diff --git a/servicetalk-http-netty/build.gradle b/servicetalk-http-netty/build.gradle index 334e534331..4021f2b881 100644 --- a/servicetalk-http-netty/build.gradle +++ b/servicetalk-http-netty/build.gradle @@ -69,4 +69,5 @@ dependencies { testFixturesImplementation project(":servicetalk-http-utils") testFixturesImplementation project(":servicetalk-test-resources") testFixturesImplementation "org.hamcrest:hamcrest:$hamcrestVersion" + testFixturesRuntimeOnly "org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion" } diff --git a/servicetalk-loadbalancer/build.gradle b/servicetalk-loadbalancer/build.gradle index fca35ad40c..049cd6b6b4 100644 --- a/servicetalk-loadbalancer/build.gradle +++ b/servicetalk-loadbalancer/build.gradle @@ -35,6 +35,7 @@ dependencies { testImplementation project(":servicetalk-concurrent-test-internal") testImplementation project(":servicetalk-test-resources") testImplementation "org.junit.jupiter:junit-jupiter-api" + testImplementation "org.apache.logging.log4j:log4j-core" testImplementation "org.hamcrest:hamcrest:$hamcrestVersion" testImplementation "org.mockito:mockito-core:$mockitoCoreVersion" } diff --git a/servicetalk-test-resources/build.gradle b/servicetalk-test-resources/build.gradle index 604c363fa7..67e045dff9 100644 --- a/servicetalk-test-resources/build.gradle +++ b/servicetalk-test-resources/build.gradle @@ -25,8 +25,5 @@ dependencies { api "org.hamcrest:hamcrest" - implementation "org.apache.logging.log4j:log4j-core" - runtimeOnly "org.apache.logging.log4j:log4j-slf4j-impl" - testImplementation "org.junit.jupiter:junit-jupiter-api" } From a18ff807df779c355fac47f3e9b27a6d8307d542 Mon Sep 17 00:00:00 2001 From: Mike Duigou Date: Tue, 17 May 2022 15:22:30 -0700 Subject: [PATCH 5/5] narrow use of log4j-slf4j-impl --- servicetalk-opentracing-http/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servicetalk-opentracing-http/build.gradle b/servicetalk-opentracing-http/build.gradle index 016ebf9280..31372283c5 100644 --- a/servicetalk-opentracing-http/build.gradle +++ b/servicetalk-opentracing-http/build.gradle @@ -42,10 +42,10 @@ dependencies { testImplementation project(":servicetalk-opentracing-asynccontext") testImplementation project(":servicetalk-test-resources") testImplementation project(":servicetalk-opentracing-log4j2") - testImplementation "org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion" testImplementation "org.apache.logging.log4j:log4j-core:$log4jVersion" testImplementation "org.hamcrest:hamcrest:$hamcrestVersion" testImplementation "org.junit.jupiter:junit-jupiter-api" testImplementation "org.mockito:mockito-core:$mockitoCoreVersion" testImplementation "org.mockito:mockito-junit-jupiter:$mockitoCoreVersion" + testRuntimeOnly "org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion" }