From 47c3b15043722e4f84d634f73153f100a6a3a8cf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 28 May 2025 10:43:56 +0000 Subject: [PATCH 1/2] fix(deps): update dependency com.squareup.okio:okio-bom to v3.12.0 --- dependencyManagement/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 08b22a1b05ae..93b3aabaa3af 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -28,7 +28,7 @@ val DEPENDENCY_BOMS = listOf( // even if they are only used by test dependencies, so not using junit bom since it is LGPL "com.fasterxml.jackson:jackson-bom:2.19.0", - "com.squareup.okio:okio-bom:3.11.0", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637 + "com.squareup.okio:okio-bom:3.12.0", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637 "com.google.guava:guava-bom:33.4.8-jre", "org.apache.groovy:groovy-bom:${groovyVersion}", "io.opentelemetry:opentelemetry-bom:${otelSdkVersion}", From 8e397b8eebda5c2a3ee44906c0de6b644666b610 Mon Sep 17 00:00:00 2001 From: otelbot <197425009+otelbot@users.noreply.github.com> Date: Wed, 28 May 2025 11:14:02 +0000 Subject: [PATCH 2/2] ./gradlew spotlessApply --- licenses/licenses.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/licenses/licenses.md b/licenses/licenses.md index 6200bf2ddb4c..a846f22964a6 100644 --- a/licenses/licenses.md +++ b/licenses/licenses.md @@ -54,11 +54,11 @@ > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) > - **Embedded license files**: [okhttp-4.12.0.jar/okhttp3/internal/publicsuffix/NOTICE](okhttp-4.12.0.jar/okhttp3/internal/publicsuffix/NOTICE) -**10** **Group:** `com.squareup.okio` **Name:** `okio` **Version:** `3.11.0` +**10** **Group:** `com.squareup.okio` **Name:** `okio` **Version:** `3.12.0` > - **POM Project URL**: [https://github.com/square/okio/](https://github.com/square/okio/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**11** **Group:** `com.squareup.okio` **Name:** `okio-jvm` **Version:** `3.11.0` +**11** **Group:** `com.squareup.okio` **Name:** `okio-jvm` **Version:** `3.12.0` > - **POM Project URL**: [https://github.com/square/okio/](https://github.com/square/okio/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) @@ -233,7 +233,7 @@ > - **POM Project URL**: [http://www.jetbrains.org](http://www.jetbrains.org) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**53** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib` **Version:** `2.1.20` +**53** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib` **Version:** `2.1.21` > - **POM Project URL**: [https://kotlinlang.org/](https://kotlinlang.org/) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)