From 7dd40448353dff9d59ea2f30bbbb8e3293aa1773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Thu, 8 Oct 2026 10:07:49 +0200 Subject: [PATCH] Fix dependency management following upgrades --- module/spring-boot-micrometer-metrics/build.gradle | 4 +--- platform/spring-boot-dependencies/build.gradle | 6 +----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/module/spring-boot-micrometer-metrics/build.gradle b/module/spring-boot-micrometer-metrics/build.gradle index 998d1e36f9a..2b2f0370e10 100644 --- a/module/spring-boot-micrometer-metrics/build.gradle +++ b/module/spring-boot-micrometer-metrics/build.gradle @@ -54,9 +54,7 @@ dependencies { optional("io.micrometer:micrometer-registry-new-relic") optional("io.micrometer:micrometer-registry-otlp") optional("io.micrometer:micrometer-registry-prometheus") - optional("io.micrometer:micrometer-registry-stackdriver") { - exclude group: "javax.annotation", module: "javax.annotation-api" - } + optional("io.micrometer:micrometer-registry-stackdriver") optional("io.micrometer:micrometer-registry-statsd") optional("io.prometheus:prometheus-metrics-exporter-pushgateway") optional("org.apache.kafka:kafka-streams") diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 242069bd0d7..4d08b80c898 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -1688,11 +1688,6 @@ bom { library("Micrometer", "1.18.0-SNAPSHOT") { firstParty() group("io.micrometer") { - modules = [ - "micrometer-registry-stackdriver" { - exclude group: "javax.annotation", module: "javax.annotation-api" - } - ] bom("micrometer-bom") } links { @@ -1836,6 +1831,7 @@ bom { } group("org.neo4j.driver") { bom("neo4j-java-driver-bom") { + permit("org.neo4j.bolt:neo4j-bolt-connection-codec") permit("org.neo4j.bolt:neo4j-bolt-connection-netty") permit("org.neo4j.bolt:neo4j-bolt-connection-pooled") permit("org.neo4j.bolt:neo4j-bolt-connection-query-api")