From 37d3ce03f8a91331b8a95d51836acabb4985f5f1 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Sat, 31 Aug 2019 10:56:48 +0100
Subject: [PATCH] Revert "Upgrade to Jetty 9.4.20.v20190813"

This reverts commit f6f99d7855c7c3992ea9259fa2dcffb9a34a7012 as 9.4.20
includes an incompatible class change where an abstract class in
Jetty's public API was changed to an interface, making it incompatible
with Framework 5.1.9.

See gh-18035
---
 .bomr/bomr.yaml                                      | 4 ++++
 spring-boot-project/spring-boot-dependencies/pom.xml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.bomr/bomr.yaml b/.bomr/bomr.yaml
index 3027b7b83a..b46cb0fc45 100644
--- a/.bomr/bomr.yaml
+++ b/.bomr/bomr.yaml
@@ -16,6 +16,10 @@ bomr:
         versions:
           # Switches to Jarkarta EE API dependencies resulting in duplicate classes
           - '[2.3.2,2.4)'
+      - project: jetty
+        versions:
+          # Contains incompatiable class change
+          - '9.4.20.v20190813'
       - project: saaj-impl
         versions:
           # Switches to Jarkarta EE API dependencies resulting in duplicate classes
diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 45c8e4c459..75372bc8a0 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -107,7 +107,7 @@
 		<jedis.version>2.9.3</jedis.version>
 		<jersey.version>2.27</jersey.version>
 		<jest.version>6.3.1</jest.version>
-		<jetty.version>9.4.20.v20190813</jetty.version>
+		<jetty.version>9.4.19.v20190610</jetty.version>
 		<jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version>
 		<jetty-el.version>8.5.40</jetty-el.version>
 		<jetty-reactive-httpclient.version>1.0.3</jetty-reactive-httpclient.version>