From ab49b66c703154c4f2ddb4f1e44b3bc221a36f6e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 20 May 2026 14:06:37 +0000 Subject: [PATCH 1/4] Update all patch and minor versions --- buildSrc/build.gradle.kts | 4 ++-- dependencyManagement/build.gradle.kts | 8 ++++---- integration-tests/osgi/build.gradle.kts | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 277eb07e9a0..835efa11f99 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -34,7 +34,7 @@ repositories { dependencies { implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:7.2.3") - implementation(enforcedPlatform("com.squareup.wire:wire-bom:6.3.0")) + implementation(enforcedPlatform("com.squareup.wire:wire-bom:6.4.0")) implementation("com.google.auto.value:auto-value-annotations:1.11.1") // When updating, update above in plugins too implementation("com.diffplug.spotless:spotless-plugin-gradle:8.4.0") @@ -48,7 +48,7 @@ dependencies { implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.3") implementation("net.ltgt.gradle:gradle-errorprone-plugin:5.1.0") implementation("net.ltgt.gradle:gradle-nullaway-plugin:3.0.0") - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21") implementation("org.sonatype.gradle.plugins:scan-gradle-plugin:3.1.5") implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1") } diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index e936a84952c..7c4fb79b62b 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -13,9 +13,9 @@ val errorProneVersion = "2.49.0" val jmhVersion = "1.37" // Mockito 5.x.x requires Java 11 https://github.com/mockito/mockito/releases/tag/v5.0.0 val mockitoVersion = "4.11.0" -val slf4jVersion = "2.0.17" +val slf4jVersion = "2.0.18" val opencensusVersion = "0.31.1" -val prometheusServerVersion = "1.5.1" +val prometheusServerVersion = "1.6.1" val armeriaVersion = "1.39.0" val junitVersion = "5.14.4" val okhttpVersion = "5.3.2" @@ -28,7 +28,7 @@ val DEPENDENCY_BOMS = listOf( "com.fasterxml.jackson:jackson-bom:2.21.3", "com.google.guava:guava-bom:33.6.0-jre", - "com.google.protobuf:protobuf-bom:4.34.1", + "com.google.protobuf:protobuf-bom:4.35.0", "com.squareup.okhttp3:okhttp-bom:$okhttpVersion", "com.squareup.okio:okio-bom:3.17.0", // applies to transitive dependencies of okhttp "io.grpc:grpc-bom:1.81.0", @@ -82,7 +82,7 @@ val DEPENDENCIES = listOf( "io.github.crac:org-crac:0.1.3", "io.github.netmikey.logunit:logunit-jul:2.0.0", "io.jaegertracing:jaeger-client:1.8.1", - "io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:1.56.0-alpha", + "io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:1.57.0-alpha", "io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.41.1-alpha", "io.opentelemetry.proto:opentelemetry-proto:1.10.0-alpha", "io.opentracing:opentracing-api:0.33.0", diff --git a/integration-tests/osgi/build.gradle.kts b/integration-tests/osgi/build.gradle.kts index fcfcebbb16e..0b867c58fb3 100644 --- a/integration-tests/osgi/build.gradle.kts +++ b/integration-tests/osgi/build.gradle.kts @@ -16,8 +16,8 @@ otelJava.moduleName.set("io.opentelemetry.integration.tests.osgi") configurations.all { resolutionStrategy { // BND not compatible with JUnit 5.13+; see https://github.com/bndtools/bnd/issues/6651 - val junitVersion = "5.12.2" - val junitLauncherVersion = "1.12.1" + val junitVersion = "5.14.4" + val junitLauncherVersion = "1.14.4" force("org.junit.jupiter:junit-jupiter:$junitVersion") force("org.junit.jupiter:junit-jupiter-api:$junitVersion") force("org.junit.jupiter:junit-jupiter-params:$junitVersion") From f4f9d3e174076fe06104dbbde615019e3164d199 Mon Sep 17 00:00:00 2001 From: Jack Berg <34418638+jack-berg@users.noreply.github.com> Date: Wed, 20 May 2026 09:17:16 -0500 Subject: [PATCH 2/4] Revert osgi junit update, add renovate exclusion rule --- .github/renovate.json5 | 13 +++++++++++++ integration-tests/osgi/build.gradle.kts | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index ee87d2149ea..6c80a0c43d8 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -76,6 +76,19 @@ // ── Disabled updates (Java version compatibility) ────────────────── + { + // BND not compatible with JUnit 5.13+; pin until bnd 7.3.0 releases + // https://github.com/open-telemetry/opentelemetry-java/pull/8377#discussion_r3204444953 + // https://github.com/bndtools/bnd/issues/7239 + // https://github.com/bndtools/bnd/issues/6651 + matchFileNames: ['integration-tests/osgi/build.gradle.kts'], + matchPackageNames: [ + 'org.junit:**', + 'org.junit.jupiter:**', + 'org.junit.platform:**', + ], + enabled: false, + }, { // junit 6+ requires Java 17+ matchPackageNames: [ diff --git a/integration-tests/osgi/build.gradle.kts b/integration-tests/osgi/build.gradle.kts index 0b867c58fb3..fcfcebbb16e 100644 --- a/integration-tests/osgi/build.gradle.kts +++ b/integration-tests/osgi/build.gradle.kts @@ -16,8 +16,8 @@ otelJava.moduleName.set("io.opentelemetry.integration.tests.osgi") configurations.all { resolutionStrategy { // BND not compatible with JUnit 5.13+; see https://github.com/bndtools/bnd/issues/6651 - val junitVersion = "5.14.4" - val junitLauncherVersion = "1.14.4" + val junitVersion = "5.12.2" + val junitLauncherVersion = "1.12.1" force("org.junit.jupiter:junit-jupiter:$junitVersion") force("org.junit.jupiter:junit-jupiter-api:$junitVersion") force("org.junit.jupiter:junit-jupiter-params:$junitVersion") From f686d1cd84c5bcb154ad967b9abf5ccf2b82f98c Mon Sep 17 00:00:00 2001 From: Jack Berg <34418638+jack-berg@users.noreply.github.com> Date: Wed, 20 May 2026 09:48:42 -0500 Subject: [PATCH 3/4] Bump osgi junit version to the latest --- dependencyManagement/build.gradle.kts | 4 ++++ integration-tests/osgi/build.gradle.kts | 13 ------------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 7c4fb79b62b..d07e034e7cc 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -18,6 +18,7 @@ val opencensusVersion = "0.31.1" val prometheusServerVersion = "1.6.1" val armeriaVersion = "1.39.0" val junitVersion = "5.14.4" +val junitPlatformVersion = "1.14.4" val okhttpVersion = "5.3.2" val DEPENDENCY_BOMS = listOf( @@ -42,8 +43,11 @@ val DEPENDENCY_BOMS = listOf( ) val DEPENDENCIES = listOf( + "org.junit.jupiter:junit-jupiter:${junitVersion}", "org.junit.jupiter:junit-jupiter-api:${junitVersion}", + "org.junit.jupiter:junit-jupiter-engine:${junitVersion}", "org.junit.jupiter:junit-jupiter-params:${junitVersion}", + "org.junit.platform:junit-platform-launcher:${junitPlatformVersion}", "com.linecorp.armeria:armeria:${armeriaVersion}", "com.linecorp.armeria:armeria-grpc:${armeriaVersion}", "com.linecorp.armeria:armeria-grpc-protocol:${armeriaVersion}", diff --git a/integration-tests/osgi/build.gradle.kts b/integration-tests/osgi/build.gradle.kts index fcfcebbb16e..c13bbfdf892 100644 --- a/integration-tests/osgi/build.gradle.kts +++ b/integration-tests/osgi/build.gradle.kts @@ -13,19 +13,6 @@ otelJava.moduleName.set("io.opentelemetry.integration.tests.osgi") // https://github.com/micrometer-metrics/micrometer/tree/main/micrometer-osgi-test // https://github.com/eclipse-osgi-technology/osgi-test/tree/main/examples/osgi-test-example-gradle -configurations.all { - resolutionStrategy { - // BND not compatible with JUnit 5.13+; see https://github.com/bndtools/bnd/issues/6651 - val junitVersion = "5.12.2" - val junitLauncherVersion = "1.12.1" - force("org.junit.jupiter:junit-jupiter:$junitVersion") - force("org.junit.jupiter:junit-jupiter-api:$junitVersion") - force("org.junit.jupiter:junit-jupiter-params:$junitVersion") - force("org.junit.jupiter:junit-jupiter-engine:$junitVersion") - force("org.junit.platform:junit-platform-launcher:$junitLauncherVersion") - } -} - // OSGi test infrastructure shared across all suites. // Each suite's source set automatically inherits these via registerOsgiSuite(). val osgiInfraImplementation: Configuration = configurations.create("osgiInfraImplementation") { From 2a368a444a2792ec6b659d3013c3ef0f1acf1072 Mon Sep 17 00:00:00 2001 From: Jack Berg <34418638+jack-berg@users.noreply.github.com> Date: Wed, 20 May 2026 13:22:45 -0500 Subject: [PATCH 4/4] Disable prometheus minor updates, update kotlin to 1.9 --- .github/renovate.json5 | 18 +++++++----------- VERSIONING.md | 2 +- dependencyManagement/build.gradle.kts | 2 +- extensions/kotlin/build.gradle.kts | 2 +- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 6c80a0c43d8..1cff2b95654 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -73,22 +73,18 @@ 'com.diffplug.spotless:**', ], }, - - // ── Disabled updates (Java version compatibility) ────────────────── - + // Disable prometheus minor updates while working out translation strategy + // https://github.com/open-telemetry/opentelemetry-java/pull/8346 { - // BND not compatible with JUnit 5.13+; pin until bnd 7.3.0 releases - // https://github.com/open-telemetry/opentelemetry-java/pull/8377#discussion_r3204444953 - // https://github.com/bndtools/bnd/issues/7239 - // https://github.com/bndtools/bnd/issues/6651 - matchFileNames: ['integration-tests/osgi/build.gradle.kts'], matchPackageNames: [ - 'org.junit:**', - 'org.junit.jupiter:**', - 'org.junit.platform:**', + 'io.prometheus:**', + ], + matchUpdateTypes: [ + 'minor', ], enabled: false, }, + // ── Disabled updates (Java version compatibility) ────────────────── { // junit 6+ requires Java 17+ matchPackageNames: [ diff --git a/VERSIONING.md b/VERSIONING.md index 94f5a33db3a..c09f467a7a4 100644 --- a/VERSIONING.md +++ b/VERSIONING.md @@ -73,7 +73,7 @@ respect to semantic versioning. |----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | Java | 8+ | All artifacts, unless otherwise noted | Changing requires major version bump. | | Android | 23+ (NOTE: [desugaring](https://developer.android.com/studio/write/java8-support#library-desugaring) is required. We stay up to date with the latest version of [desugar_jdk_libs](https://github.com/google/desugar_jdk_libs).) | Artifacts using `otel.animalsniffer-conventions` plugin | Kept in sync with minimum requirements for [Google Play services](https://developers.google.com/android/guides/setup). Subject to change in minor version. | -| Kotlin | 1.8+ | Only applies to `opentelemetry-extension-kotlin` | Kept in sync with [minimum non-deprecated](https://kotlinlang.org/docs/gradle-compiler-options.html#attributes-common-to-jvm-and-javascript) version. Subject to change in minor versions. | +| Kotlin | 1.9+ | Only applies to `opentelemetry-extension-kotlin` | Kept in sync with [minimum non-deprecated](https://kotlinlang.org/docs/gradle-compiler-options.html#attributes-common-to-jvm-and-javascript) version. Subject to change in minor versions. | ## API vs SDK diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index d07e034e7cc..93e89248b52 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -15,7 +15,7 @@ val jmhVersion = "1.37" val mockitoVersion = "4.11.0" val slf4jVersion = "2.0.18" val opencensusVersion = "0.31.1" -val prometheusServerVersion = "1.6.1" +val prometheusServerVersion = "1.5.1" val armeriaVersion = "1.39.0" val junitVersion = "5.14.4" val junitPlatformVersion = "1.14.4" diff --git a/extensions/kotlin/build.gradle.kts b/extensions/kotlin/build.gradle.kts index 75ef645ca70..5d49535a159 100644 --- a/extensions/kotlin/build.gradle.kts +++ b/extensions/kotlin/build.gradle.kts @@ -50,7 +50,7 @@ tasks { withType(KotlinJvmCompile::class) { compilerOptions { jvmTarget.set(JvmTarget.JVM_1_8) - apiVersion.set(KotlinVersion.KOTLIN_1_8) + apiVersion.set(KotlinVersion.KOTLIN_1_9) } }