Merge branch '4.2.x' into sync-files-4.2.x

micronaut-projects · Oct 13, 2023 · a251794 · a251794
2 parents 2abda4e + d10261a
commit a251794
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -46,7 +46,7 @@ managed-micronaut-mqtt = "3.0.1"
 managed-micronaut-multitenancy = "5.0.3"
 managed-micronaut-neo4j = "6.1.0"
 managed-micronaut-nats = "4.0.1"
-managed-micronaut-object-storage = "2.0.3"
+managed-micronaut-object-storage = "2.0.4"
 managed-micronaut-openapi = "5.1.1"
 managed-micronaut-oraclecloud = "3.0.6"
 managed-micronaut-picocli = "5.0.1"

diff --git a/platform/build.gradle.kts b/platform/build.gradle.kts
@@ -32,6 +32,7 @@ micronautBom {
                 "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha",
                 setOf(
                     "io.opentelemetry",
+                    "io.opentelemetry.semconv",
                     "io.opentelemetry.instrumentation",
                     "io.opentelemetry.javaagent",
                     "io.opentelemetry.javaagent.instrumentation"
@@ -60,10 +61,14 @@ micronautBom {
         )
         dependencies.add("io.zipkin.brave:brave-bom:5.16.0")
         dependencies.add("io.zipkin.reporter2:zipkin-reporter-bom:2.16.3")
-        dependencies.add("io.opentelemetry:opentelemetry-bom:1.26.0")
-        dependencies.add("io.opentelemetry:opentelemetry-bom-alpha:1.26.0-alpha")
-        dependencies.add("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.26.0")
-        dependencies.add("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.26.0-alpha")
+
+        dependencies.add("io.opentelemetry:opentelemetry-bom:1.30.1")
+        dependencies.add("io.opentelemetry:opentelemetry-bom-alpha:1.30.1-alpha")
+
+        dependencies.add("io.opentelemetry:opentelemetry-bom:1.31.0")
+        dependencies.add("io.opentelemetry:opentelemetry-bom-alpha:1.31.0-alpha")
+        dependencies.add("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.30.0")
+        dependencies.add("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.30.0-alpha")
 
     }
 }