From 584f7a7e8c849cdb91d7797926961762d0581d25 Mon Sep 17 00:00:00 2001
From: Chad Wilson <chadw@thoughtworks.com>
Date: Tue, 31 Oct 2023 13:53:04 +0800
Subject: [PATCH] Remove unnecessary transitive dependencies from Jetty

Jetty 10.0.18 accidentally added dependencies on `awaitility` and `hamcrest` in `jetty-deploy` via https://github.com/jetty/jetty.project/pull/10667

This workaround can be removed once https://github.com/jetty/jetty.project/issues/10812 is addressed.
---
 development-utility/development-server/build.gradle | 4 +++-
 jetty/build.gradle                                  | 8 ++++++--
 server-launcher/build.gradle                        | 4 +++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/development-utility/development-server/build.gradle b/development-utility/development-server/build.gradle
index 0fdeb18bfe1..bfdece5be26 100644
--- a/development-utility/development-server/build.gradle
+++ b/development-utility/development-server/build.gradle
@@ -30,7 +30,9 @@ dependencies {
   implementation project.deps.jettyJmx
   implementation project.deps.jettyServlets
   implementation project.deps.jettyUtil
-  implementation project.deps.jettyDeploy
+  implementation(project.deps.jettyDeploy) {
+    exclude(module: 'awaitility') // See https://github.com/jetty/jetty.project/issues/10812
+  }
   implementation(project.deps.jettyWebsocket) {
     exclude(module: 'jetty-annotations')
   }
diff --git a/jetty/build.gradle b/jetty/build.gradle
index b86907518ab..ff1eef236e4 100644
--- a/jetty/build.gradle
+++ b/jetty/build.gradle
@@ -27,12 +27,16 @@ dependencies {
   compileOnly project.deps.jettyJmx
   compileOnly project.deps.jettyServlets
   compileOnly project.deps.jettyUtil
-  compileOnly project.deps.jettyDeploy
+  compileOnly(project.deps.jettyDeploy) {
+    exclude(module: 'awaitility') // See https://github.com/jetty/jetty.project/issues/10812
+  }
   compileOnly(project.deps.jettyWebsocket) {
     exclude(module: 'jetty-annotations')
   }
 
-  testImplementation project.deps.jettyDeploy
+  testImplementation(project.deps.jettyDeploy) {
+    exclude(module: 'awaitility') // See https://github.com/jetty/jetty.project/issues/10812
+  }
   testImplementation project.deps.jettyJmx
   testImplementation(project.deps.jettyWebsocket) {
     exclude(module: 'jetty-annotations')
diff --git a/server-launcher/build.gradle b/server-launcher/build.gradle
index 4e2d9faec3d..ed612f0a344 100644
--- a/server-launcher/build.gradle
+++ b/server-launcher/build.gradle
@@ -61,7 +61,9 @@ dependencies {
   packagingInLibDir project.deps.jettyJmx
   packagingInLibDir project.deps.jettyServlets
   packagingInLibDir project.deps.jettyUtil
-  packagingInLibDir project.deps.jettyDeploy
+  packagingInLibDir(project.deps.jettyDeploy) {
+    exclude(module: 'awaitility') // See https://github.com/jetty/jetty.project/issues/10812
+  }
   packagingInLibDir(project.deps.jettyWebsocket) {
     exclude(module: 'jetty-annotations')
   }