From 64977bae6bb5feeb24d3b7285088aedc003294cb Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 5 Jul 2022 19:17:41 -0700 Subject: [PATCH] Consistent version management (#381) --- dependencyManagement/build.gradle.kts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 81fcdbb6..9c4612bc 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -11,6 +11,8 @@ data class DependencySet(val group: String, val version: String, val modules: Li val dependencyVersions = hashMapOf() rootProject.extra["versions"] = dependencyVersions +val otelVersion = "1.15.0" + val DEPENDENCY_BOMS = listOf( "com.fasterxml.jackson:jackson-bom:2.13.2.20220328", "com.google.guava:guava-bom:31.0.1-jre", @@ -18,9 +20,9 @@ val DEPENDENCY_BOMS = listOf( "org.junit:junit-bom:5.8.2", "com.linecorp.armeria:armeria-bom:1.9.1", "io.grpc:grpc-bom:1.42.1", - "io.opentelemetry:opentelemetry-bom:1.15.0", - "io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha", - "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha", + "io.opentelemetry:opentelemetry-bom:$otelVersion", + "io.opentelemetry:opentelemetry-bom-alpha:${otelVersion}-alpha", + "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelVersion}-alpha", "org.testcontainers:testcontainers-bom:1.16.3" ) @@ -58,7 +60,7 @@ val DEPENDENCY_SETS = listOf( ) val DEPENDENCIES = listOf( - "io.opentelemetry.javaagent:opentelemetry-javaagent:1.14.0", + "io.opentelemetry.javaagent:opentelemetry-javaagent:$otelVersion", "com.google.code.findbugs:annotations:3.0.1u2", "com.google.code.findbugs:jsr305:3.0.2", "com.squareup.okhttp3:okhttp:4.9.3",