diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index fcdcc901d..05227a8ec 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -7,7 +7,7 @@ data class DependencySet(val group: String, val version: String, val modules: Li val dependencyVersions = hashMapOf() rootProject.extra["versions"] = dependencyVersions -val otelInstrumentationVersion = "2.8.0-alpha" +val otelInstrumentationVersion = "2.9.0-alpha" val DEPENDENCY_BOMS = listOf( "com.fasterxml.jackson:jackson-bom:2.18.0", @@ -36,6 +36,8 @@ val CORE_DEPENDENCIES = listOf( "com.google.errorprone:error_prone_core:${errorProneVersion}", "io.github.netmikey.logunit:logunit-jul:2.0.0", "io.opentelemetry.proto:opentelemetry-proto:1.0.0-alpha", + // these two constraints can be removed once the opentelemetry-instrumentation-bom-alpha + // is updated to contain the latest version of opentelemetry-semconv "io.opentelemetry.semconv:opentelemetry-semconv:${semConvVersion}", "io.opentelemetry.semconv:opentelemetry-semconv-incubating:${semConvVersion}", "io.prometheus:simpleclient:${prometheusVersion}", @@ -76,6 +78,12 @@ javaPlatform { dependencies { for (bom in DEPENDENCY_BOMS) { + // this is needed until io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha + // is updated to contain the latest version of opentelemetry-semconv + if (bom.equals("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}")) { + api(platform(bom)) + continue + } api(enforcedPlatform(bom)) val split = bom.split(':') dependencyVersions[split[0]] = split[2] diff --git a/jmx-scraper/build.gradle.kts b/jmx-scraper/build.gradle.kts index 8c2a84675..c2e7eb387 100644 --- a/jmx-scraper/build.gradle.kts +++ b/jmx-scraper/build.gradle.kts @@ -13,19 +13,7 @@ otelJava.moduleName.set("io.opentelemetry.contrib.jmxscraper") application.mainClass.set("io.opentelemetry.contrib.jmxscraper.JmxScraper") -repositories { - mavenCentral() - mavenLocal() - // TODO: remove snapshot repository once 2.9.0 is released - maven { - setUrl("https://oss.sonatype.org/content/repositories/snapshots") - } -} - dependencies { - // TODO remove snapshot dependency on upstream once 2.9.0 is released - api(enforcedPlatform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha-SNAPSHOT")) - implementation("io.opentelemetry:opentelemetry-api") implementation("io.opentelemetry:opentelemetry-sdk") implementation("io.opentelemetry:opentelemetry-sdk-metrics")