fix version resolution for semconv

Author: zeitlinger

buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -19,12 +19,18 @@ base.archivesName.set("opentelemetry-${project.name}")
 
 // Version to use to compile code and run tests.
 val DEFAULT_JAVA_VERSION = JavaVersion.VERSION_17
-val semconvVersion = "1.37.0"
 
 java {
   toolchain {
     languageVersion.set(
-        otelJava.minJavaVersionSupported.map { JavaLanguageVersion.of(Math.max(it.majorVersion.toInt(), DEFAULT_JAVA_VERSION.majorVersion.toInt())) }
+      otelJava.minJavaVersionSupported.map {
+        JavaLanguageVersion.of(
+          Math.max(
+            it.majorVersion.toInt(),
+            DEFAULT_JAVA_VERSION.majorVersion.toInt()
+          )
+        )
+      }
     )
   }
 
@@ -37,7 +43,7 @@ tasks {
     with(options) {
       release.set(otelJava.minJavaVersionSupported.map { it.majorVersion.toInt() })
 
-      if (name!="jmhCompileGeneratedClasses") {
+      if (name != "jmhCompileGeneratedClasses") {
         compilerArgs.addAll(
           listOf(
             "-Xlint:all",
@@ -107,21 +113,36 @@ plugins.withId("otel.publish-conventions") {
   tasks {
     register("generateVersionResource") {
       val moduleName = otelJava.moduleName
-      val propertiesDir = moduleName.map { layout.buildDirectory.file("generated/properties/${it.replace('.', '/')}") }
+      val propertiesDir = moduleName.map {
+        layout.buildDirectory.file(
+          "generated/properties/${
+            it.replace(
+              '.',
+              '/'
+            )
+          }"
+        )
+      }
       val projectVersion = project.version.toString()
 
       inputs.property("project.version", projectVersion)
       outputs.dir(propertiesDir)
 
       doLast {
-        File(propertiesDir.get().get().asFile, "version.properties").writeText("contrib.version=${projectVersion}")
+        File(
+          propertiesDir.get().get().asFile,
+          "version.properties"
+        ).writeText("contrib.version=${projectVersion}")
       }
     }
   }
 
   sourceSets {
     main {
-      output.dir(layout.buildDirectory.dir("generated/properties"), "builtBy" to "generateVersionResource")
+      output.dir(
+        layout.buildDirectory.dir("generated/properties"),
+        "builtBy" to "generateVersionResource"
+      )
     }
   }
 }
@@ -146,13 +167,6 @@ dependencies {
   compileOnly("com.google.errorprone:error_prone_annotations")
 }
 
-configurations.all {
-  resolutionStrategy {
-    force("io.opentelemetry.semconv:opentelemetry-semconv:${semconvVersion}")
-    force("io.opentelemetry.semconv:opentelemetry-semconv-incubating:${semconvVersion}-alpha")
-  }
-}
-
 testing {
   suites.withType(JvmTestSuite::class).configureEach {
     dependencies {
@@ -185,18 +199,21 @@ fun isJavaVersionAllowed(version: JavaVersion): Boolean {
   if (otelJava.minJavaVersionSupported.get() > version) {
     return false
   }
-  if (otelJava.maxJavaVersionForTests.isPresent && otelJava.maxJavaVersionForTests.get().compareTo(version) < 0) {
+  if (otelJava.maxJavaVersionForTests.isPresent && otelJava.maxJavaVersionForTests.get()
+      .compareTo(version) < 0
+  ) {
     return false
   }
   return true
 }
 
 afterEvaluate {
-  val testJavaVersion = gradle.startParameter.projectProperties["testJavaVersion"]?.let(JavaVersion::toVersion)
-  val useJ9 = gradle.startParameter.projectProperties["testJavaVM"]?.run { this=="openj9" }
+  val testJavaVersion =
+    gradle.startParameter.projectProperties["testJavaVersion"]?.let(JavaVersion::toVersion)
+  val useJ9 = gradle.startParameter.projectProperties["testJavaVM"]?.run { this == "openj9" }
     ?: false
   tasks.withType<Test>().configureEach {
-    if (testJavaVersion!=null) {
+    if (testJavaVersion != null) {
       javaLauncher.set(
         javaToolchains.launcherFor {
           languageVersion.set(JavaLanguageVersion.of(testJavaVersion.majorVersion))
@@ -224,5 +241,6 @@ dependencyCheck {
   suppressionFile = "buildscripts/dependency-check-suppressions.xml"
   failBuildOnCVSS = 7.0f // fail on high or critical CVE
   nvd.apiKey = System.getenv("NVD_API_KEY")
-  nvd.delay = 3500 // until next dependency check release (https://github.com/jeremylong/DependencyCheck/pull/6333)
+  nvd.delay =
+    3500 // until next dependency check release (https://github.com/jeremylong/DependencyCheck/pull/6333)
 }

dependencyManagement/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
 }
 
 val otelInstrumentationVersion = "2.19.0-alpha"
+val semconvVersion = "1.37.0"
 
 javaPlatform {
   allowDependencies()
@@ -13,12 +14,15 @@ dependencies {
   // under JvmTestSuite so they don't show up as runtime dependencies in license and vulnerability scans
   // (the constraints section below doesn't have this issue, and will only show up
   // as runtime dependencies if they are actually used as runtime dependencies)
-  api(enforcedPlatform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}"))
-  api(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.20.0"))
-  api(enforcedPlatform("com.google.protobuf:protobuf-bom:4.32.1"))
-  api(enforcedPlatform("com.squareup.okhttp3:okhttp-bom:5.1.0"))
+  api(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}"))
+  api(platform("com.fasterxml.jackson:jackson-bom:2.20.0"))
+  api(platform("com.google.protobuf:protobuf-bom:4.32.1"))
+  api(platform("com.squareup.okhttp3:okhttp-bom:5.1.0"))
 
   constraints {
+    api("io.opentelemetry.semconv:opentelemetry-semconv:${semconvVersion}")
+    api("io.opentelemetry.semconv:opentelemetry-semconv-incubating:${semconvVersion}-alpha")
+
     api("com.google.auto.service:auto-service:1.1.1")
     api("com.google.auto.service:auto-service-annotations:1.1.1")
     api("com.google.auto.value:auto-value:1.11.0")