Merge branch '2.1.x'

Closes gh-16927
2019-05-21 11:24:34 +01:00
parent e9ea8ed422 ea7ac08109
commit d00368e8ea
1 changed files with 4 additions and 0 deletions
--- a/.bomr/bomr.yaml
+++ b/.bomr/bomr.yaml
@@ -31,6 +31,10 @@ bomr:
      - 'io.micrometer:micrometer-registry-azure-monitor'
      - 'org.eclipse.jetty.gcloud:jetty-gcloud-session-manager'
      - 'org.eclipse.jetty:jetty-home'
+      # Mismanaged by Jetty's bom. See
+      # https://github.com/eclipse/jetty.project/issues/3680
+      - 'org.eclipse.jetty:infinispan-embedded'
+      - 'org.eclipse.jetty:infinispan-remote'
    repositories:
      # Caffeine Simulator's dependencies
      - 'https://maven.imagej.net/content/repositories/public/'