From 6bdd6ce8b61e967a6be5fc4c2b22c24738085331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Wed, 16 Sep 2026 07:42:39 +0200 Subject: [PATCH] Start building against Micrometer Tracing 1.8.0-M2 snapshots See gh-51777 --- module/spring-boot-micrometer-tracing-brave/build.gradle | 4 +--- .../spring-boot-micrometer-tracing-opentelemetry/build.gradle | 4 +--- module/spring-boot-micrometer-tracing/build.gradle | 4 +--- platform/spring-boot-dependencies/build.gradle | 2 +- starter/spring-boot-starter-opentelemetry/build.gradle | 4 +--- starter/spring-boot-starter-zipkin/build.gradle | 4 +--- 6 files changed, 6 insertions(+), 16 deletions(-) diff --git a/module/spring-boot-micrometer-tracing-brave/build.gradle b/module/spring-boot-micrometer-tracing-brave/build.gradle index 3daae4ced7d..69cba3badfd 100644 --- a/module/spring-boot-micrometer-tracing-brave/build.gradle +++ b/module/spring-boot-micrometer-tracing-brave/build.gradle @@ -28,9 +28,7 @@ dependencies { api(project(":core:spring-boot")) api(project(":module:spring-boot-micrometer-observation")) api(project(":module:spring-boot-micrometer-tracing")) - api("io.micrometer:micrometer-tracing") { - exclude(group: "aopalliance", module: "aopalliance") - } + api("io.micrometer:micrometer-tracing") optional(project(":core:spring-boot-autoconfigure")) optional(project(":module:spring-boot-zipkin")) optional("io.micrometer:micrometer-tracing-bridge-brave") diff --git a/module/spring-boot-micrometer-tracing-opentelemetry/build.gradle b/module/spring-boot-micrometer-tracing-opentelemetry/build.gradle index 379b51490ee..e3825467f13 100644 --- a/module/spring-boot-micrometer-tracing-opentelemetry/build.gradle +++ b/module/spring-boot-micrometer-tracing-opentelemetry/build.gradle @@ -30,9 +30,7 @@ dependencies { api(project(":module:spring-boot-micrometer-observation")) api(project(":module:spring-boot-micrometer-tracing")) api(project(":module:spring-boot-opentelemetry")) - api("io.micrometer:micrometer-tracing") { - exclude(group: "aopalliance", module: "aopalliance") - } + api("io.micrometer:micrometer-tracing") optional(project(":core:spring-boot-autoconfigure")) optional(project(":core:spring-boot-docker-compose")) diff --git a/module/spring-boot-micrometer-tracing/build.gradle b/module/spring-boot-micrometer-tracing/build.gradle index d79eeb467cf..48209dd9371 100644 --- a/module/spring-boot-micrometer-tracing/build.gradle +++ b/module/spring-boot-micrometer-tracing/build.gradle @@ -27,9 +27,7 @@ description = "Spring Boot Tracing" dependencies { api(project(":core:spring-boot")) api(project(":module:spring-boot-micrometer-observation")) - api("io.micrometer:micrometer-tracing") { - exclude(group: "aopalliance", module: "aopalliance") - } + api("io.micrometer:micrometer-tracing") optional(project(":core:spring-boot-autoconfigure")) optional(project(":module:spring-boot-micrometer-metrics")) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 7c21409f1df..c505c68ab9c 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -1716,7 +1716,7 @@ bom { } } } - library("Micrometer Tracing", "1.8.0-M1") { + library("Micrometer Tracing", "1.8.0-SNAPSHOT") { firstParty() group("io.micrometer") { bom("micrometer-tracing-bom") diff --git a/starter/spring-boot-starter-opentelemetry/build.gradle b/starter/spring-boot-starter-opentelemetry/build.gradle index 1a9b4a9b0b2..cda2f60384f 100644 --- a/starter/spring-boot-starter-opentelemetry/build.gradle +++ b/starter/spring-boot-starter-opentelemetry/build.gradle @@ -27,8 +27,6 @@ dependencies { api(project(":module:spring-boot-opentelemetry")) runtimeOnly 'io.micrometer:micrometer-registry-otlp' - runtimeOnly('io.micrometer:micrometer-tracing-bridge-otel') { - exclude(group: "aopalliance", module: "aopalliance") - } + runtimeOnly('io.micrometer:micrometer-tracing-bridge-otel') runtimeOnly 'io.opentelemetry:opentelemetry-exporter-otlp' } diff --git a/starter/spring-boot-starter-zipkin/build.gradle b/starter/spring-boot-starter-zipkin/build.gradle index 41ebc678530..e8ba4828464 100644 --- a/starter/spring-boot-starter-zipkin/build.gradle +++ b/starter/spring-boot-starter-zipkin/build.gradle @@ -26,7 +26,5 @@ dependencies { api(project(":module:spring-boot-micrometer-tracing-brave")) api(project(":module:spring-boot-zipkin")) - runtimeOnly("io.micrometer:micrometer-tracing-bridge-brave") { - exclude(group: "aopalliance", module: "aopalliance") - } + runtimeOnly("io.micrometer:micrometer-tracing-bridge-brave") }