From 01d0c1f13c49d258c3823b886c9933ecbff26850 Mon Sep 17 00:00:00 2001 From: Alexey Zhokhov Date: Mon, 20 Nov 2023 22:10:51 +0400 Subject: [PATCH] Up dependencies. --- gradle/libs.versions.toml | 15 ++++++++++++--- jambalaya-checks-jooq/build.gradle.kts | 2 +- jambalaya-checks/build.gradle.kts | 2 +- jambalaya-example-grpc-interface/build.gradle.kts | 8 ++++---- jambalaya-example-jooq/build.gradle.kts | 4 ++-- jambalaya-jsr310/build.gradle.kts | 2 +- jambalaya-junit-opentelemetry/build.gradle.kts | 6 +++--- .../opentelemetry/OpenTelemetryExtension.java | 10 +++++----- jambalaya-kotlin-test/build.gradle.kts | 2 +- .../build.gradle.kts | 4 ++-- jambalaya-opentelemetry/build.gradle.kts | 2 +- jambalaya-tenancy-grpc-interface/build.gradle.kts | 4 ++-- publish-sonatype-release.sh | 2 +- 13 files changed, 36 insertions(+), 27 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bd82346..408a1bb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,17 +25,21 @@ jambalaya-tenancy-spock = "0.6.0" # Libraries apollo = "3.8.2" common-protos = "2.26.0" -graphql-data-loader = "3.2.1" -grpc = "1.58.0" +graphql-data-loader = "3.2.2" +grpc = "1.59.0" guava = "31.1-jre" mapstruct = "1.5.5.Final" -micronaut = "4.1.5" +micronaut = "4.2.0" okhttp = "4.10.0" protobuf = "3.24.4" slugify = "3.0.6" error-prone = "2.23.0" icu4j = "72.1" spock = "2.3-groovy-4.0" +jooq = "3.18.7" +opentelemetry = "1.32.0" +opentelemetry-semconv = "1.22.0-alpha" +spotbugs = "4.8.0" [libraries] # Libraries @@ -56,3 +60,8 @@ tomcat-annotations-api = { module = "org.apache.tomcat:annotations-api", version error-prone-annotations = { module = "com.google.errorprone:error_prone_annotations", version.ref = "error-prone" } icu4j = { module = "com.ibm.icu:icu4j", version.ref = "icu4j" } spock-core = { module = "org.spockframework:spock-core", version.ref = "spock" } +micronaut-inject-java = { module = "io.micronaut:micronaut-inject-java", version.ref = "micronaut" } +jooq = { module = "org.jooq:jooq", version.ref = "jooq" } +opentelemetry-api = { module = "io.opentelemetry:opentelemetry-api", version.ref = "opentelemetry" } +opentelemetry-semconv = { module = "io.opentelemetry.semconv:opentelemetry-semconv", version.ref = "opentelemetry-semconv" } +spotbugs-annotations = { module = "com.github.spotbugs:spotbugs-annotations", version.ref = "spotbugs" } diff --git a/jambalaya-checks-jooq/build.gradle.kts b/jambalaya-checks-jooq/build.gradle.kts index 3e8d9e3..7569eab 100644 --- a/jambalaya-checks-jooq/build.gradle.kts +++ b/jambalaya-checks-jooq/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { api(project(":jambalaya-checks")) testImplementation(project(":jambalaya-example-jooq")) - implementation("org.jooq:jooq:3.18.7") + implementation(jambalayaLibs.jooq) // Kotlin testImplementation(kotlin("stdlib-jdk8")) diff --git a/jambalaya-checks/build.gradle.kts b/jambalaya-checks/build.gradle.kts index 221bc9c..704d82e 100644 --- a/jambalaya-checks/build.gradle.kts +++ b/jambalaya-checks/build.gradle.kts @@ -10,7 +10,7 @@ description = "Preconditions." apply(plugin = "jambalaya-library-conventions") dependencies { - api("com.github.spotbugs:spotbugs-annotations:4.8.0") + api(jambalayaLibs.spotbugs.annotations) // Kotlin testImplementation(kotlin("stdlib-jdk8")) diff --git a/jambalaya-example-grpc-interface/build.gradle.kts b/jambalaya-example-grpc-interface/build.gradle.kts index d13ae11..c572292 100644 --- a/jambalaya-example-grpc-interface/build.gradle.kts +++ b/jambalaya-example-grpc-interface/build.gradle.kts @@ -7,10 +7,10 @@ plugins { dependencies { // gRPC - api("io.grpc:grpc-protobuf:1.58.0") - api("io.grpc:grpc-services:1.58.0") - api("io.grpc:grpc-stub:1.58.0") - api("io.grpc:grpc-netty-shaded:1.58.0") + api("io.grpc:grpc-protobuf:${jambalayaLibs.versions.grpc.get()}") + api("io.grpc:grpc-services:${jambalayaLibs.versions.grpc.get()}") + api("io.grpc:grpc-stub:${jambalayaLibs.versions.grpc.get()}") + api("io.grpc:grpc-netty-shaded:${jambalayaLibs.versions.grpc.get()}") compileOnly(jambalayaLibs.tomcat.annotations.api) } diff --git a/jambalaya-example-jooq/build.gradle.kts b/jambalaya-example-jooq/build.gradle.kts index b18c3c0..e988230 100644 --- a/jambalaya-example-jooq/build.gradle.kts +++ b/jambalaya-example-jooq/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api("org.jooq:jooq:3.18.7") + api(jambalayaLibs.jooq) - api("com.github.spotbugs:spotbugs-annotations:4.8.0") + api(jambalayaLibs.spotbugs.annotations) } diff --git a/jambalaya-jsr310/build.gradle.kts b/jambalaya-jsr310/build.gradle.kts index ebeb434..11a1ca2 100644 --- a/jambalaya-jsr310/build.gradle.kts +++ b/jambalaya-jsr310/build.gradle.kts @@ -10,7 +10,7 @@ description = "JSR 310 utils." apply(plugin = "jambalaya-library-conventions") dependencies { - api("com.github.spotbugs:spotbugs-annotations:4.8.0") + api(jambalayaLibs.spotbugs.annotations) // Kotlin testImplementation(kotlin("stdlib-jdk8")) diff --git a/jambalaya-junit-opentelemetry/build.gradle.kts b/jambalaya-junit-opentelemetry/build.gradle.kts index 29ba4b5..4a4cd86 100644 --- a/jambalaya-junit-opentelemetry/build.gradle.kts +++ b/jambalaya-junit-opentelemetry/build.gradle.kts @@ -10,10 +10,10 @@ apply(plugin = "jambalaya-library-conventions") dependencies { // OpenTelemetry - api("io.opentelemetry:opentelemetry-api:1.31.0") - api("io.opentelemetry:opentelemetry-semconv:1.30.1-alpha") + api(jambalayaLibs.opentelemetry.api) + api(jambalayaLibs.opentelemetry.semconv) - api("com.github.spotbugs:spotbugs-annotations:4.8.0") + api(jambalayaLibs.spotbugs.annotations) // JUnit implementation("org.junit.jupiter:junit-jupiter-api:5.10.0") diff --git a/jambalaya-junit-opentelemetry/src/main/java/com/tailrocks/jambalaya/junit/opentelemetry/OpenTelemetryExtension.java b/jambalaya-junit-opentelemetry/src/main/java/com/tailrocks/jambalaya/junit/opentelemetry/OpenTelemetryExtension.java index 97a8101..866b888 100644 --- a/jambalaya-junit-opentelemetry/src/main/java/com/tailrocks/jambalaya/junit/opentelemetry/OpenTelemetryExtension.java +++ b/jambalaya-junit-opentelemetry/src/main/java/com/tailrocks/jambalaya/junit/opentelemetry/OpenTelemetryExtension.java @@ -32,10 +32,10 @@ import java.util.Map; import java.util.logging.Logger; -import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.CODE_FUNCTION; -import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.CODE_NAMESPACE; -import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.THREAD_ID; -import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.THREAD_NAME; +import static io.opentelemetry.semconv.SemanticAttributes.CODE_FUNCTION; +import static io.opentelemetry.semconv.SemanticAttributes.CODE_NAMESPACE; +import static io.opentelemetry.semconv.SemanticAttributes.THREAD_ID; +import static io.opentelemetry.semconv.SemanticAttributes.THREAD_NAME; /** * @author Alexey Zhokhov @@ -64,7 +64,7 @@ private static Span startSpan(String spanName) { public void beforeEach(ExtensionContext context) { Span span = startSpan(context.getDisplayName()); - span.setAttribute(THREAD_ID, Thread.currentThread().getId()); + span.setAttribute(THREAD_ID, Thread.currentThread().threadId()); span.setAttribute(THREAD_NAME, Thread.currentThread().getName()); span.setAttribute(CODE_FUNCTION, context.getRequiredTestMethod().getName()); span.setAttribute(CODE_NAMESPACE, context.getRequiredTestClass().getName()); diff --git a/jambalaya-kotlin-test/build.gradle.kts b/jambalaya-kotlin-test/build.gradle.kts index b7135e2..f9bac83 100644 --- a/jambalaya-kotlin-test/build.gradle.kts +++ b/jambalaya-kotlin-test/build.gradle.kts @@ -12,7 +12,7 @@ apply(plugin = "jambalaya-library-conventions") dependencies { testImplementation(project(":jambalaya-example-kotlin-test-graphql")) - api("com.github.spotbugs:spotbugs-annotations:4.8.0") + api(jambalayaLibs.spotbugs.annotations) // Kotlin testImplementation(kotlin("stdlib-jdk8")) diff --git a/jambalaya-micronaut-mapstruct-protobuf/build.gradle.kts b/jambalaya-micronaut-mapstruct-protobuf/build.gradle.kts index 26b6373..2ce92de 100644 --- a/jambalaya-micronaut-mapstruct-protobuf/build.gradle.kts +++ b/jambalaya-micronaut-mapstruct-protobuf/build.gradle.kts @@ -20,8 +20,8 @@ dependencies { api(jambalayaLibs.mapstruct) // Micronaut - annotationProcessor("io.micronaut:micronaut-inject-java:4.1.10") - compileOnly("io.micronaut:micronaut-inject-java:4.1.10") + annotationProcessor(jambalayaLibs.micronaut.inject.java) + compileOnly(jambalayaLibs.micronaut.inject.java) // Kotlin testImplementation(kotlin("stdlib-jdk8")) diff --git a/jambalaya-opentelemetry/build.gradle.kts b/jambalaya-opentelemetry/build.gradle.kts index 964a9fc..0775274 100644 --- a/jambalaya-opentelemetry/build.gradle.kts +++ b/jambalaya-opentelemetry/build.gradle.kts @@ -10,7 +10,7 @@ apply(plugin = "jambalaya-library-conventions") dependencies { // OpenTelemetry - api("io.opentelemetry:opentelemetry-api:1.31.0") + api(jambalayaLibs.opentelemetry.api) compileOnly(jambalayaLibs.error.prone.annotations) } diff --git a/jambalaya-tenancy-grpc-interface/build.gradle.kts b/jambalaya-tenancy-grpc-interface/build.gradle.kts index bc562c4..1135cf6 100644 --- a/jambalaya-tenancy-grpc-interface/build.gradle.kts +++ b/jambalaya-tenancy-grpc-interface/build.gradle.kts @@ -12,8 +12,8 @@ apply(plugin = "jambalaya-library-conventions") dependencies { // gRPC - api("io.grpc:grpc-protobuf:1.58.0") - api("io.grpc:grpc-stub:1.58.0") + api("io.grpc:grpc-protobuf:${jambalayaLibs.versions.grpc.get()}") + api("io.grpc:grpc-stub:${jambalayaLibs.versions.grpc.get()}") // TODO remove me later compileOnly("javax.annotation:javax.annotation-api:1.3.2") diff --git a/publish-sonatype-release.sh b/publish-sonatype-release.sh index d338f38..cf38327 100755 --- a/publish-sonatype-release.sh +++ b/publish-sonatype-release.sh @@ -24,4 +24,4 @@ set -e ./jambalaya-tenancy-grpc-interface/publish-sonatype-release.sh ./jambalaya-tenancy-jooq/publish-sonatype-release.sh ./jambalaya-tenancy-junit/publish-sonatype-release.sh -./jambalaya-tenancy-spock/publish-sonatype-release.sh +#./jambalaya-tenancy-spock/publish-sonatype-release.sh