Remove unnecessary transitive dependencies from Jetty

Jetty 10.0.18 accidentally added dependencies on `awaitility` and `hamcrest` in `jetty-deploy` via jetty/jetty.project#10667 This workaround can be removed once jetty/jetty.project#10812 is addressed.
chadlwilson · Oct 31, 2023 · 584f7a7 · 584f7a7
1 parent 0519a19
commit 584f7a7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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')
   }