From 924660287fe5efd9a91e25dbd662426353a717bb Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 9 Oct 2024 15:23:40 -0700 Subject: [PATCH] Rename gradle property --- agent/runtime-attach/build.gradle.kts | 1 - dependencyManagement/build.gradle.kts | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/agent/runtime-attach/build.gradle.kts b/agent/runtime-attach/build.gradle.kts index 9225e92f027..b221e429286 100644 --- a/agent/runtime-attach/build.gradle.kts +++ b/agent/runtime-attach/build.gradle.kts @@ -6,7 +6,6 @@ plugins { base.archivesName.set("applicationinsights-runtime-attach") val otelContribAlphaVersion: String by project -val otelVersion: String by project val agent: Configuration by configurations.creating dependencies { diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index bb178947388..85921274763 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -11,19 +11,19 @@ data class DependencySet(val group: String, val version: String, val modules: Li val dependencyVersions = hashMapOf() rootProject.extra["versions"] = dependencyVersions -val otelVersion = "1.42.1" +val otelSdkVersion = "1.42.1" val otelInstrumentationAlphaVersion = "2.8.0-alpha" val otelInstrumentationVersion = "2.8.0" val byteBuddyVersion = "1.14.11" -rootProject.extra["otelVersion"] = otelVersion +rootProject.extra["otelSdkVersion"] = otelSdkVersion rootProject.extra["otelInstrumentationVersion"] = otelInstrumentationVersion rootProject.extra["otelInstrumentationAlphaVersion"] = otelInstrumentationAlphaVersion val DEPENDENCY_BOMS = listOf( "com.fasterxml.jackson:jackson-bom:2.17.2", - "io.opentelemetry:opentelemetry-bom:${otelVersion}", - "io.opentelemetry:opentelemetry-bom-alpha:${otelVersion}-alpha", + "io.opentelemetry:opentelemetry-bom:${otelSdkVersion}", + "io.opentelemetry:opentelemetry-bom-alpha:${otelSdkVersion}-alpha", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:${otelInstrumentationVersion}", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationAlphaVersion}", "com.azure:azure-sdk-bom:1.2.28",