diff --git a/servicetalk-buffer-netty/build.gradle b/servicetalk-buffer-netty/build.gradle index 9ef794f5c7..dc7025d5ec 100644 --- a/servicetalk-buffer-netty/build.gradle +++ b/servicetalk-buffer-netty/build.gradle @@ -24,7 +24,6 @@ dependencies { implementation project(":servicetalk-annotations") implementation project(":servicetalk-utils-internal") implementation "io.netty:netty-common" - implementation "org.slf4j:slf4j-api:$slf4jVersion" testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testImplementation project(":servicetalk-test-resources") diff --git a/servicetalk-concurrent-api-test/build.gradle b/servicetalk-concurrent-api-test/build.gradle index e4a5cd3b33..ed38425881 100644 --- a/servicetalk-concurrent-api-test/build.gradle +++ b/servicetalk-concurrent-api-test/build.gradle @@ -22,7 +22,6 @@ dependencies { implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent-internal") - implementation project(":servicetalk-concurrent-test-internal") implementation project(":servicetalk-utils-internal") testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") diff --git a/servicetalk-concurrent-jdkflow/build.gradle b/servicetalk-concurrent-jdkflow/build.gradle index 46af575a87..926e6911e6 100644 --- a/servicetalk-concurrent-jdkflow/build.gradle +++ b/servicetalk-concurrent-jdkflow/build.gradle @@ -41,7 +41,6 @@ dependencies { api project(":servicetalk-concurrent-api") implementation project(":servicetalk-annotations") - implementation "org.slf4j:slf4j-api:$slf4jVersion" testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testImplementation testFixtures(project(":servicetalk-concurrent-api")) diff --git a/servicetalk-concurrent-jdkflow/gradle.lockfile b/servicetalk-concurrent-jdkflow/gradle.lockfile index 43922146ee..48311cc124 100644 --- a/servicetalk-concurrent-jdkflow/gradle.lockfile +++ b/servicetalk-concurrent-jdkflow/gradle.lockfile @@ -3,5 +3,5 @@ # This file is expected to be part of source control. com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath org.jctools:jctools-core:4.0.3=runtimeClasspath -org.slf4j:slf4j-api:1.7.36=compileClasspath,runtimeClasspath +org.slf4j:slf4j-api:1.7.36=runtimeClasspath empty=annotationProcessor,jmhCompileClasspath,jmhRuntimeClasspath,spotbugsPlugins,testAnnotationProcessor diff --git a/servicetalk-concurrent-reactivestreams/build.gradle b/servicetalk-concurrent-reactivestreams/build.gradle index 45ca436794..05dd257bb4 100644 --- a/servicetalk-concurrent-reactivestreams/build.gradle +++ b/servicetalk-concurrent-reactivestreams/build.gradle @@ -35,15 +35,14 @@ dependencies { api "org.reactivestreams:reactive-streams:$reactiveStreamsVersion" implementation project(":servicetalk-annotations") - implementation project(":servicetalk-serializer-utils") - implementation project(":servicetalk-buffer-netty") - implementation "org.slf4j:slf4j-api:$slf4jVersion" testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testImplementation testFixtures(project(":servicetalk-concurrent-api")) testImplementation testFixtures(project(":servicetalk-concurrent-internal")) testImplementation project(":servicetalk-buffer-api") + testImplementation project(":servicetalk-buffer-netty") testImplementation project(":servicetalk-serializer-api") + testImplementation project(":servicetalk-serializer-utils") testImplementation project(":servicetalk-test-resources") testImplementation "org.junit.jupiter:junit-jupiter-api" testImplementation "org.mockito:mockito-core:$mockitoCoreVersion" diff --git a/servicetalk-concurrent-reactivestreams/gradle.lockfile b/servicetalk-concurrent-reactivestreams/gradle.lockfile index 1ce29ab077..17faed57a1 100644 --- a/servicetalk-concurrent-reactivestreams/gradle.lockfile +++ b/servicetalk-concurrent-reactivestreams/gradle.lockfile @@ -2,10 +2,7 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath -io.netty:netty-bom:4.1.116.Final=compileClasspath,runtimeClasspath -io.netty:netty-buffer:4.1.116.Final=compileClasspath,runtimeClasspath -io.netty:netty-common:4.1.116.Final=compileClasspath,runtimeClasspath org.jctools:jctools-core:4.0.3=runtimeClasspath org.reactivestreams:reactive-streams:1.0.4=compileClasspath,runtimeClasspath -org.slf4j:slf4j-api:1.7.36=compileClasspath,runtimeClasspath +org.slf4j:slf4j-api:1.7.36=runtimeClasspath empty=annotationProcessor,jmhCompileClasspath,jmhRuntimeClasspath,spotbugsPlugins,testAnnotationProcessor,testFixturesAnnotationProcessor diff --git a/servicetalk-data-jackson-jersey/build.gradle b/servicetalk-data-jackson-jersey/build.gradle index 36e16dac60..579d34441b 100644 --- a/servicetalk-data-jackson-jersey/build.gradle +++ b/servicetalk-data-jackson-jersey/build.gradle @@ -33,26 +33,24 @@ dependencies { implementation project(":servicetalk-annotations") implementation project(":servicetalk-buffer-api") - implementation project(":servicetalk-buffer-netty") implementation project(":servicetalk-concurrent-api") - implementation project(":servicetalk-concurrent-api-internal") implementation project(":servicetalk-concurrent-internal") - implementation project(":servicetalk-http-api") - implementation project(":servicetalk-http-router-jersey") implementation project(":servicetalk-http-router-jersey-internal") - implementation project(":servicetalk-http-utils") implementation project(":servicetalk-serialization-api") implementation project(":servicetalk-serializer-api") implementation project(":servicetalk-transport-api") - implementation project(":servicetalk-transport-netty") implementation "com.fasterxml.jackson.core:jackson-core" implementation "org.glassfish.hk2.external:jakarta.inject:$actualJavaxInjectVersion" implementation "org.glassfish.jersey.core:jersey-server" implementation "org.slf4j:slf4j-api:$slf4jVersion" + runtimeOnly project(":servicetalk-http-router-jersey") + testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testImplementation testFixtures(project(":servicetalk-concurrent-internal")) testImplementation testFixtures(project(":servicetalk-http-router-jersey")) + testImplementation project(":servicetalk-buffer-netty") + testImplementation project(":servicetalk-http-api") testImplementation project(":servicetalk-test-resources") testImplementation "org.junit.jupiter:junit-jupiter-api" testImplementation "org.junit.jupiter:junit-jupiter-params" diff --git a/servicetalk-data-jackson-jersey/gradle.lockfile b/servicetalk-data-jackson-jersey/gradle.lockfile index fb462da9ba..3edb5d6872 100644 --- a/servicetalk-data-jackson-jersey/gradle.lockfile +++ b/servicetalk-data-jackson-jersey/gradle.lockfile @@ -9,22 +9,6 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath com.sun.activation:jakarta.activation:1.2.2=runtimeClasspath com.sun.xml.bind:jaxb-core:2.3.0.1=runtimeClasspath com.sun.xml.bind:jaxb-impl:2.3.3=runtimeClasspath -io.netty.incubator:netty-incubator-transport-classes-io_uring:0.0.26.Final=runtimeClasspath -io.netty.incubator:netty-incubator-transport-native-io_uring:0.0.26.Final=runtimeClasspath -io.netty:netty-bom:4.1.116.Final=compileClasspath,runtimeClasspath -io.netty:netty-buffer:4.1.116.Final=compileClasspath,runtimeClasspath -io.netty:netty-codec:4.1.116.Final=runtimeClasspath -io.netty:netty-common:4.1.116.Final=compileClasspath,runtimeClasspath -io.netty:netty-handler:4.1.116.Final=runtimeClasspath -io.netty:netty-resolver:4.1.116.Final=runtimeClasspath -io.netty:netty-tcnative-boringssl-static:2.0.69.Final=runtimeClasspath -io.netty:netty-tcnative-classes:2.0.69.Final=runtimeClasspath -io.netty:netty-transport-classes-epoll:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-classes-kqueue:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-native-epoll:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-native-kqueue:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-native-unix-common:4.1.116.Final=runtimeClasspath -io.netty:netty-transport:4.1.116.Final=runtimeClasspath jakarta.activation:jakarta.activation-api:1.2.2=runtimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,runtimeClasspath jakarta.validation:jakarta.validation-api:2.0.2=compileClasspath,runtimeClasspath diff --git a/servicetalk-data-jackson-jersey3-jakarta10/build.gradle b/servicetalk-data-jackson-jersey3-jakarta10/build.gradle index 2653d614e1..219c14f522 100644 --- a/servicetalk-data-jackson-jersey3-jakarta10/build.gradle +++ b/servicetalk-data-jackson-jersey3-jakarta10/build.gradle @@ -93,26 +93,24 @@ dependencies { implementation project(":servicetalk-annotations") implementation project(":servicetalk-buffer-api") - implementation project(":servicetalk-buffer-netty") implementation project(":servicetalk-concurrent-api") - implementation project(":servicetalk-concurrent-api-internal") implementation project(":servicetalk-concurrent-internal") - implementation project(":servicetalk-http-api") - implementation project(":servicetalk-http-router-jersey3-jakarta10") implementation project(":servicetalk-http-router-jersey3-jakarta10-internal") - implementation project(":servicetalk-http-utils") implementation project(":servicetalk-serialization-api") implementation project(":servicetalk-serializer-api") implementation project(":servicetalk-transport-api") - implementation project(":servicetalk-transport-netty") implementation "com.fasterxml.jackson.core:jackson-core" implementation "jakarta.inject:jakarta.inject-api:$actualJavaxInjectVersion" implementation "org.glassfish.jersey.core:jersey-server" implementation "org.slf4j:slf4j-api:$slf4jVersion" + runtimeOnly project(":servicetalk-http-router-jersey3-jakarta10") + testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testImplementation testFixtures(project(":servicetalk-concurrent-internal")) testImplementation testFixtures(project(":servicetalk-http-router-jersey3-jakarta10")) + testImplementation project(":servicetalk-buffer-netty") + testImplementation project(":servicetalk-http-api") testImplementation project(":servicetalk-test-resources") testImplementation "org.junit.jupiter:junit-jupiter-api" testImplementation "org.junit.jupiter:junit-jupiter-params" diff --git a/servicetalk-data-jackson-jersey3-jakarta10/gradle.lockfile b/servicetalk-data-jackson-jersey3-jakarta10/gradle.lockfile index 37a546c717..913ef05290 100644 --- a/servicetalk-data-jackson-jersey3-jakarta10/gradle.lockfile +++ b/servicetalk-data-jackson-jersey3-jakarta10/gradle.lockfile @@ -7,22 +7,6 @@ com.fasterxml.jackson.core:jackson-databind:2.16.2=compileClasspath,runtimeClass com.fasterxml.jackson:jackson-bom:2.16.2=compileClasspath,runtimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath com.sun.istack:istack-commons-runtime:4.1.2=runtimeClasspath -io.netty.incubator:netty-incubator-transport-classes-io_uring:0.0.26.Final=runtimeClasspath -io.netty.incubator:netty-incubator-transport-native-io_uring:0.0.26.Final=runtimeClasspath -io.netty:netty-bom:4.1.116.Final=compileClasspath,runtimeClasspath -io.netty:netty-buffer:4.1.116.Final=compileClasspath,runtimeClasspath -io.netty:netty-codec:4.1.116.Final=runtimeClasspath -io.netty:netty-common:4.1.116.Final=compileClasspath,runtimeClasspath -io.netty:netty-handler:4.1.116.Final=runtimeClasspath -io.netty:netty-resolver:4.1.116.Final=runtimeClasspath -io.netty:netty-tcnative-boringssl-static:2.0.69.Final=runtimeClasspath -io.netty:netty-tcnative-classes:2.0.69.Final=runtimeClasspath -io.netty:netty-transport-classes-epoll:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-classes-kqueue:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-native-epoll:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-native-kqueue:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-native-unix-common:4.1.116.Final=runtimeClasspath -io.netty:netty-transport:4.1.116.Final=runtimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=runtimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=compileClasspath,runtimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath diff --git a/servicetalk-data-jackson-jersey3-jakarta9/build.gradle b/servicetalk-data-jackson-jersey3-jakarta9/build.gradle index 0cd7fa1417..edba1c1382 100644 --- a/servicetalk-data-jackson-jersey3-jakarta9/build.gradle +++ b/servicetalk-data-jackson-jersey3-jakarta9/build.gradle @@ -93,26 +93,24 @@ dependencies { implementation project(":servicetalk-annotations") implementation project(":servicetalk-buffer-api") - implementation project(":servicetalk-buffer-netty") implementation project(":servicetalk-concurrent-api") - implementation project(":servicetalk-concurrent-api-internal") implementation project(":servicetalk-concurrent-internal") - implementation project(":servicetalk-http-api") - implementation project(":servicetalk-http-router-jersey3-jakarta9") implementation project(":servicetalk-http-router-jersey3-jakarta9-internal") - implementation project(":servicetalk-http-utils") implementation project(":servicetalk-serialization-api") implementation project(":servicetalk-serializer-api") implementation project(":servicetalk-transport-api") - implementation project(":servicetalk-transport-netty") implementation "com.fasterxml.jackson.core:jackson-core" implementation "jakarta.inject:jakarta.inject-api:$actualJavaxInjectVersion" implementation "org.glassfish.jersey.core:jersey-server" implementation "org.slf4j:slf4j-api:$slf4jVersion" + runtimeOnly project(":servicetalk-http-router-jersey3-jakarta9") + testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testImplementation testFixtures(project(":servicetalk-concurrent-internal")) testImplementation testFixtures(project(":servicetalk-http-router-jersey3-jakarta9")) + testImplementation project(":servicetalk-buffer-netty") + testImplementation project(":servicetalk-http-api") testImplementation project(":servicetalk-test-resources") testImplementation "org.junit.jupiter:junit-jupiter-api" testImplementation "org.junit.jupiter:junit-jupiter-params" diff --git a/servicetalk-data-jackson-jersey3-jakarta9/gradle.lockfile b/servicetalk-data-jackson-jersey3-jakarta9/gradle.lockfile index 12cc76be76..94f560c4ed 100644 --- a/servicetalk-data-jackson-jersey3-jakarta9/gradle.lockfile +++ b/servicetalk-data-jackson-jersey3-jakarta9/gradle.lockfile @@ -8,22 +8,6 @@ com.fasterxml.jackson:jackson-bom:2.16.2=compileClasspath,runtimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath com.sun.activation:jakarta.activation:2.0.1=runtimeClasspath com.sun.istack:istack-commons-runtime:4.0.1=runtimeClasspath -io.netty.incubator:netty-incubator-transport-classes-io_uring:0.0.26.Final=runtimeClasspath -io.netty.incubator:netty-incubator-transport-native-io_uring:0.0.26.Final=runtimeClasspath -io.netty:netty-bom:4.1.116.Final=compileClasspath,runtimeClasspath -io.netty:netty-buffer:4.1.116.Final=compileClasspath,runtimeClasspath -io.netty:netty-codec:4.1.116.Final=runtimeClasspath -io.netty:netty-common:4.1.116.Final=compileClasspath,runtimeClasspath -io.netty:netty-handler:4.1.116.Final=runtimeClasspath -io.netty:netty-resolver:4.1.116.Final=runtimeClasspath -io.netty:netty-tcnative-boringssl-static:2.0.69.Final=runtimeClasspath -io.netty:netty-tcnative-classes:2.0.69.Final=runtimeClasspath -io.netty:netty-transport-classes-epoll:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-classes-kqueue:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-native-epoll:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-native-kqueue:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-native-unix-common:4.1.116.Final=runtimeClasspath -io.netty:netty-transport:4.1.116.Final=runtimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=compileClasspath,runtimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=compileClasspath,runtimeClasspath diff --git a/servicetalk-data-jackson/build.gradle b/servicetalk-data-jackson/build.gradle index 6bc3423d18..f1c4bb525d 100644 --- a/servicetalk-data-jackson/build.gradle +++ b/servicetalk-data-jackson/build.gradle @@ -27,10 +27,8 @@ dependencies { implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent") implementation project(":servicetalk-concurrent-api") - implementation project(":servicetalk-concurrent-api-internal") implementation project(":servicetalk-concurrent-internal") implementation project(":servicetalk-utils-internal") - implementation "org.slf4j:slf4j-api:$slf4jVersion" testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testImplementation project(":servicetalk-test-resources") diff --git a/servicetalk-data-protobuf-jersey/build.gradle b/servicetalk-data-protobuf-jersey/build.gradle index e51c202604..e54f17a337 100644 --- a/servicetalk-data-protobuf-jersey/build.gradle +++ b/servicetalk-data-protobuf-jersey/build.gradle @@ -38,23 +38,20 @@ dependencies { implementation platform("com.google.protobuf:protobuf-bom:$protobufVersion") implementation project(":servicetalk-annotations") implementation project(":servicetalk-buffer-api") - implementation project(":servicetalk-buffer-netty") implementation project(":servicetalk-concurrent-api") - implementation project(":servicetalk-concurrent-api-internal") implementation project(":servicetalk-concurrent-internal") implementation project(":servicetalk-data-protobuf") implementation project(":servicetalk-http-api") - implementation project(":servicetalk-http-router-jersey") implementation project(":servicetalk-http-router-jersey-internal") - implementation project(":servicetalk-http-utils") implementation project(":servicetalk-serializer-api") implementation project(":servicetalk-transport-api") - implementation project(":servicetalk-transport-netty") implementation "com.google.protobuf:protobuf-java" implementation "org.glassfish.hk2.external:jakarta.inject:$actualJavaxInjectVersion" implementation "org.glassfish.jersey.core:jersey-server" implementation "org.slf4j:slf4j-api:$slf4jVersion" + runtimeOnly project(":servicetalk-http-router-jersey") + testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testImplementation testFixtures(project(":servicetalk-concurrent-internal")) testImplementation testFixtures(project(":servicetalk-http-router-jersey")) diff --git a/servicetalk-data-protobuf-jersey/gradle.lockfile b/servicetalk-data-protobuf-jersey/gradle.lockfile index ff49602de4..655e5e4b4b 100644 --- a/servicetalk-data-protobuf-jersey/gradle.lockfile +++ b/servicetalk-data-protobuf-jersey/gradle.lockfile @@ -1,32 +1,12 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -com.fasterxml.jackson.core:jackson-annotations:2.16.2=runtimeClasspath -com.fasterxml.jackson.core:jackson-core:2.16.2=runtimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.16.2=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.16.2=runtimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath com.google.protobuf:protobuf-bom:3.25.3=compileClasspath,runtimeClasspath com.google.protobuf:protobuf-java:3.25.3=compileClasspath,runtimeClasspath com.sun.activation:jakarta.activation:1.2.2=runtimeClasspath com.sun.xml.bind:jaxb-core:2.3.0.1=runtimeClasspath com.sun.xml.bind:jaxb-impl:2.3.3=runtimeClasspath -io.netty.incubator:netty-incubator-transport-classes-io_uring:0.0.26.Final=runtimeClasspath -io.netty.incubator:netty-incubator-transport-native-io_uring:0.0.26.Final=runtimeClasspath -io.netty:netty-bom:4.1.116.Final=compileClasspath,runtimeClasspath -io.netty:netty-buffer:4.1.116.Final=compileClasspath,runtimeClasspath -io.netty:netty-codec:4.1.116.Final=runtimeClasspath -io.netty:netty-common:4.1.116.Final=compileClasspath,runtimeClasspath -io.netty:netty-handler:4.1.116.Final=runtimeClasspath -io.netty:netty-resolver:4.1.116.Final=runtimeClasspath -io.netty:netty-tcnative-boringssl-static:2.0.69.Final=runtimeClasspath -io.netty:netty-tcnative-classes:2.0.69.Final=runtimeClasspath -io.netty:netty-transport-classes-epoll:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-classes-kqueue:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-native-epoll:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-native-kqueue:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-native-unix-common:4.1.116.Final=runtimeClasspath -io.netty:netty-transport:4.1.116.Final=runtimeClasspath jakarta.activation:jakarta.activation-api:1.2.2=runtimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,runtimeClasspath jakarta.validation:jakarta.validation-api:2.0.2=compileClasspath,runtimeClasspath diff --git a/servicetalk-data-protobuf-jersey3-jakarta10/build.gradle b/servicetalk-data-protobuf-jersey3-jakarta10/build.gradle index 7d4d81ba68..30e80d9e90 100644 --- a/servicetalk-data-protobuf-jersey3-jakarta10/build.gradle +++ b/servicetalk-data-protobuf-jersey3-jakarta10/build.gradle @@ -99,23 +99,20 @@ dependencies { implementation platform("com.google.protobuf:protobuf-bom:$protobufVersion") implementation project(":servicetalk-annotations") implementation project(":servicetalk-buffer-api") - implementation project(":servicetalk-buffer-netty") implementation project(":servicetalk-concurrent-api") - implementation project(":servicetalk-concurrent-api-internal") implementation project(":servicetalk-concurrent-internal") implementation project(":servicetalk-data-protobuf") implementation project(":servicetalk-http-api") - implementation project(":servicetalk-http-router-jersey3-jakarta10") implementation project(":servicetalk-http-router-jersey3-jakarta10-internal") - implementation project(":servicetalk-http-utils") implementation project(":servicetalk-serializer-api") implementation project(":servicetalk-transport-api") - implementation project(":servicetalk-transport-netty") implementation "com.google.protobuf:protobuf-java" implementation "jakarta.inject:jakarta.inject-api:$actualJavaxInjectVersion" implementation "org.glassfish.jersey.core:jersey-server" implementation "org.slf4j:slf4j-api:$slf4jVersion" + runtimeOnly project(":servicetalk-http-router-jersey3-jakarta10") + testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testImplementation testFixtures(project(":servicetalk-concurrent-internal")) testImplementation testFixtures(project(":servicetalk-http-router-jersey3-jakarta10")) diff --git a/servicetalk-data-protobuf-jersey3-jakarta10/gradle.lockfile b/servicetalk-data-protobuf-jersey3-jakarta10/gradle.lockfile index f25d1ef737..b85edaa608 100644 --- a/servicetalk-data-protobuf-jersey3-jakarta10/gradle.lockfile +++ b/servicetalk-data-protobuf-jersey3-jakarta10/gradle.lockfile @@ -1,30 +1,10 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -com.fasterxml.jackson.core:jackson-annotations:2.16.2=runtimeClasspath -com.fasterxml.jackson.core:jackson-core:2.16.2=runtimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.16.2=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.16.2=runtimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath com.google.protobuf:protobuf-bom:3.25.3=compileClasspath,runtimeClasspath com.google.protobuf:protobuf-java:3.25.3=compileClasspath,runtimeClasspath com.sun.istack:istack-commons-runtime:4.1.2=runtimeClasspath -io.netty.incubator:netty-incubator-transport-classes-io_uring:0.0.26.Final=runtimeClasspath -io.netty.incubator:netty-incubator-transport-native-io_uring:0.0.26.Final=runtimeClasspath -io.netty:netty-bom:4.1.116.Final=compileClasspath,runtimeClasspath -io.netty:netty-buffer:4.1.116.Final=compileClasspath,runtimeClasspath -io.netty:netty-codec:4.1.116.Final=runtimeClasspath -io.netty:netty-common:4.1.116.Final=compileClasspath,runtimeClasspath -io.netty:netty-handler:4.1.116.Final=runtimeClasspath -io.netty:netty-resolver:4.1.116.Final=runtimeClasspath -io.netty:netty-tcnative-boringssl-static:2.0.69.Final=runtimeClasspath -io.netty:netty-tcnative-classes:2.0.69.Final=runtimeClasspath -io.netty:netty-transport-classes-epoll:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-classes-kqueue:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-native-epoll:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-native-kqueue:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-native-unix-common:4.1.116.Final=runtimeClasspath -io.netty:netty-transport:4.1.116.Final=runtimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=runtimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=compileClasspath,runtimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath diff --git a/servicetalk-data-protobuf-jersey3-jakarta9/build.gradle b/servicetalk-data-protobuf-jersey3-jakarta9/build.gradle index 6f9a9bf00b..dfd343d93f 100644 --- a/servicetalk-data-protobuf-jersey3-jakarta9/build.gradle +++ b/servicetalk-data-protobuf-jersey3-jakarta9/build.gradle @@ -99,23 +99,20 @@ dependencies { implementation platform("com.google.protobuf:protobuf-bom:$protobufVersion") implementation project(":servicetalk-annotations") implementation project(":servicetalk-buffer-api") - implementation project(":servicetalk-buffer-netty") implementation project(":servicetalk-concurrent-api") - implementation project(":servicetalk-concurrent-api-internal") implementation project(":servicetalk-concurrent-internal") implementation project(":servicetalk-data-protobuf") implementation project(":servicetalk-http-api") - implementation project(":servicetalk-http-router-jersey3-jakarta9") implementation project(":servicetalk-http-router-jersey3-jakarta9-internal") - implementation project(":servicetalk-http-utils") implementation project(":servicetalk-serializer-api") implementation project(":servicetalk-transport-api") - implementation project(":servicetalk-transport-netty") implementation "com.google.protobuf:protobuf-java" implementation "jakarta.inject:jakarta.inject-api:$actualJavaxInjectVersion" implementation "org.glassfish.jersey.core:jersey-server" implementation "org.slf4j:slf4j-api:$slf4jVersion" + runtimeOnly project(":servicetalk-http-router-jersey3-jakarta9") + testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testImplementation testFixtures(project(":servicetalk-concurrent-internal")) testImplementation testFixtures(project(":servicetalk-http-router-jersey3-jakarta9")) diff --git a/servicetalk-data-protobuf-jersey3-jakarta9/gradle.lockfile b/servicetalk-data-protobuf-jersey3-jakarta9/gradle.lockfile index 6d0c8deda5..1bcad42372 100644 --- a/servicetalk-data-protobuf-jersey3-jakarta9/gradle.lockfile +++ b/servicetalk-data-protobuf-jersey3-jakarta9/gradle.lockfile @@ -1,31 +1,11 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -com.fasterxml.jackson.core:jackson-annotations:2.16.2=runtimeClasspath -com.fasterxml.jackson.core:jackson-core:2.16.2=runtimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.16.2=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.16.2=runtimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath com.google.protobuf:protobuf-bom:3.25.3=compileClasspath,runtimeClasspath com.google.protobuf:protobuf-java:3.25.3=compileClasspath,runtimeClasspath com.sun.activation:jakarta.activation:2.0.1=runtimeClasspath com.sun.istack:istack-commons-runtime:4.0.1=runtimeClasspath -io.netty.incubator:netty-incubator-transport-classes-io_uring:0.0.26.Final=runtimeClasspath -io.netty.incubator:netty-incubator-transport-native-io_uring:0.0.26.Final=runtimeClasspath -io.netty:netty-bom:4.1.116.Final=compileClasspath,runtimeClasspath -io.netty:netty-buffer:4.1.116.Final=compileClasspath,runtimeClasspath -io.netty:netty-codec:4.1.116.Final=runtimeClasspath -io.netty:netty-common:4.1.116.Final=compileClasspath,runtimeClasspath -io.netty:netty-handler:4.1.116.Final=runtimeClasspath -io.netty:netty-resolver:4.1.116.Final=runtimeClasspath -io.netty:netty-tcnative-boringssl-static:2.0.69.Final=runtimeClasspath -io.netty:netty-tcnative-classes:2.0.69.Final=runtimeClasspath -io.netty:netty-transport-classes-epoll:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-classes-kqueue:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-native-epoll:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-native-kqueue:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-native-unix-common:4.1.116.Final=runtimeClasspath -io.netty:netty-transport:4.1.116.Final=runtimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=compileClasspath,runtimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=compileClasspath,runtimeClasspath diff --git a/servicetalk-data-protobuf/build.gradle b/servicetalk-data-protobuf/build.gradle index 99d85f643d..9a1e8e0702 100644 --- a/servicetalk-data-protobuf/build.gradle +++ b/servicetalk-data-protobuf/build.gradle @@ -34,8 +34,6 @@ dependencies { api "com.google.protobuf:protobuf-java" implementation project(":servicetalk-annotations") - implementation project(":servicetalk-concurrent-api-internal") - implementation project(":servicetalk-concurrent-internal") implementation project(":servicetalk-serializer-utils") testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") diff --git a/servicetalk-dns-discovery-netty/build.gradle b/servicetalk-dns-discovery-netty/build.gradle index bf0608174f..171effc864 100644 --- a/servicetalk-dns-discovery-netty/build.gradle +++ b/servicetalk-dns-discovery-netty/build.gradle @@ -43,7 +43,6 @@ dependencies { implementation project(":servicetalk-concurrent-api") implementation project(":servicetalk-concurrent-api-internal") implementation project(":servicetalk-concurrent-internal") - implementation project(":servicetalk-transport-netty") implementation project(":servicetalk-transport-netty-internal") implementation project(":servicetalk-utils-internal") implementation "io.netty:netty-buffer" @@ -56,8 +55,8 @@ dependencies { if (!project.ext.isNettySnapshot) { // Netty doesn't publish snapshots for macos artifacts - 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") + 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") } testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") diff --git a/servicetalk-encoding-api/build.gradle b/servicetalk-encoding-api/build.gradle index 6ad9afa4ac..020a1afd1e 100644 --- a/servicetalk-encoding-api/build.gradle +++ b/servicetalk-encoding-api/build.gradle @@ -25,7 +25,6 @@ dependencies { implementation project(":servicetalk-concurrent") implementation project(":servicetalk-concurrent-internal") implementation project(":servicetalk-oio-api") - implementation "org.slf4j:slf4j-api:$slf4jVersion" testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testImplementation "org.junit.jupiter:junit-jupiter-params" diff --git a/servicetalk-encoding-api/gradle.lockfile b/servicetalk-encoding-api/gradle.lockfile index 43922146ee..48311cc124 100644 --- a/servicetalk-encoding-api/gradle.lockfile +++ b/servicetalk-encoding-api/gradle.lockfile @@ -3,5 +3,5 @@ # This file is expected to be part of source control. com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath org.jctools:jctools-core:4.0.3=runtimeClasspath -org.slf4j:slf4j-api:1.7.36=compileClasspath,runtimeClasspath +org.slf4j:slf4j-api:1.7.36=runtimeClasspath empty=annotationProcessor,jmhCompileClasspath,jmhRuntimeClasspath,spotbugsPlugins,testAnnotationProcessor diff --git a/servicetalk-grpc-api/build.gradle b/servicetalk-grpc-api/build.gradle index c6381e71b7..d600e750fb 100644 --- a/servicetalk-grpc-api/build.gradle +++ b/servicetalk-grpc-api/build.gradle @@ -34,13 +34,11 @@ dependencies { implementation project(":servicetalk-annotations") implementation project(":servicetalk-buffer-api") implementation project(":servicetalk-encoding-api-internal") - implementation project(":servicetalk-concurrent-api-internal") implementation project(":servicetalk-concurrent-internal") implementation project(":servicetalk-http-utils") implementation project(":servicetalk-router-utils-internal") implementation project(":servicetalk-utils-internal") implementation project(":servicetalk-grpc-internal") - implementation project(":servicetalk-oio-api-internal") implementation project(":servicetalk-serializer-utils") implementation "com.google.protobuf:protobuf-java" implementation "org.slf4j:slf4j-api:$slf4jVersion" diff --git a/servicetalk-grpc-health/build.gradle b/servicetalk-grpc-health/build.gradle index 5c27690b34..9fbd345c75 100644 --- a/servicetalk-grpc-health/build.gradle +++ b/servicetalk-grpc-health/build.gradle @@ -34,14 +34,13 @@ dependencies { implementation project(":servicetalk-annotations") implementation project(":servicetalk-data-protobuf") - implementation project(":servicetalk-grpc-netty") implementation project(":servicetalk-grpc-protobuf") - implementation project(":servicetalk-grpc-protoc") implementation project(":servicetalk-serializer-api") testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testImplementation testFixtures(project(":servicetalk-transport-netty-internal")) testImplementation testFixtures(project(":servicetalk-concurrent-internal")) + testImplementation project(":servicetalk-grpc-netty") testImplementation project(":servicetalk-transport-api") testImplementation "org.junit.jupiter:junit-jupiter-api" testImplementation "org.hamcrest:hamcrest:$hamcrestVersion" diff --git a/servicetalk-grpc-health/gradle.lockfile b/servicetalk-grpc-health/gradle.lockfile index f0a216fe6e..9395da1b32 100644 --- a/servicetalk-grpc-health/gradle.lockfile +++ b/servicetalk-grpc-health/gradle.lockfile @@ -5,28 +5,9 @@ com.google.api.grpc:proto-google-common-protos:2.29.0=compileClasspath,runtimeCl com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath com.google.protobuf:protobuf-bom:3.25.3=compileClasspath,runtimeClasspath com.google.protobuf:protobuf-java:3.25.3=compileClasspath,runtimeClasspath -io.netty.incubator:netty-incubator-transport-classes-io_uring:0.0.26.Final=runtimeClasspath -io.netty.incubator:netty-incubator-transport-native-io_uring:0.0.26.Final=runtimeClasspath io.netty:netty-bom:4.1.116.Final=runtimeClasspath io.netty:netty-buffer:4.1.116.Final=runtimeClasspath -io.netty:netty-codec-dns:4.1.116.Final=runtimeClasspath -io.netty:netty-codec-http2:4.1.116.Final=runtimeClasspath -io.netty:netty-codec-http:4.1.116.Final=runtimeClasspath -io.netty:netty-codec:4.1.116.Final=runtimeClasspath io.netty:netty-common:4.1.116.Final=runtimeClasspath -io.netty:netty-handler:4.1.116.Final=runtimeClasspath -io.netty:netty-resolver-dns-classes-macos:4.1.116.Final=runtimeClasspath -io.netty:netty-resolver-dns-native-macos:4.1.116.Final=runtimeClasspath -io.netty:netty-resolver-dns:4.1.116.Final=runtimeClasspath -io.netty:netty-resolver:4.1.116.Final=runtimeClasspath -io.netty:netty-tcnative-boringssl-static:2.0.69.Final=runtimeClasspath -io.netty:netty-tcnative-classes:2.0.69.Final=runtimeClasspath -io.netty:netty-transport-classes-epoll:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-classes-kqueue:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-native-epoll:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-native-kqueue:4.1.116.Final=runtimeClasspath -io.netty:netty-transport-native-unix-common:4.1.116.Final=runtimeClasspath -io.netty:netty-transport:4.1.116.Final=runtimeClasspath org.jctools:jctools-core:4.0.3=runtimeClasspath org.slf4j:slf4j-api:1.7.36=runtimeClasspath empty=annotationProcessor,jmhCompileClasspath,jmhRuntimeClasspath,protobuf,spotbugsPlugins,testAnnotationProcessor,testProtobuf diff --git a/servicetalk-grpc-netty/build.gradle b/servicetalk-grpc-netty/build.gradle index 325b0e4065..32143c9ab1 100644 --- a/servicetalk-grpc-netty/build.gradle +++ b/servicetalk-grpc-netty/build.gradle @@ -50,7 +50,6 @@ dependencies { compileOnly project(":servicetalk-http-utils") // only for javadoc references - implementation platform("com.google.protobuf:protobuf-bom:$protobufVersion") implementation project(":servicetalk-annotations") implementation project(":servicetalk-buffer-api") implementation project(":servicetalk-concurrent-api") @@ -61,8 +60,8 @@ dependencies { implementation project(":servicetalk-transport-netty-internal") implementation project(":servicetalk-utils-internal") implementation "org.slf4j:slf4j-api:$slf4jVersion" - implementation "com.google.protobuf:protobuf-java" + testImplementation enforcedPlatform("com.google.protobuf:protobuf-bom:$protobufVersion") testImplementation enforcedPlatform("io.grpc:grpc-bom:$grpcVersion") testImplementation enforcedPlatform("io.netty:netty-bom:$nettyVersion") testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") @@ -89,6 +88,7 @@ dependencies { testImplementation project(":servicetalk-test-resources") testImplementation project(":servicetalk-transport-netty") testImplementation "com.google.api.grpc:proto-google-common-protos:$protoGoogleCommonProtosVersion" + testImplementation "com.google.protobuf:protobuf-java" testImplementation "io.grpc:grpc-api" testImplementation("io.grpc:grpc-netty") { exclude group: "io.netty" diff --git a/servicetalk-grpc-netty/gradle.lockfile b/servicetalk-grpc-netty/gradle.lockfile index cabdee2ca2..7d16bb8126 100644 --- a/servicetalk-grpc-netty/gradle.lockfile +++ b/servicetalk-grpc-netty/gradle.lockfile @@ -3,8 +3,8 @@ # This file is expected to be part of source control. com.google.api.grpc:proto-google-common-protos:2.29.0=compileClasspath,runtimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath -com.google.protobuf:protobuf-bom:3.25.3=compileClasspath,runtimeClasspath -com.google.protobuf:protobuf-java:3.25.3=compileClasspath,runtimeClasspath +com.google.protobuf:protobuf-bom:3.25.3=runtimeClasspath +com.google.protobuf:protobuf-java:3.25.3=runtimeClasspath io.netty.incubator:netty-incubator-transport-classes-io_uring:0.0.26.Final=runtimeClasspath io.netty.incubator:netty-incubator-transport-native-io_uring:0.0.26.Final=runtimeClasspath io.netty:netty-bom:4.1.116.Final=compileClasspath,runtimeClasspath diff --git a/servicetalk-grpc-protobuf/build.gradle b/servicetalk-grpc-protobuf/build.gradle index f1be1bb93a..1001cac3ee 100644 --- a/servicetalk-grpc-protobuf/build.gradle +++ b/servicetalk-grpc-protobuf/build.gradle @@ -37,12 +37,8 @@ dependencies { implementation project(":servicetalk-buffer-netty") implementation project(":servicetalk-concurrent") implementation project(":servicetalk-concurrent-api") - implementation project(":servicetalk-data-protobuf") implementation project(":servicetalk-http-api") implementation project(":servicetalk-serialization-api") - implementation project(":servicetalk-serializer-api") - implementation project(":servicetalk-serializer-utils") - implementation "org.slf4j:slf4j-api:$slf4jVersion" testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testImplementation project(":servicetalk-test-resources") diff --git a/servicetalk-grpc-protobuf/gradle.lockfile b/servicetalk-grpc-protobuf/gradle.lockfile index 844cf864d7..4cc8beac9f 100644 --- a/servicetalk-grpc-protobuf/gradle.lockfile +++ b/servicetalk-grpc-protobuf/gradle.lockfile @@ -9,5 +9,5 @@ io.netty:netty-bom:4.1.116.Final=compileClasspath,runtimeClasspath io.netty:netty-buffer:4.1.116.Final=compileClasspath,runtimeClasspath io.netty:netty-common:4.1.116.Final=compileClasspath,runtimeClasspath org.jctools:jctools-core:4.0.3=runtimeClasspath -org.slf4j:slf4j-api:1.7.36=compileClasspath,runtimeClasspath +org.slf4j:slf4j-api:1.7.36=runtimeClasspath empty=annotationProcessor,jmhCompileClasspath,jmhRuntimeClasspath,protobuf,spotbugsPlugins,testAnnotationProcessor,testProtobuf diff --git a/servicetalk-http-netty/build.gradle b/servicetalk-http-netty/build.gradle index 0b9637fff3..bec99dc0d4 100644 --- a/servicetalk-http-netty/build.gradle +++ b/servicetalk-http-netty/build.gradle @@ -48,10 +48,8 @@ dependencies { implementation project(":servicetalk-dns-discovery-netty") implementation project(":servicetalk-http-utils") implementation project(":servicetalk-loadbalancer") - implementation project(":servicetalk-loadbalancer-experimental-provider") implementation project(":servicetalk-logging-slf4j-internal") implementation project(":servicetalk-tcp-netty-internal") - implementation project(":servicetalk-transport-netty") implementation project(":servicetalk-transport-netty-internal") implementation project(":servicetalk-utils-internal") implementation "io.netty:netty-buffer" @@ -63,6 +61,8 @@ dependencies { implementation "io.netty:netty-transport" implementation "org.slf4j:slf4j-api:$slf4jVersion" + runtimeOnly project(":servicetalk-loadbalancer-experimental-provider") + testImplementation enforcedPlatform("com.fasterxml.jackson:jackson-bom:$jacksonVersion") testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testImplementation testFixtures(project(":servicetalk-buffer-api")) @@ -78,9 +78,11 @@ dependencies { testImplementation project(":servicetalk-encoding-api") testImplementation project(":servicetalk-encoding-api-internal") testImplementation project(":servicetalk-encoding-netty") + testImplementation project(":servicetalk-loadbalancer-experimental-provider") testImplementation project(":servicetalk-oio-api") testImplementation project(":servicetalk-serializer-api") testImplementation project(":servicetalk-test-resources") + testImplementation project(":servicetalk-transport-netty") testImplementation "com.fasterxml.jackson.core:jackson-core" testImplementation "io.netty.incubator:netty-incubator-transport-classes-io_uring:$nettyIoUringVersion" testImplementation "io.netty.incubator:netty-incubator-transport-native-io_uring:$nettyIoUringVersion" diff --git a/servicetalk-http-router-jersey-internal/build.gradle b/servicetalk-http-router-jersey-internal/build.gradle index 160b23c423..24c3612f5b 100644 --- a/servicetalk-http-router-jersey-internal/build.gradle +++ b/servicetalk-http-router-jersey-internal/build.gradle @@ -31,7 +31,6 @@ dependencies { implementation platform("org.glassfish.jersey:jersey-bom:$actualJerseyVersion") implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent-internal") - implementation project(":servicetalk-http-utils") implementation project(":servicetalk-transport-api") implementation "org.glassfish.jersey.core:jersey-common" } diff --git a/servicetalk-http-router-jersey/build.gradle b/servicetalk-http-router-jersey/build.gradle index d9a8980016..5f8e846b7c 100644 --- a/servicetalk-http-router-jersey/build.gradle +++ b/servicetalk-http-router-jersey/build.gradle @@ -54,19 +54,18 @@ dependencies { implementation project(":servicetalk-concurrent-api") implementation project(":servicetalk-concurrent-api-internal") implementation project(":servicetalk-concurrent-internal") - implementation project(":servicetalk-data-jackson") implementation project(":servicetalk-http-router-jersey-internal") implementation project(":servicetalk-http-utils") implementation project(":servicetalk-router-utils-internal") implementation project(":servicetalk-utils-internal") - implementation "com.sun.activation:jakarta.activation:$actualJavaxActivationVersion" - implementation "com.sun.xml.bind:jaxb-core:$actualJavaxJaxbCoreVersion" - implementation "jakarta.xml.bind:jakarta.xml.bind-api:$actualJavaxJaxbApiVersion" implementation "org.glassfish.hk2.external:jakarta.inject:$actualJavaxInjectVersion" implementation "org.glassfish.jersey.core:jersey-server" implementation "org.slf4j:slf4j-api:$slf4jVersion" + runtimeOnly "com.sun.activation:jakarta.activation:$actualJavaxActivationVersion" + runtimeOnly "com.sun.xml.bind:jaxb-core:$actualJavaxJaxbCoreVersion" runtimeOnly "com.sun.xml.bind:jaxb-impl:$actualJavaxJaxbImplVersion" + runtimeOnly "jakarta.xml.bind:jakarta.xml.bind-api:$actualJavaxJaxbApiVersion" testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testImplementation "org.junit.jupiter:junit-jupiter-api" diff --git a/servicetalk-http-router-jersey/gradle.lockfile b/servicetalk-http-router-jersey/gradle.lockfile index 21865e5d7b..b9c543ca22 100644 --- a/servicetalk-http-router-jersey/gradle.lockfile +++ b/servicetalk-http-router-jersey/gradle.lockfile @@ -1,19 +1,15 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -com.fasterxml.jackson.core:jackson-annotations:2.16.2=compileClasspath,runtimeClasspath -com.fasterxml.jackson.core:jackson-core:2.16.2=compileClasspath,runtimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.16.2=compileClasspath,runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.16.2=compileClasspath,runtimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath -com.sun.activation:jakarta.activation:1.2.2=compileClasspath,runtimeClasspath -com.sun.xml.bind:jaxb-core:2.3.0.1=compileClasspath,runtimeClasspath +com.sun.activation:jakarta.activation:1.2.2=runtimeClasspath +com.sun.xml.bind:jaxb-core:2.3.0.1=runtimeClasspath com.sun.xml.bind:jaxb-impl:2.3.3=runtimeClasspath -jakarta.activation:jakarta.activation-api:1.2.2=compileClasspath,runtimeClasspath +jakarta.activation:jakarta.activation-api:1.2.2=runtimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,runtimeClasspath jakarta.validation:jakarta.validation-api:2.0.2=compileClasspath,runtimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:2.1.6=compileClasspath,runtimeClasspath -jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=compileClasspath,runtimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=runtimeClasspath org.glassfish.hk2.external:jakarta.inject:2.6.1=compileClasspath,runtimeClasspath org.glassfish.hk2:osgi-resource-locator:1.0.3=compileClasspath,runtimeClasspath org.glassfish.jersey.core:jersey-client:2.41=compileClasspath,runtimeClasspath diff --git a/servicetalk-http-router-jersey3-jakarta10-internal/build.gradle b/servicetalk-http-router-jersey3-jakarta10-internal/build.gradle index 0156d2ff97..b9efb10345 100644 --- a/servicetalk-http-router-jersey3-jakarta10-internal/build.gradle +++ b/servicetalk-http-router-jersey3-jakarta10-internal/build.gradle @@ -86,7 +86,6 @@ dependencies { implementation platform("org.glassfish.jersey:jersey-bom:$actualJerseyVersion") implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent-internal") - implementation project(":servicetalk-http-utils") implementation project(":servicetalk-transport-api") implementation "org.glassfish.jersey.core:jersey-common" } diff --git a/servicetalk-http-router-jersey3-jakarta10/build.gradle b/servicetalk-http-router-jersey3-jakarta10/build.gradle index 0ada184b9e..69b5280a23 100644 --- a/servicetalk-http-router-jersey3-jakarta10/build.gradle +++ b/servicetalk-http-router-jersey3-jakarta10/build.gradle @@ -116,18 +116,17 @@ dependencies { implementation project(":servicetalk-concurrent-api") implementation project(":servicetalk-concurrent-api-internal") implementation project(":servicetalk-concurrent-internal") - implementation project(":servicetalk-data-jackson") implementation project(":servicetalk-http-router-jersey3-jakarta10-internal") implementation project(":servicetalk-http-utils") implementation project(":servicetalk-router-utils-internal") implementation project(":servicetalk-utils-internal") - implementation "jakarta.activation:jakarta.activation-api:$actualJavaxActivationVersion" // replacement for com.sun.activation:jakarta.activation implementation "jakarta.inject:jakarta.inject-api:$actualJavaxInjectVersion" // replacement for org.glassfish.hk2.external:jakarta.inject - implementation "org.glassfish.jaxb:jaxb-core:$actualJavaxJaxbCoreVersion" // replacement for com.sun.xml.bind:jaxb-core - implementation "jakarta.xml.bind:jakarta.xml.bind-api:$actualJavaxJaxbApiVersion" implementation "org.glassfish.jersey.core:jersey-server" implementation "org.slf4j:slf4j-api:$slf4jVersion" + runtimeOnly "jakarta.activation:jakarta.activation-api:$actualJavaxActivationVersion" // replacement for com.sun.activation:jakarta.activation + runtimeOnly "jakarta.xml.bind:jakarta.xml.bind-api:$actualJavaxJaxbApiVersion" + runtimeOnly "org.glassfish.jaxb:jaxb-core:$actualJavaxJaxbCoreVersion" // replacement for com.sun.xml.bind:jaxb-core runtimeOnly "org.glassfish.jaxb:jaxb-runtime:$actualJavaxJaxbImplVersion" // replacement for com.sun.xml.bind:jaxb-impl testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") diff --git a/servicetalk-http-router-jersey3-jakarta10/gradle.lockfile b/servicetalk-http-router-jersey3-jakarta10/gradle.lockfile index 7e3043ab8a..c3de76a248 100644 --- a/servicetalk-http-router-jersey3-jakarta10/gradle.lockfile +++ b/servicetalk-http-router-jersey3-jakarta10/gradle.lockfile @@ -1,23 +1,19 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -com.fasterxml.jackson.core:jackson-annotations:2.16.2=compileClasspath,runtimeClasspath -com.fasterxml.jackson.core:jackson-core:2.16.2=compileClasspath,runtimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.16.2=compileClasspath,runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.16.2=compileClasspath,runtimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath -com.sun.istack:istack-commons-runtime:4.1.2=compileClasspath,runtimeClasspath -jakarta.activation:jakarta.activation-api:2.1.3=compileClasspath,runtimeClasspath +com.sun.istack:istack-commons-runtime:4.1.2=runtimeClasspath +jakarta.activation:jakarta.activation-api:2.1.3=runtimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=compileClasspath,runtimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=compileClasspath,runtimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=compileClasspath,runtimeClasspath -jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=compileClasspath,runtimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=runtimeClasspath org.eclipse.angus:angus-activation:2.0.2=runtimeClasspath org.glassfish.hk2:osgi-resource-locator:1.0.3=compileClasspath,runtimeClasspath -org.glassfish.jaxb:jaxb-core:4.0.5=compileClasspath,runtimeClasspath +org.glassfish.jaxb:jaxb-core:4.0.5=runtimeClasspath org.glassfish.jaxb:jaxb-runtime:4.0.5=runtimeClasspath -org.glassfish.jaxb:txw2:4.0.5=compileClasspath,runtimeClasspath +org.glassfish.jaxb:txw2:4.0.5=runtimeClasspath org.glassfish.jersey.core:jersey-client:3.1.9=compileClasspath,runtimeClasspath org.glassfish.jersey.core:jersey-common:3.1.9=compileClasspath,runtimeClasspath org.glassfish.jersey.core:jersey-server:3.1.9=compileClasspath,runtimeClasspath diff --git a/servicetalk-http-router-jersey3-jakarta9-internal/build.gradle b/servicetalk-http-router-jersey3-jakarta9-internal/build.gradle index 3fd7e70fab..0a63cb8685 100644 --- a/servicetalk-http-router-jersey3-jakarta9-internal/build.gradle +++ b/servicetalk-http-router-jersey3-jakarta9-internal/build.gradle @@ -86,7 +86,6 @@ dependencies { implementation platform("org.glassfish.jersey:jersey-bom:$actualJerseyVersion") implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent-internal") - implementation project(":servicetalk-http-utils") implementation project(":servicetalk-transport-api") implementation "org.glassfish.jersey.core:jersey-common" } diff --git a/servicetalk-http-router-jersey3-jakarta9/build.gradle b/servicetalk-http-router-jersey3-jakarta9/build.gradle index 244feca26f..ac990f18f3 100644 --- a/servicetalk-http-router-jersey3-jakarta9/build.gradle +++ b/servicetalk-http-router-jersey3-jakarta9/build.gradle @@ -116,18 +116,17 @@ dependencies { implementation project(":servicetalk-concurrent-api") implementation project(":servicetalk-concurrent-api-internal") implementation project(":servicetalk-concurrent-internal") - implementation project(":servicetalk-data-jackson") implementation project(":servicetalk-http-router-jersey3-jakarta9-internal") implementation project(":servicetalk-http-utils") implementation project(":servicetalk-router-utils-internal") implementation project(":servicetalk-utils-internal") - implementation "com.sun.activation:jakarta.activation:$actualJavaxActivationVersion" implementation "jakarta.inject:jakarta.inject-api:$actualJavaxInjectVersion" // replacement for org.glassfish.hk2.external:jakarta.inject - implementation "org.glassfish.jaxb:jaxb-core:$actualJavaxJaxbCoreVersion" // replacement for com.sun.xml.bind:jaxb-core - implementation "jakarta.xml.bind:jakarta.xml.bind-api:$actualJavaxJaxbApiVersion" implementation "org.glassfish.jersey.core:jersey-server" implementation "org.slf4j:slf4j-api:$slf4jVersion" + runtimeOnly "com.sun.activation:jakarta.activation:$actualJavaxActivationVersion" + runtimeOnly "jakarta.xml.bind:jakarta.xml.bind-api:$actualJavaxJaxbApiVersion" + runtimeOnly "org.glassfish.jaxb:jaxb-core:$actualJavaxJaxbCoreVersion" // replacement for com.sun.xml.bind:jaxb-core runtimeOnly "org.glassfish.jaxb:jaxb-runtime:$actualJavaxJaxbImplVersion" // replacement for com.sun.xml.bind:jaxb-impl testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") diff --git a/servicetalk-http-router-jersey3-jakarta9/gradle.lockfile b/servicetalk-http-router-jersey3-jakarta9/gradle.lockfile index ce8c897566..20349c424b 100644 --- a/servicetalk-http-router-jersey3-jakarta9/gradle.lockfile +++ b/servicetalk-http-router-jersey3-jakarta9/gradle.lockfile @@ -1,22 +1,18 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -com.fasterxml.jackson.core:jackson-annotations:2.16.2=compileClasspath,runtimeClasspath -com.fasterxml.jackson.core:jackson-core:2.16.2=compileClasspath,runtimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.16.2=compileClasspath,runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.16.2=compileClasspath,runtimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath -com.sun.activation:jakarta.activation:2.0.1=compileClasspath,runtimeClasspath -com.sun.istack:istack-commons-runtime:4.0.1=compileClasspath,runtimeClasspath +com.sun.activation:jakarta.activation:2.0.1=runtimeClasspath +com.sun.istack:istack-commons-runtime:4.0.1=runtimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=compileClasspath,runtimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=compileClasspath,runtimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.0.0=compileClasspath,runtimeClasspath -jakarta.xml.bind:jakarta.xml.bind-api:3.0.1=compileClasspath,runtimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:3.0.1=runtimeClasspath org.glassfish.hk2:osgi-resource-locator:1.0.3=compileClasspath,runtimeClasspath -org.glassfish.jaxb:jaxb-core:3.0.2=compileClasspath,runtimeClasspath +org.glassfish.jaxb:jaxb-core:3.0.2=runtimeClasspath org.glassfish.jaxb:jaxb-runtime:3.0.2=runtimeClasspath -org.glassfish.jaxb:txw2:3.0.2=compileClasspath,runtimeClasspath +org.glassfish.jaxb:txw2:3.0.2=runtimeClasspath org.glassfish.jersey.core:jersey-client:3.0.17=compileClasspath,runtimeClasspath org.glassfish.jersey.core:jersey-common:3.0.17=compileClasspath,runtimeClasspath org.glassfish.jersey.core:jersey-server:3.0.17=compileClasspath,runtimeClasspath diff --git a/servicetalk-http-security-jersey/build.gradle b/servicetalk-http-security-jersey/build.gradle index be2fcf0c47..adeea0dc7b 100644 --- a/servicetalk-http-security-jersey/build.gradle +++ b/servicetalk-http-security-jersey/build.gradle @@ -29,7 +29,8 @@ dependencies { implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent-api") implementation "jakarta.annotation:jakarta.annotation-api:$actualJavaxAnnotationsApiVersion" - implementation "org.glassfish.jersey.core:jersey-common" + + runtimeOnly "org.glassfish.jersey.core:jersey-common" testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testImplementation testFixtures(project(":servicetalk-transport-netty-internal")) diff --git a/servicetalk-http-security-jersey/gradle.lockfile b/servicetalk-http-security-jersey/gradle.lockfile index 916ffa660b..a29a06f76a 100644 --- a/servicetalk-http-security-jersey/gradle.lockfile +++ b/servicetalk-http-security-jersey/gradle.lockfile @@ -4,9 +4,9 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,runtimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:2.1.6=compileClasspath,runtimeClasspath -org.glassfish.hk2.external:jakarta.inject:2.6.1=compileClasspath,runtimeClasspath -org.glassfish.hk2:osgi-resource-locator:1.0.3=compileClasspath,runtimeClasspath -org.glassfish.jersey.core:jersey-common:2.41=compileClasspath,runtimeClasspath +org.glassfish.hk2.external:jakarta.inject:2.6.1=runtimeClasspath +org.glassfish.hk2:osgi-resource-locator:1.0.3=runtimeClasspath +org.glassfish.jersey.core:jersey-common:2.41=runtimeClasspath org.glassfish.jersey:jersey-bom:2.41=compileClasspath,runtimeClasspath org.jctools:jctools-core:4.0.3=runtimeClasspath org.slf4j:slf4j-api:1.7.36=runtimeClasspath diff --git a/servicetalk-http-security-jersey3-jakarta10/build.gradle b/servicetalk-http-security-jersey3-jakarta10/build.gradle index 1c993c0823..355461135f 100644 --- a/servicetalk-http-security-jersey3-jakarta10/build.gradle +++ b/servicetalk-http-security-jersey3-jakarta10/build.gradle @@ -90,7 +90,8 @@ dependencies { implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent-api") implementation "jakarta.annotation:jakarta.annotation-api:$actualJavaxAnnotationsApiVersion" - implementation "org.glassfish.jersey.core:jersey-common" + + runtimeOnly "org.glassfish.jersey.core:jersey-common" testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testImplementation testFixtures(project(":servicetalk-transport-netty-internal")) diff --git a/servicetalk-http-security-jersey3-jakarta10/gradle.lockfile b/servicetalk-http-security-jersey3-jakarta10/gradle.lockfile index 26f295e867..009603afbc 100644 --- a/servicetalk-http-security-jersey3-jakarta10/gradle.lockfile +++ b/servicetalk-http-security-jersey3-jakarta10/gradle.lockfile @@ -3,10 +3,10 @@ # This file is expected to be part of source control. com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=compileClasspath,runtimeClasspath -jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath +jakarta.inject:jakarta.inject-api:2.0.1=runtimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=compileClasspath,runtimeClasspath -org.glassfish.hk2:osgi-resource-locator:1.0.3=compileClasspath,runtimeClasspath -org.glassfish.jersey.core:jersey-common:3.1.9=compileClasspath,runtimeClasspath +org.glassfish.hk2:osgi-resource-locator:1.0.3=runtimeClasspath +org.glassfish.jersey.core:jersey-common:3.1.9=runtimeClasspath org.glassfish.jersey:jersey-bom:3.1.9=compileClasspath,runtimeClasspath org.jctools:jctools-core:4.0.3=runtimeClasspath org.slf4j:slf4j-api:1.7.36=runtimeClasspath diff --git a/servicetalk-http-security-jersey3-jakarta9/build.gradle b/servicetalk-http-security-jersey3-jakarta9/build.gradle index 0e8dd99918..96d7ab6cd2 100644 --- a/servicetalk-http-security-jersey3-jakarta9/build.gradle +++ b/servicetalk-http-security-jersey3-jakarta9/build.gradle @@ -90,7 +90,8 @@ dependencies { implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent-api") implementation "jakarta.annotation:jakarta.annotation-api:$actualJavaxAnnotationsApiVersion" - implementation "org.glassfish.jersey.core:jersey-common" + + runtimeOnly "org.glassfish.jersey.core:jersey-common" testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testImplementation testFixtures(project(":servicetalk-transport-netty-internal")) diff --git a/servicetalk-http-security-jersey3-jakarta9/gradle.lockfile b/servicetalk-http-security-jersey3-jakarta9/gradle.lockfile index f05e041d0f..d0c0bb8ac8 100644 --- a/servicetalk-http-security-jersey3-jakarta9/gradle.lockfile +++ b/servicetalk-http-security-jersey3-jakarta9/gradle.lockfile @@ -2,11 +2,12 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath -jakarta.annotation:jakarta.annotation-api:2.1.1=compileClasspath,runtimeClasspath -jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath +jakarta.annotation:jakarta.annotation-api:2.0.0=compileClasspath +jakarta.annotation:jakarta.annotation-api:2.1.1=runtimeClasspath +jakarta.inject:jakarta.inject-api:2.0.1=runtimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.0.0=compileClasspath,runtimeClasspath -org.glassfish.hk2:osgi-resource-locator:1.0.3=compileClasspath,runtimeClasspath -org.glassfish.jersey.core:jersey-common:3.0.17=compileClasspath,runtimeClasspath +org.glassfish.hk2:osgi-resource-locator:1.0.3=runtimeClasspath +org.glassfish.jersey.core:jersey-common:3.0.17=runtimeClasspath org.glassfish.jersey:jersey-bom:3.0.17=compileClasspath,runtimeClasspath org.jctools:jctools-core:4.0.3=runtimeClasspath org.slf4j:slf4j-api:1.7.36=runtimeClasspath diff --git a/servicetalk-loadbalancer/build.gradle b/servicetalk-loadbalancer/build.gradle index dc7db05294..be44e74d93 100644 --- a/servicetalk-loadbalancer/build.gradle +++ b/servicetalk-loadbalancer/build.gradle @@ -23,7 +23,6 @@ dependencies { implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent") - implementation project(":servicetalk-concurrent-api-internal") implementation project(":servicetalk-concurrent-internal") implementation project(":servicetalk-context-api") implementation project(":servicetalk-utils-internal") diff --git a/servicetalk-log4j2-mdc-utils/build.gradle b/servicetalk-log4j2-mdc-utils/build.gradle index 66061d150e..73d8cfc869 100644 --- a/servicetalk-log4j2-mdc-utils/build.gradle +++ b/servicetalk-log4j2-mdc-utils/build.gradle @@ -22,9 +22,9 @@ dependencies { implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent-api") - implementation project(":servicetalk-concurrent-internal") implementation project(":servicetalk-context-api") - implementation "org.apache.logging.log4j:log4j-core" + + runtimeOnly "org.apache.logging.log4j:log4j-core" testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testImplementation project(":servicetalk-concurrent") diff --git a/servicetalk-log4j2-mdc-utils/gradle.lockfile b/servicetalk-log4j2-mdc-utils/gradle.lockfile index ca229a28cb..f636763a7b 100644 --- a/servicetalk-log4j2-mdc-utils/gradle.lockfile +++ b/servicetalk-log4j2-mdc-utils/gradle.lockfile @@ -4,7 +4,7 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath org.apache.logging.log4j:log4j-api:2.23.1=compileClasspath,runtimeClasspath org.apache.logging.log4j:log4j-bom:2.23.1=compileClasspath,runtimeClasspath -org.apache.logging.log4j:log4j-core:2.23.1=compileClasspath,runtimeClasspath +org.apache.logging.log4j:log4j-core:2.23.1=runtimeClasspath org.jctools:jctools-core:4.0.3=runtimeClasspath org.slf4j:slf4j-api:1.7.36=runtimeClasspath empty=annotationProcessor,jmhCompileClasspath,jmhRuntimeClasspath,spotbugsPlugins,testAnnotationProcessor,testFixturesAnnotationProcessor diff --git a/servicetalk-opentracing-http/build.gradle b/servicetalk-opentracing-http/build.gradle index d3aa68697c..004e89d21f 100644 --- a/servicetalk-opentracing-http/build.gradle +++ b/servicetalk-opentracing-http/build.gradle @@ -26,8 +26,6 @@ dependencies { implementation project(":servicetalk-http-utils") implementation project(":servicetalk-opentracing-inmemory") implementation project(":servicetalk-opentracing-inmemory-api") - implementation project(":servicetalk-opentracing-internal") - implementation "org.slf4j:slf4j-api:$slf4jVersion" testImplementation enforcedPlatform("com.fasterxml.jackson:jackson-bom:$jacksonVersion") testImplementation enforcedPlatform("org.apache.logging.log4j:log4j-bom:$log4jVersion") @@ -40,6 +38,7 @@ dependencies { testImplementation project(":servicetalk-data-jackson") testImplementation project(":servicetalk-http-netty") testImplementation project(":servicetalk-opentracing-asynccontext") + testImplementation project(":servicetalk-opentracing-internal") testImplementation project(":servicetalk-serializer-api") testImplementation project(":servicetalk-test-resources") testImplementation "com.fasterxml.jackson.core:jackson-annotations" @@ -47,6 +46,7 @@ dependencies { testImplementation "org.junit.jupiter:junit-jupiter-api" testImplementation "org.mockito:mockito-core:$mockitoCoreVersion" testImplementation "org.mockito:mockito-junit-jupiter:$mockitoCoreVersion" + testImplementation "org.slf4j:slf4j-api:$slf4jVersion" testRuntimeOnly project(":servicetalk-opentracing-log4j2") testRuntimeOnly "org.apache.logging.log4j:log4j-slf4j-impl" diff --git a/servicetalk-opentracing-http/gradle.lockfile b/servicetalk-opentracing-http/gradle.lockfile index a30ffbac0a..b83882d6a7 100644 --- a/servicetalk-opentracing-http/gradle.lockfile +++ b/servicetalk-opentracing-http/gradle.lockfile @@ -4,5 +4,5 @@ com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath io.opentracing:opentracing-api:0.33.0=compileClasspath,runtimeClasspath org.jctools:jctools-core:4.0.3=runtimeClasspath -org.slf4j:slf4j-api:1.7.36=compileClasspath,runtimeClasspath +org.slf4j:slf4j-api:1.7.36=runtimeClasspath empty=annotationProcessor,jmhCompileClasspath,jmhRuntimeClasspath,spotbugsPlugins,testAnnotationProcessor diff --git a/servicetalk-opentracing-inmemory-api/build.gradle b/servicetalk-opentracing-inmemory-api/build.gradle index 652b5dbf16..968eb268c9 100644 --- a/servicetalk-opentracing-inmemory-api/build.gradle +++ b/servicetalk-opentracing-inmemory-api/build.gradle @@ -20,6 +20,4 @@ dependencies { api "io.opentracing:opentracing-api:$openTracingVersion" implementation project(":servicetalk-annotations") - implementation project(":servicetalk-opentracing-internal") - implementation "org.slf4j:slf4j-api:$slf4jVersion" } diff --git a/servicetalk-opentracing-inmemory-api/gradle.lockfile b/servicetalk-opentracing-inmemory-api/gradle.lockfile index bd40bc460b..9f4f52092a 100644 --- a/servicetalk-opentracing-inmemory-api/gradle.lockfile +++ b/servicetalk-opentracing-inmemory-api/gradle.lockfile @@ -3,5 +3,4 @@ # This file is expected to be part of source control. com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath io.opentracing:opentracing-api:0.33.0=compileClasspath,runtimeClasspath -org.slf4j:slf4j-api:1.7.36=compileClasspath,runtimeClasspath empty=annotationProcessor,jmhCompileClasspath,jmhRuntimeClasspath,spotbugsPlugins,testAnnotationProcessor diff --git a/servicetalk-opentracing-internal/build.gradle b/servicetalk-opentracing-internal/build.gradle index 409673423e..ee40278711 100644 --- a/servicetalk-opentracing-internal/build.gradle +++ b/servicetalk-opentracing-internal/build.gradle @@ -18,5 +18,4 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library" dependencies { implementation project(":servicetalk-annotations") - implementation "org.slf4j:slf4j-api:$slf4jVersion" } diff --git a/servicetalk-opentracing-internal/gradle.lockfile b/servicetalk-opentracing-internal/gradle.lockfile index 9cb061b3e0..ded08f8166 100644 --- a/servicetalk-opentracing-internal/gradle.lockfile +++ b/servicetalk-opentracing-internal/gradle.lockfile @@ -2,5 +2,4 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath -org.slf4j:slf4j-api:1.7.36=compileClasspath,runtimeClasspath empty=annotationProcessor,jmhCompileClasspath,jmhRuntimeClasspath,spotbugsPlugins,testAnnotationProcessor diff --git a/servicetalk-opentracing-log4j2/build.gradle b/servicetalk-opentracing-log4j2/build.gradle index 4001bfdfbd..3dc0311dfa 100644 --- a/servicetalk-opentracing-log4j2/build.gradle +++ b/servicetalk-opentracing-log4j2/build.gradle @@ -28,7 +28,6 @@ dependencies { implementation project(":servicetalk-opentracing-internal") implementation project(":servicetalk-opentracing-asynccontext") implementation "org.apache.logging.log4j:log4j-core" - implementation "org.slf4j:slf4j-api:$slf4jVersion" testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testImplementation testFixtures(project(":servicetalk-log4j2-mdc-utils")) @@ -36,4 +35,5 @@ dependencies { testImplementation "io.opentracing:opentracing-api:$openTracingVersion" testImplementation "org.junit.jupiter:junit-jupiter-api" testImplementation "org.hamcrest:hamcrest:$hamcrestVersion" + testImplementation "org.slf4j:slf4j-api:$slf4jVersion" } diff --git a/servicetalk-opentracing-log4j2/gradle.lockfile b/servicetalk-opentracing-log4j2/gradle.lockfile index 22ced10cc9..f92cc8ed34 100644 --- a/servicetalk-opentracing-log4j2/gradle.lockfile +++ b/servicetalk-opentracing-log4j2/gradle.lockfile @@ -7,5 +7,5 @@ org.apache.logging.log4j:log4j-api:2.23.1=compileClasspath,runtimeClasspath org.apache.logging.log4j:log4j-bom:2.23.1=compileClasspath,runtimeClasspath org.apache.logging.log4j:log4j-core:2.23.1=compileClasspath,runtimeClasspath org.jctools:jctools-core:4.0.3=runtimeClasspath -org.slf4j:slf4j-api:1.7.36=compileClasspath,runtimeClasspath +org.slf4j:slf4j-api:1.7.36=runtimeClasspath empty=annotationProcessor,jmhCompileClasspath,jmhRuntimeClasspath,spotbugsPlugins,testAnnotationProcessor diff --git a/servicetalk-opentracing-zipkin-publisher/build.gradle b/servicetalk-opentracing-zipkin-publisher/build.gradle index ef74eb9ea0..5789644319 100644 --- a/servicetalk-opentracing-zipkin-publisher/build.gradle +++ b/servicetalk-opentracing-zipkin-publisher/build.gradle @@ -29,14 +29,12 @@ dependencies { implementation project(":servicetalk-annotations") implementation project(":servicetalk-buffer-api") implementation project(":servicetalk-concurrent") - implementation project(":servicetalk-concurrent-api-internal") implementation project(":servicetalk-concurrent-internal") implementation project(":servicetalk-logging-slf4j-internal") implementation project(":servicetalk-transport-netty-internal") implementation project(":servicetalk-utils-internal") implementation "io.opentracing:opentracing-api:$openTracingVersion" implementation "io.netty:netty-buffer" - implementation "io.netty:netty-codec" implementation "io.netty:netty-common" implementation "io.netty:netty-transport" implementation "org.slf4j:slf4j-api:$slf4jVersion" diff --git a/servicetalk-router-utils-internal/build.gradle b/servicetalk-router-utils-internal/build.gradle index 5e55a49893..deac465f93 100644 --- a/servicetalk-router-utils-internal/build.gradle +++ b/servicetalk-router-utils-internal/build.gradle @@ -21,5 +21,4 @@ dependencies { api project(":servicetalk-transport-api") implementation project(":servicetalk-annotations") - implementation project(":servicetalk-concurrent-api") } diff --git a/servicetalk-serializer-api/build.gradle b/servicetalk-serializer-api/build.gradle index 10e9118e09..8121c02bf2 100644 --- a/servicetalk-serializer-api/build.gradle +++ b/servicetalk-serializer-api/build.gradle @@ -24,5 +24,4 @@ dependencies { implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent-api-internal") - implementation project(":servicetalk-oio-api-internal") } diff --git a/servicetalk-tcp-netty-internal/build.gradle b/servicetalk-tcp-netty-internal/build.gradle index c658fe9a88..cc06cc3614 100644 --- a/servicetalk-tcp-netty-internal/build.gradle +++ b/servicetalk-tcp-netty-internal/build.gradle @@ -41,13 +41,11 @@ dependencies { api "io.netty:netty-handler" api "io.netty:netty-transport" - implementation project(":servicetalk-buffer-netty") implementation project(":servicetalk-annotations") implementation project(":servicetalk-concurrent") implementation project(":servicetalk-concurrent-api-internal") implementation project(":servicetalk-concurrent-internal") implementation project(":servicetalk-logging-slf4j-internal") - implementation project(":servicetalk-transport-netty") implementation project(":servicetalk-utils-internal") implementation "io.netty:netty-buffer" implementation "io.netty:netty-resolver" @@ -58,6 +56,7 @@ dependencies { testImplementation testFixtures(project(":servicetalk-concurrent-internal")) testImplementation testFixtures(project(":servicetalk-transport-netty-internal")) testImplementation project(":servicetalk-buffer-api") + testImplementation project(":servicetalk-buffer-netty") testImplementation project(":servicetalk-test-resources") testImplementation "org.junit.jupiter:junit-jupiter-api" testImplementation "org.junit.jupiter:junit-jupiter-params" diff --git a/servicetalk-transport-netty-internal/build.gradle b/servicetalk-transport-netty-internal/build.gradle index c00c164c08..e91e551c62 100644 --- a/servicetalk-transport-netty-internal/build.gradle +++ b/servicetalk-transport-netty-internal/build.gradle @@ -52,28 +52,29 @@ dependencies { implementation project(":servicetalk-logging-slf4j-internal") implementation project(":servicetalk-utils-internal") implementation "io.netty:netty-codec" - 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") implementation "io.netty:netty-transport-classes-epoll" implementation "io.netty:netty-transport-classes-kqueue" - implementation "io.netty:netty-transport-native-kqueue" - if (!project.ext.isNettySnapshot) { - // Netty doesn't publish snapshots for macos artifacts - runtimeOnly( group:"io.netty", name:"netty-transport-native-kqueue", classifier:"osx-x86_64") - runtimeOnly( group:"io.netty", name:"netty-transport-native-kqueue", classifier:"osx-aarch_64") - } implementation "io.netty:netty-transport-native-unix-common" implementation "io.netty.incubator:netty-incubator-transport-classes-io_uring:$nettyIoUringVersion" - implementation "io.netty.incubator:netty-incubator-transport-native-io_uring:$nettyIoUringVersion" - runtimeOnly( group:"io.netty.incubator", name:"netty-incubator-transport-native-io_uring", version:"$nettyIoUringVersion", classifier:"linux-x86_64") - runtimeOnly( group:"io.netty.incubator", name:"netty-incubator-transport-native-io_uring", version:"$nettyIoUringVersion", classifier:"linux-aarch_64") - runtimeOnly( group:"io.netty", name:"netty-tcnative-boringssl-static", classifier:"linux-x86_64") - 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" + runtimeOnly (group:"io.netty", name:"netty-tcnative-boringssl-static", classifier:"linux-x86_64") + 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") + runtimeOnly "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") + runtimeOnly "io.netty:netty-transport-native-kqueue" + if (!project.ext.isNettySnapshot) { + // Netty doesn't publish snapshots for macos artifacts + runtimeOnly (group:"io.netty", name:"netty-transport-native-kqueue", classifier:"osx-x86_64") + runtimeOnly (group:"io.netty", name:"netty-transport-native-kqueue", classifier:"osx-aarch_64") + } + runtimeOnly "io.netty.incubator:netty-incubator-transport-native-io_uring:$nettyIoUringVersion" + runtimeOnly (group:"io.netty.incubator", name:"netty-incubator-transport-native-io_uring", version:"$nettyIoUringVersion", classifier:"linux-x86_64") + runtimeOnly (group:"io.netty.incubator", name:"netty-incubator-transport-native-io_uring", version:"$nettyIoUringVersion", classifier:"linux-aarch_64") + testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version") testImplementation testFixtures(project(":servicetalk-concurrent-api")) testImplementation testFixtures(project(":servicetalk-concurrent-internal")) diff --git a/servicetalk-transport-netty-internal/gradle.lockfile b/servicetalk-transport-netty-internal/gradle.lockfile index 5b26ecc2dd..dda6900de7 100644 --- a/servicetalk-transport-netty-internal/gradle.lockfile +++ b/servicetalk-transport-netty-internal/gradle.lockfile @@ -3,7 +3,7 @@ # This file is expected to be part of source control. com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath io.netty.incubator:netty-incubator-transport-classes-io_uring:0.0.26.Final=compileClasspath,runtimeClasspath -io.netty.incubator:netty-incubator-transport-native-io_uring:0.0.26.Final=compileClasspath,runtimeClasspath +io.netty.incubator:netty-incubator-transport-native-io_uring:0.0.26.Final=runtimeClasspath io.netty:netty-bom:4.1.116.Final=compileClasspath,runtimeClasspath io.netty:netty-buffer:4.1.116.Final=compileClasspath,runtimeClasspath io.netty:netty-codec:4.1.116.Final=compileClasspath,runtimeClasspath @@ -14,8 +14,8 @@ io.netty:netty-tcnative-boringssl-static:2.0.69.Final=runtimeClasspath io.netty:netty-tcnative-classes:2.0.69.Final=runtimeClasspath io.netty:netty-transport-classes-epoll:4.1.116.Final=compileClasspath,runtimeClasspath io.netty:netty-transport-classes-kqueue:4.1.116.Final=compileClasspath,runtimeClasspath -io.netty:netty-transport-native-epoll:4.1.116.Final=compileClasspath,runtimeClasspath -io.netty:netty-transport-native-kqueue:4.1.116.Final=compileClasspath,runtimeClasspath +io.netty:netty-transport-native-epoll:4.1.116.Final=runtimeClasspath +io.netty:netty-transport-native-kqueue:4.1.116.Final=runtimeClasspath io.netty:netty-transport-native-unix-common:4.1.116.Final=compileClasspath,runtimeClasspath io.netty:netty-transport:4.1.116.Final=compileClasspath,runtimeClasspath org.jctools:jctools-core:4.0.3=runtimeClasspath