From 5fc90cc6db6b7e5a79158ed9937179d614a1fb1a Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Wed, 10 Jun 2020 00:36:49 +1000 Subject: [PATCH] fix websocket JPMS warnings and build issues Signed-off-by: Lachlan Roberts --- .../websocket-core-common/src/main/java/module-info.java | 3 ++- jetty-websocket/websocket-util/src/main/java/module-info.java | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/jetty-websocket/websocket-core-common/src/main/java/module-info.java b/jetty-websocket/websocket-core-common/src/main/java/module-info.java index c2fb2c5276c..43087904262 100644 --- a/jetty-websocket/websocket-core-common/src/main/java/module-info.java +++ b/jetty-websocket/websocket-core-common/src/main/java/module-info.java @@ -29,7 +29,8 @@ module org.eclipse.jetty.websocket.core.common exports org.eclipse.jetty.websocket.core.internal to org.eclipse.jetty.websocket.core.client, org.eclipse.jetty.websocket.core.server, org.eclipse.jetty.util; requires org.eclipse.jetty.http; - requires org.eclipse.jetty.io; + requires transitive org.eclipse.jetty.io; + requires transitive org.eclipse.jetty.util; requires org.slf4j; uses Extension; diff --git a/jetty-websocket/websocket-util/src/main/java/module-info.java b/jetty-websocket/websocket-util/src/main/java/module-info.java index 22dafa0caea..fdca115546e 100644 --- a/jetty-websocket/websocket-util/src/main/java/module-info.java +++ b/jetty-websocket/websocket-util/src/main/java/module-info.java @@ -21,8 +21,6 @@ module org.eclipse.jetty.websocket.util exports org.eclipse.jetty.websocket.util; exports org.eclipse.jetty.websocket.util.messages; - requires org.eclipse.jetty.util; - requires org.slf4j; - requires org.eclipse.jetty.io; requires transitive org.eclipse.jetty.websocket.core.common; + requires org.slf4j; }