From d8debf128cf41300d6e67477ead0ccb6a600b566 Mon Sep 17 00:00:00 2001 From: Christopher Grote Date: Fri, 13 Dec 2024 13:22:35 +0000 Subject: [PATCH 1/2] Force consistent versions of open telemetry dependencies Signed-off-by: Christopher Grote --- build.gradle.kts | 2 ++ .../main/kotlin/com.atlan.kotlin-custom-package.gradle.kts | 2 ++ buildSrc/src/main/kotlin/com.atlan.kotlin.gradle.kts | 2 ++ gradle/libs.versions.toml | 4 ++-- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 36bbdfb6d1..65c385d9d8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,6 +35,8 @@ configurations.all { libs.commons.io, libs.jetty.http, libs.netty.common, + libs.otel.sdk, + libs.otel.exporter, ) } } diff --git a/buildSrc/src/main/kotlin/com.atlan.kotlin-custom-package.gradle.kts b/buildSrc/src/main/kotlin/com.atlan.kotlin-custom-package.gradle.kts index dbd0efda5b..c834f6f60e 100644 --- a/buildSrc/src/main/kotlin/com.atlan.kotlin-custom-package.gradle.kts +++ b/buildSrc/src/main/kotlin/com.atlan.kotlin-custom-package.gradle.kts @@ -94,6 +94,8 @@ configurations.all { versionCatalogs.named("libs").findLibrary("guava").orElseThrow(::AssertionError), versionCatalogs.named("libs").findLibrary("commons-compress").orElseThrow(::AssertionError), versionCatalogs.named("libs").findLibrary("commons-io").orElseThrow(::AssertionError), + versionCatalogs.named("libs").findLibrary("otel-sdk").orElseThrow(::AssertionError), + versionCatalogs.named("libs").findLibrary("otel-exporter").orElseThrow(::AssertionError), ) } } diff --git a/buildSrc/src/main/kotlin/com.atlan.kotlin.gradle.kts b/buildSrc/src/main/kotlin/com.atlan.kotlin.gradle.kts index 96bba4bca4..1b35300050 100644 --- a/buildSrc/src/main/kotlin/com.atlan.kotlin.gradle.kts +++ b/buildSrc/src/main/kotlin/com.atlan.kotlin.gradle.kts @@ -43,6 +43,8 @@ configurations.all { versionCatalogs.named("libs").findLibrary("guava").orElseThrow(::AssertionError), versionCatalogs.named("libs").findLibrary("commons-compress").orElseThrow(::AssertionError), versionCatalogs.named("libs").findLibrary("commons-io").orElseThrow(::AssertionError), + versionCatalogs.named("libs").findLibrary("otel-sdk").orElseThrow(::AssertionError), + versionCatalogs.named("libs").findLibrary("otel-exporter").orElseThrow(::AssertionError), ) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a21e83fa35..740af33132 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -32,8 +32,8 @@ kotlin-mu = "3.0.5" rocksdb = "9.7.3" jetty = "12.0.16" netty = "4.1.115.Final" -otel = "1.44.1" -otel-appender = "2.10.0-alpha" +otel = "1.42.1" +otel-appender = "1.33.6-alpha" [libraries] jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" } From c7fcf7fd10b272c07d5244c5dbfa39bc865cfbdc Mon Sep 17 00:00:00 2001 From: Christopher Grote Date: Fri, 13 Dec 2024 13:23:49 +0000 Subject: [PATCH 2/2] Further dependency bumps Signed-off-by: Christopher Grote --- gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 740af33132..b1e23e842a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,20 +1,20 @@ [versions] jackson = "2.18.2" slf4j = "2.0.16" -elasticsearch = "8.16.1" +elasticsearch = "8.17.0" freemarker = "2.3.33" classgraph = "4.8.179" testng = "7.10.2" log4j = "2.24.2" wiremock = "3.10.0" jnanoid = "2.0.0" -awssdk = "2.29.32" +awssdk = "2.29.33" gcs = "26.51.0" system-stubs = "2.1.7" fastcsv = "3.4.0" poi = "5.3.0" parsson = "1.1.7" -simplejavamail = "8.12.3" +simplejavamail = "8.12.4" swagger = "2.1.24" jsonpath = "2.9.0" commons-compress = "1.27.1"