Skip to content

S
spring-boot
Commit 60075114 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '2.1.x'

parents c722cc96 4ad636ee
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
.bomr/bomr.yaml
View file @ 60075114
......@@ -23,8 +23,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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment