Merge branch '2.1.x'

This commit is contained in:
Andy Wilkinson 2019-04-16 09:18:40 +01:00
commit 6007511420

View File

@ -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: