From 4ad636ee8eca1433d7c59daaa1559266abb603e7 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 16 Apr 2019 09:17:35 +0100 Subject: [PATCH] Tolerate competing gRPC version requirements in Micrometer's registries See gh-16178 --- .bomr/bomr.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.bomr/bomr.yaml b/.bomr/bomr.yaml index 41a7561c812..027b71eb7f2 100644 --- a/.bomr/bomr.yaml +++ b/.bomr/bomr.yaml @@ -31,8 +31,10 @@ bomr: verify: ignored-dependencies: # Avoid confliciting transitive requirements for - # io.grpc:grpc-core:jar:[1.0.1,1.0.1] (Jetty) and - # io.grpc:grpc-core:jar:[1.14.0,1.14.0] (Micrometer's Azure Registry) + # io.grpc:grpc-core:jar:[1.0.1,1.0.1] (Jetty), + # io.grpc:grpc-core:jar:[1.14.0,1.14.0] (Micrometer's Azure Registry), and + # io.grpc:grpc-core:jar:[1.15.0,1.15.0] (Micrometer's Stackdriver Registry) + - 'io.micrometer:micrometer-registry-azure-monitor' - 'org.eclipse.jetty.gcloud:jetty-gcloud-session-manager' - 'org.eclipse.jetty:jetty-home' repositories: