From 4466c964e4296821579b89ce54903b433c6b4a15 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 19 Sep 2025 09:21:14 -0700 Subject: [PATCH 1/4] Fix renovate java updates --- .github/renovate.json5 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 3dbcd4f9830..566bef3800a 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -4,6 +4,9 @@ 'config:best-practices', 'helpers:pinGitHubActionDigestsToSemver', ], + ignorePresets: [ + 'workarounds:javaLTSVersions', // Allow all Java major versions, not just LTS + ], ignorePaths: [], // overwrite default ignore which includes **/test/** // used to update docker image versions used in Java test files packageRules: [ From 551b5d58d318b0778113a6d18498e2c414c0002d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 19 Sep 2025 17:12:29 +0000 Subject: [PATCH 2/4] Initial plan From ac90ce1f500062f3a1f66d24ffb6900fcd2d34a9 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 19 Sep 2025 17:30:42 +0000 Subject: [PATCH 3/4] Fix Gradle warnings: resolved Kotlin API deprecations Co-authored-by: trask <218610+trask@users.noreply.github.com> --- all/build.gradle.kts | 2 ++ .../kotlin/io/opentelemetry/gradle/OtelVersionClassPlugin.kt | 2 +- buildSrc/src/main/kotlin/otel.jacoco-conventions.gradle.kts | 2 ++ buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/all/build.gradle.kts b/all/build.gradle.kts index 2cd16981fbb..9fbc606d93f 100644 --- a/all/build.gradle.kts +++ b/all/build.gradle.kts @@ -51,6 +51,7 @@ dependencies { // https://docs.gradle.org/current/samples/sample_jvm_multi_project_with_code_coverage.html val sourcesPath by configurations.creating { + @Suppress("DEPRECATION") isVisible = false isCanBeResolved = true isCanBeConsumed = false @@ -63,6 +64,7 @@ val sourcesPath by configurations.creating { } val coverageDataPath by configurations.creating { + @Suppress("DEPRECATION") isVisible = false isCanBeResolved = true isCanBeConsumed = false diff --git a/buildSrc/src/main/kotlin/io/opentelemetry/gradle/OtelVersionClassPlugin.kt b/buildSrc/src/main/kotlin/io/opentelemetry/gradle/OtelVersionClassPlugin.kt index 1eaa042a24f..bfd79a403e3 100644 --- a/buildSrc/src/main/kotlin/io/opentelemetry/gradle/OtelVersionClassPlugin.kt +++ b/buildSrc/src/main/kotlin/io/opentelemetry/gradle/OtelVersionClassPlugin.kt @@ -18,7 +18,7 @@ class OtelVersionClassPlugin : Plugin { override fun apply(project: Project) { project.plugins.apply(JavaPlugin::class.java) - project.task("generateOtelVersionClass") { + project.tasks.register("generateOtelVersionClass") { doLast { writeFile(project) } diff --git a/buildSrc/src/main/kotlin/otel.jacoco-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.jacoco-conventions.gradle.kts index 07c2f5e8d62..a79f8a0f714 100644 --- a/buildSrc/src/main/kotlin/otel.jacoco-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.jacoco-conventions.gradle.kts @@ -19,6 +19,7 @@ configurations { val implementation by getting create("transitiveSourceElements") { + @Suppress("DEPRECATION") isVisible = false isCanBeResolved = false isCanBeConsumed = true @@ -34,6 +35,7 @@ configurations { } create("coverageDataElements") { + @Suppress("DEPRECATION") isVisible = false isCanBeResolved = false isCanBeConsumed = true diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts index 18ed4de9779..36635cdb680 100644 --- a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts @@ -206,6 +206,7 @@ configurations.configureEach { val dependencyManagement by configurations.creating { isCanBeConsumed = false isCanBeResolved = false + @Suppress("DEPRECATION") isVisible = false } From aab872c95480a735a80c720a700888969e43e6de Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 19 Sep 2025 18:59:51 +0000 Subject: [PATCH 4/4] Remove deprecated isVisible property instead of suppressing warnings Co-authored-by: trask <218610+trask@users.noreply.github.com> --- all/build.gradle.kts | 4 ---- buildSrc/src/main/kotlin/otel.jacoco-conventions.gradle.kts | 4 ---- buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts | 2 -- 3 files changed, 10 deletions(-) diff --git a/all/build.gradle.kts b/all/build.gradle.kts index 9fbc606d93f..560e9184ca4 100644 --- a/all/build.gradle.kts +++ b/all/build.gradle.kts @@ -51,8 +51,6 @@ dependencies { // https://docs.gradle.org/current/samples/sample_jvm_multi_project_with_code_coverage.html val sourcesPath by configurations.creating { - @Suppress("DEPRECATION") - isVisible = false isCanBeResolved = true isCanBeConsumed = false extendsFrom(configurations.implementation.get()) @@ -64,8 +62,6 @@ val sourcesPath by configurations.creating { } val coverageDataPath by configurations.creating { - @Suppress("DEPRECATION") - isVisible = false isCanBeResolved = true isCanBeConsumed = false extendsFrom(configurations.implementation.get()) diff --git a/buildSrc/src/main/kotlin/otel.jacoco-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.jacoco-conventions.gradle.kts index a79f8a0f714..be99e431c87 100644 --- a/buildSrc/src/main/kotlin/otel.jacoco-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.jacoco-conventions.gradle.kts @@ -19,8 +19,6 @@ configurations { val implementation by getting create("transitiveSourceElements") { - @Suppress("DEPRECATION") - isVisible = false isCanBeResolved = false isCanBeConsumed = true extendsFrom(implementation) @@ -35,8 +33,6 @@ configurations { } create("coverageDataElements") { - @Suppress("DEPRECATION") - isVisible = false isCanBeResolved = false isCanBeConsumed = true extendsFrom(implementation) diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts index 36635cdb680..314d64b7a22 100644 --- a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts @@ -206,8 +206,6 @@ configurations.configureEach { val dependencyManagement by configurations.creating { isCanBeConsumed = false isCanBeResolved = false - @Suppress("DEPRECATION") - isVisible = false } dependencies {