From 64db46c124eedc778632545ebc7f60d3e3d78813 Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Thu, 30 Sep 2021 08:57:28 +0200
Subject: [PATCH] Fixes #6938 - module-info.java file do not use the canonical
 order for the elements

Changed order of entries in module-info.java to be canonical

(cherry picked from commit 02691171d500175ac47fedf00a712eeb62dff67c)
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
---
 apache-jsp/src/main/java/module-info.java     | 19 +++++-------
 .../src/main/java/module-info.java            |  9 +++---
 .../src/main/java/module-info.java            |  9 +++---
 .../src/main/java/module-info.java            |  7 ++---
 .../src/main/java/module-info.java            |  9 +++---
 .../src/main/java/module-info.java            |  7 ++---
 .../src/main/java/module-info.java            |  9 +++---
 .../src/main/java/module-info.java            | 17 +++++-----
 jetty-cdi/src/main/java/module-info.java      |  3 +-
 jetty-client/src/main/java/module-info.java   | 23 ++++++++------
 jetty-deploy/src/main/java/module-info.java   | 17 +++++-----
 .../src/main/java/module-info.java            |  7 +++--
 .../src/main/java/module-info.java            |  7 +++--
 jetty-http/src/main/java/module-info.java     | 15 +++++----
 .../src/main/java/module-info.java            |  7 +++--
 .../src/main/java/module-info.java            |  7 +++--
 .../src/main/java/module-info.java            | 11 +++----
 .../src/main/java/module-info.java            |  7 +++--
 .../src/main/java/module-info.java            |  5 +--
 jetty-io/src/main/java/module-info.java       |  7 +++--
 jetty-jaas/src/main/java/module-info.java     | 11 ++++---
 jetty-jaspi/src/main/java/module-info.java    | 17 +++++-----
 jetty-jmx/src/main/java/module-info.java      |  5 +--
 jetty-jndi/src/main/java/module-info.java     | 15 ++++-----
 .../src/main/java/module-info.java            |  2 +-
 jetty-openid/src/main/java/module-info.java   |  5 +--
 jetty-plus/src/main/java/module-info.java     | 21 ++++++-------
 jetty-proxy/src/main/java/module-info.java    |  4 +--
 .../src/main/java/module-info.java            |  7 +++--
 jetty-rewrite/src/main/java/module-info.java  |  9 +++---
 jetty-security/src/main/java/module-info.java | 16 +++++-----
 jetty-server/src/main/java/module-info.java   | 18 ++++++-----
 jetty-servlet/src/main/java/module-info.java  | 17 +++++-----
 jetty-servlets/src/main/java/module-info.java |  5 +--
 .../src/main/java/module-info.java            | 10 +++---
 .../src/main/java/module-info.java            |  5 +--
 .../src/main/java/module-info.java            |  9 +++---
 .../src/main/java/module-info.java            |  7 +++--
 .../src/main/java/module-info.java            |  9 +++---
 .../src/main/java/module-info.java            |  4 +--
 jetty-util/src/main/java/module-info.java     | 29 +++++++++--------
 jetty-webapp/src/main/java/module-info.java   | 11 +++----
 .../src/main/java/module-info.java            |  5 +--
 .../src/main/java/module-info.java            | 31 ++++++++-----------
 .../src/main/java/module-info.java            |  5 +--
 .../src/main/java/module-info.java            | 23 +++++++-------
 .../src/main/java/module-info.java            |  9 +++---
 .../src/main/java/module-info.java            | 24 +++++++-------
 .../src/main/java/module-info.java            |  4 +--
 .../src/main/java/module-info.java            |  8 +++--
 .../src/main/java/module-info.java            | 11 +++----
 .../src/main/java/module-info.java            | 20 ++++++------
 .../src/main/java/module-info.java            |  7 +++--
 jetty-xml/src/main/java/module-info.java      |  9 +++---
 .../src/main/java/module-info.java            |  2 +-
 55 files changed, 301 insertions(+), 295 deletions(-)

diff --git a/apache-jsp/src/main/java/module-info.java b/apache-jsp/src/main/java/module-info.java
index a2d356b29891..92698f697f5c 100644
--- a/apache-jsp/src/main/java/module-info.java
+++ b/apache-jsp/src/main/java/module-info.java
@@ -11,23 +11,20 @@
 // ========================================================================
 //
 
-import javax.servlet.ServletContainerInitializer;
-
-import org.apache.juli.logging.Log;
-import org.eclipse.jetty.apache.jsp.JettyJasperInitializer;
-import org.eclipse.jetty.apache.jsp.JuliLog;
-
 module org.eclipse.jetty.apache.jsp
 {
-    exports org.eclipse.jetty.apache.jsp;
-    exports org.eclipse.jetty.jsp;
-
     requires java.xml;
     requires jetty.servlet.api;
     requires org.eclipse.jetty.util;
     requires org.mortbay.apache.jasper;
     requires org.slf4j;
 
-    provides Log with JuliLog;
-    provides ServletContainerInitializer with JettyJasperInitializer;
+    exports org.eclipse.jetty.apache.jsp;
+    exports org.eclipse.jetty.jsp;
+
+    provides org.apache.juli.logging.Log with
+        org.eclipse.jetty.apache.jsp.JuliLog;
+
+    provides javax.servlet.ServletContainerInitializer with
+        org.eclipse.jetty.apache.jsp.JettyJasperInitializer;
 }
diff --git a/jetty-alpn/jetty-alpn-client/src/main/java/module-info.java b/jetty-alpn/jetty-alpn-client/src/main/java/module-info.java
index 1fa4c7195029..ab1f8b5e08bc 100644
--- a/jetty-alpn/jetty-alpn-client/src/main/java/module-info.java
+++ b/jetty-alpn/jetty-alpn-client/src/main/java/module-info.java
@@ -11,14 +11,13 @@
 // ========================================================================
 //
 
-import org.eclipse.jetty.io.ssl.ALPNProcessor;
-
 module org.eclipse.jetty.alpn.client
 {
-    exports org.eclipse.jetty.alpn.client;
+    requires org.slf4j;
 
     requires transitive org.eclipse.jetty.io;
-    requires org.slf4j;
 
-    uses ALPNProcessor.Client;
+    exports org.eclipse.jetty.alpn.client;
+
+    uses org.eclipse.jetty.io.ssl.ALPNProcessor.Client;
 }
diff --git a/jetty-alpn/jetty-alpn-conscrypt-client/src/main/java/module-info.java b/jetty-alpn/jetty-alpn-conscrypt-client/src/main/java/module-info.java
index 758396043317..f649362d0043 100644
--- a/jetty-alpn/jetty-alpn-conscrypt-client/src/main/java/module-info.java
+++ b/jetty-alpn/jetty-alpn-conscrypt-client/src/main/java/module-info.java
@@ -11,14 +11,13 @@
 // ========================================================================
 //
 
-import org.eclipse.jetty.alpn.conscrypt.client.ConscryptClientALPNProcessor;
-import org.eclipse.jetty.io.ssl.ALPNProcessor;
-
 module org.eclipse.jetty.alpn.conscrypt.client
 {
     requires org.conscrypt;
-    requires transitive org.eclipse.jetty.alpn.client;
     requires org.slf4j;
 
-    provides ALPNProcessor.Client with ConscryptClientALPNProcessor;
+    requires transitive org.eclipse.jetty.alpn.client;
+
+    provides org.eclipse.jetty.io.ssl.ALPNProcessor.Client with
+        org.eclipse.jetty.alpn.conscrypt.client.ConscryptClientALPNProcessor;
 }
diff --git a/jetty-alpn/jetty-alpn-conscrypt-server/src/main/java/module-info.java b/jetty-alpn/jetty-alpn-conscrypt-server/src/main/java/module-info.java
index e08bc1a14fba..5baf41284b4e 100644
--- a/jetty-alpn/jetty-alpn-conscrypt-server/src/main/java/module-info.java
+++ b/jetty-alpn/jetty-alpn-conscrypt-server/src/main/java/module-info.java
@@ -11,14 +11,13 @@
 // ========================================================================
 //
 
-import org.eclipse.jetty.alpn.conscrypt.server.ConscryptServerALPNProcessor;
-import org.eclipse.jetty.io.ssl.ALPNProcessor;
-
 module org.eclipse.jetty.alpn.conscrypt.server
 {
     requires org.conscrypt;
     requires org.slf4j;
+
     requires transitive org.eclipse.jetty.alpn.server;
 
-    provides ALPNProcessor.Server with ConscryptServerALPNProcessor;
+    provides org.eclipse.jetty.io.ssl.ALPNProcessor.Server with
+        org.eclipse.jetty.alpn.conscrypt.server.ConscryptServerALPNProcessor;
 }
diff --git a/jetty-alpn/jetty-alpn-java-client/src/main/java/module-info.java b/jetty-alpn/jetty-alpn-java-client/src/main/java/module-info.java
index 694d112a78cc..d2e73bab1628 100644
--- a/jetty-alpn/jetty-alpn-java-client/src/main/java/module-info.java
+++ b/jetty-alpn/jetty-alpn-java-client/src/main/java/module-info.java
@@ -11,13 +11,12 @@
 // ========================================================================
 //
 
-import org.eclipse.jetty.alpn.java.client.JDK9ClientALPNProcessor;
-import org.eclipse.jetty.io.ssl.ALPNProcessor;
-
 module org.eclipse.jetty.alpn.java.client
 {
-    requires transitive org.eclipse.jetty.alpn.client;
     requires org.slf4j;
 
-    provides ALPNProcessor.Client with JDK9ClientALPNProcessor;
+    requires transitive org.eclipse.jetty.alpn.client;
+
+    provides org.eclipse.jetty.io.ssl.ALPNProcessor.Client with
+        org.eclipse.jetty.alpn.java.client.JDK9ClientALPNProcessor;
 }
diff --git a/jetty-alpn/jetty-alpn-java-server/src/main/java/module-info.java b/jetty-alpn/jetty-alpn-java-server/src/main/java/module-info.java
index 76d943163101..520b0860356e 100644
--- a/jetty-alpn/jetty-alpn-java-server/src/main/java/module-info.java
+++ b/jetty-alpn/jetty-alpn-java-server/src/main/java/module-info.java
@@ -11,13 +11,12 @@
 // ========================================================================
 //
 
-import org.eclipse.jetty.alpn.java.server.JDK9ServerALPNProcessor;
-import org.eclipse.jetty.io.ssl.ALPNProcessor;
-
 module org.eclipse.jetty.alpn.java.server
 {
     requires org.slf4j;
+
     requires transitive org.eclipse.jetty.alpn.server;
 
-    provides ALPNProcessor.Server with JDK9ServerALPNProcessor;
+    provides org.eclipse.jetty.io.ssl.ALPNProcessor.Server with
+        org.eclipse.jetty.alpn.java.server.JDK9ServerALPNProcessor;
 }
diff --git a/jetty-alpn/jetty-alpn-server/src/main/java/module-info.java b/jetty-alpn/jetty-alpn-server/src/main/java/module-info.java
index 7826190f9f59..73b18a266fff 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/java/module-info.java
+++ b/jetty-alpn/jetty-alpn-server/src/main/java/module-info.java
@@ -11,14 +11,13 @@
 // ========================================================================
 //
 
-import org.eclipse.jetty.io.ssl.ALPNProcessor;
-
 module org.eclipse.jetty.alpn.server
 {
-    exports org.eclipse.jetty.alpn.server;
+    requires org.slf4j;
 
     requires transitive org.eclipse.jetty.server;
-    requires org.slf4j;
 
-    uses ALPNProcessor.Server;
+    exports org.eclipse.jetty.alpn.server;
+
+    uses org.eclipse.jetty.io.ssl.ALPNProcessor.Server;
 }
diff --git a/jetty-annotations/src/main/java/module-info.java b/jetty-annotations/src/main/java/module-info.java
index d1e7f5456ce4..f6665c65dd0d 100644
--- a/jetty-annotations/src/main/java/module-info.java
+++ b/jetty-annotations/src/main/java/module-info.java
@@ -11,22 +11,19 @@
 // ========================================================================
 //
 
-import javax.servlet.ServletContainerInitializer;
-
-import org.eclipse.jetty.annotations.AnnotationConfiguration;
-import org.eclipse.jetty.webapp.Configuration;
-
 module org.eclipse.jetty.annotations
 {
-    exports org.eclipse.jetty.annotations;
-
     requires java.annotation;
     requires java.naming;
+    requires org.slf4j;
+
     requires transitive org.eclipse.jetty.plus;
     requires transitive org.objectweb.asm;
-    requires org.slf4j;
 
-    uses ServletContainerInitializer;
+    exports org.eclipse.jetty.annotations;
+
+    uses javax.servlet.ServletContainerInitializer;
 
-    provides Configuration with AnnotationConfiguration;
+    provides org.eclipse.jetty.webapp.Configuration with
+        org.eclipse.jetty.annotations.AnnotationConfiguration;
 }
diff --git a/jetty-cdi/src/main/java/module-info.java b/jetty-cdi/src/main/java/module-info.java
index 6c066370d8f5..1b4f64a6f47d 100644
--- a/jetty-cdi/src/main/java/module-info.java
+++ b/jetty-cdi/src/main/java/module-info.java
@@ -14,7 +14,8 @@
 module org.eclipse.jetty.cdi
 {
     requires org.eclipse.jetty.annotations;
+
     requires transitive org.eclipse.jetty.webapp;
 
     exports org.eclipse.jetty.cdi;
-} 
\ No newline at end of file
+} 
diff --git a/jetty-client/src/main/java/module-info.java b/jetty-client/src/main/java/module-info.java
index 31515a9388f3..a98fd5c44897 100644
--- a/jetty-client/src/main/java/module-info.java
+++ b/jetty-client/src/main/java/module-info.java
@@ -13,20 +13,23 @@
 
 module org.eclipse.jetty.client
 {
-    exports org.eclipse.jetty.client;
-    exports org.eclipse.jetty.client.api;
-    exports org.eclipse.jetty.client.dynamic;
-    exports org.eclipse.jetty.client.http;
-    exports org.eclipse.jetty.client.jmx to org.eclipse.jetty.jmx;
-    exports org.eclipse.jetty.client.util;
-
     requires org.eclipse.jetty.alpn.client;
-    requires transitive org.eclipse.jetty.http;
     requires org.slf4j;
 
-    // Only required if using SPNEGO.
-    requires static java.security.jgss;
+    requires transitive org.eclipse.jetty.http;
+
     // Only required if using JMX.
     requires static java.management;
+    // Only required if using SPNEGO.
+    requires static java.security.jgss;
     requires static org.eclipse.jetty.jmx;
+
+    exports org.eclipse.jetty.client;
+    exports org.eclipse.jetty.client.api;
+    exports org.eclipse.jetty.client.dynamic;
+    exports org.eclipse.jetty.client.http;
+    exports org.eclipse.jetty.client.util;
+
+    exports org.eclipse.jetty.client.jmx to
+        org.eclipse.jetty.jmx;
 }
diff --git a/jetty-deploy/src/main/java/module-info.java b/jetty-deploy/src/main/java/module-info.java
index b27ef902a22d..7c6605cbc204 100644
--- a/jetty-deploy/src/main/java/module-info.java
+++ b/jetty-deploy/src/main/java/module-info.java
@@ -13,17 +13,20 @@
 
 module org.eclipse.jetty.deploy
 {
-    exports org.eclipse.jetty.deploy;
-    exports org.eclipse.jetty.deploy.bindings;
-    exports org.eclipse.jetty.deploy.graph;
-    exports org.eclipse.jetty.deploy.jmx to org.eclipse.jetty.jmx;
-    exports org.eclipse.jetty.deploy.providers;
-
     requires java.xml;
-    requires transitive org.eclipse.jetty.webapp;
     requires org.eclipse.jetty.xml;
     requires org.slf4j;
 
+    requires transitive org.eclipse.jetty.webapp;
+
     // Only required if using JMX.
     requires static org.eclipse.jetty.jmx;
+
+    exports org.eclipse.jetty.deploy;
+    exports org.eclipse.jetty.deploy.bindings;
+    exports org.eclipse.jetty.deploy.graph;
+    exports org.eclipse.jetty.deploy.providers;
+
+    exports org.eclipse.jetty.deploy.jmx to
+        org.eclipse.jetty.jmx;
 }
diff --git a/jetty-fcgi/fcgi-client/src/main/java/module-info.java b/jetty-fcgi/fcgi-client/src/main/java/module-info.java
index 56a688dc46d6..022f80ca1294 100644
--- a/jetty-fcgi/fcgi-client/src/main/java/module-info.java
+++ b/jetty-fcgi/fcgi-client/src/main/java/module-info.java
@@ -13,11 +13,12 @@
 
 module org.eclipse.jetty.fcgi.client
 {
+    requires org.slf4j;
+
+    requires transitive org.eclipse.jetty.client;
+
     exports org.eclipse.jetty.fcgi;
     exports org.eclipse.jetty.fcgi.client.http;
     exports org.eclipse.jetty.fcgi.generator;
     exports org.eclipse.jetty.fcgi.parser;
-
-    requires transitive org.eclipse.jetty.client;
-    requires org.slf4j;
 }
diff --git a/jetty-fcgi/fcgi-server/src/main/java/module-info.java b/jetty-fcgi/fcgi-server/src/main/java/module-info.java
index f2556a3b90ad..ecc1112e90d2 100644
--- a/jetty-fcgi/fcgi-server/src/main/java/module-info.java
+++ b/jetty-fcgi/fcgi-server/src/main/java/module-info.java
@@ -13,13 +13,14 @@
 
 module org.eclipse.jetty.fcgi.server
 {
-    exports org.eclipse.jetty.fcgi.server;
-    exports org.eclipse.jetty.fcgi.server.proxy;
+    requires org.slf4j;
 
     requires transitive org.eclipse.jetty.fcgi.client;
     requires transitive org.eclipse.jetty.proxy;
-    requires org.slf4j;
 
     // Only required if using the proxy features.
     requires static jetty.servlet.api;
+
+    exports org.eclipse.jetty.fcgi.server;
+    exports org.eclipse.jetty.fcgi.server.proxy;
 }
diff --git a/jetty-http/src/main/java/module-info.java b/jetty-http/src/main/java/module-info.java
index 718a5ee88d7e..76b4ddc5c398 100644
--- a/jetty-http/src/main/java/module-info.java
+++ b/jetty-http/src/main/java/module-info.java
@@ -11,18 +11,17 @@
 // ========================================================================
 //
 
-import org.eclipse.jetty.http.Http1FieldPreEncoder;
-import org.eclipse.jetty.http.HttpFieldPreEncoder;
-
 module org.eclipse.jetty.http
 {
-    exports org.eclipse.jetty.http;
-    exports org.eclipse.jetty.http.pathmap;
+    requires org.slf4j;
 
     requires transitive org.eclipse.jetty.io;
-    requires org.slf4j;
 
-    uses HttpFieldPreEncoder;
+    exports org.eclipse.jetty.http;
+    exports org.eclipse.jetty.http.pathmap;
+
+    uses org.eclipse.jetty.http.HttpFieldPreEncoder;
 
-    provides HttpFieldPreEncoder with Http1FieldPreEncoder;
+    provides org.eclipse.jetty.http.HttpFieldPreEncoder with
+        org.eclipse.jetty.http.Http1FieldPreEncoder;
 }
diff --git a/jetty-http2/http2-client/src/main/java/module-info.java b/jetty-http2/http2-client/src/main/java/module-info.java
index 2049c4efe6f7..602d8d175675 100644
--- a/jetty-http2/http2-client/src/main/java/module-info.java
+++ b/jetty-http2/http2-client/src/main/java/module-info.java
@@ -13,9 +13,10 @@
 
 module org.eclipse.jetty.http2.client
 {
-    exports org.eclipse.jetty.http2.client;
-
     requires org.eclipse.jetty.alpn.client;
-    requires transitive org.eclipse.jetty.http2.common;
     requires org.slf4j;
+
+    requires transitive org.eclipse.jetty.http2.common;
+
+    exports org.eclipse.jetty.http2.client;
 }
diff --git a/jetty-http2/http2-common/src/main/java/module-info.java b/jetty-http2/http2-common/src/main/java/module-info.java
index 1238a74ca803..1a3d5d3f98fb 100644
--- a/jetty-http2/http2-common/src/main/java/module-info.java
+++ b/jetty-http2/http2-common/src/main/java/module-info.java
@@ -13,13 +13,14 @@
 
 module org.eclipse.jetty.http2.common
 {
+    requires org.slf4j;
+
+    requires transitive org.eclipse.jetty.http2.hpack;
+
     exports org.eclipse.jetty.http2;
     exports org.eclipse.jetty.http2.api;
     exports org.eclipse.jetty.http2.api.server;
     exports org.eclipse.jetty.http2.frames;
     exports org.eclipse.jetty.http2.generator;
     exports org.eclipse.jetty.http2.parser;
-
-    requires transitive org.eclipse.jetty.http2.hpack;
-    requires org.slf4j;
 }
diff --git a/jetty-http2/http2-hpack/src/main/java/module-info.java b/jetty-http2/http2-hpack/src/main/java/module-info.java
index 2a544673e09f..d3a6e40d58aa 100644
--- a/jetty-http2/http2-hpack/src/main/java/module-info.java
+++ b/jetty-http2/http2-hpack/src/main/java/module-info.java
@@ -11,15 +11,14 @@
 // ========================================================================
 //
 
-import org.eclipse.jetty.http.HttpFieldPreEncoder;
-import org.eclipse.jetty.http2.hpack.HpackFieldPreEncoder;
-
 module org.eclipse.jetty.http2.hpack
 {
-    exports org.eclipse.jetty.http2.hpack;
+    requires org.slf4j;
 
     requires transitive org.eclipse.jetty.http;
-    requires org.slf4j;
 
-    provides HttpFieldPreEncoder with HpackFieldPreEncoder;
+    exports org.eclipse.jetty.http2.hpack;
+
+    provides org.eclipse.jetty.http.HttpFieldPreEncoder with
+        org.eclipse.jetty.http2.hpack.HpackFieldPreEncoder;
 }
diff --git a/jetty-http2/http2-http-client-transport/src/main/java/module-info.java b/jetty-http2/http2-http-client-transport/src/main/java/module-info.java
index 4f3b5143551f..f95f90134aea 100644
--- a/jetty-http2/http2-http-client-transport/src/main/java/module-info.java
+++ b/jetty-http2/http2-http-client-transport/src/main/java/module-info.java
@@ -13,10 +13,11 @@
 
 module org.eclipse.jetty.http2.http.client.transport
 {
-    exports org.eclipse.jetty.http2.client.http;
-
     requires org.eclipse.jetty.alpn.client;
+    requires org.slf4j;
+
     requires transitive org.eclipse.jetty.client;
     requires transitive org.eclipse.jetty.http2.client;
-    requires org.slf4j;
+
+    exports org.eclipse.jetty.http2.client.http;
 }
diff --git a/jetty-http2/http2-server/src/main/java/module-info.java b/jetty-http2/http2-server/src/main/java/module-info.java
index ac6252dff887..8b069e96338f 100644
--- a/jetty-http2/http2-server/src/main/java/module-info.java
+++ b/jetty-http2/http2-server/src/main/java/module-info.java
@@ -13,9 +13,10 @@
 
 module org.eclipse.jetty.http2.server
 {
-    exports org.eclipse.jetty.http2.server;
+    requires org.slf4j;
 
     requires transitive org.eclipse.jetty.http2.common;
     requires transitive org.eclipse.jetty.server;
-    requires org.slf4j;
+
+    exports org.eclipse.jetty.http2.server;
 }
diff --git a/jetty-io/src/main/java/module-info.java b/jetty-io/src/main/java/module-info.java
index aa51953d0c3a..45cf24f521e1 100644
--- a/jetty-io/src/main/java/module-info.java
+++ b/jetty-io/src/main/java/module-info.java
@@ -13,12 +13,13 @@
 
 module org.eclipse.jetty.io
 {
-    exports org.eclipse.jetty.io;
-    exports org.eclipse.jetty.io.ssl;
+    requires org.slf4j;
 
     requires transitive org.eclipse.jetty.util;
-    requires org.slf4j;
 
     // Only required if using JMX.
     requires static org.eclipse.jetty.jmx;
+
+    exports org.eclipse.jetty.io;
+    exports org.eclipse.jetty.io.ssl;
 }
diff --git a/jetty-jaas/src/main/java/module-info.java b/jetty-jaas/src/main/java/module-info.java
index 0cb97ebe5939..eaff73b3f240 100644
--- a/jetty-jaas/src/main/java/module-info.java
+++ b/jetty-jaas/src/main/java/module-info.java
@@ -13,14 +13,15 @@
 
 module org.eclipse.jetty.jaas
 {
-    exports org.eclipse.jetty.jaas;
-    exports org.eclipse.jetty.jaas.callback;
-    exports org.eclipse.jetty.jaas.spi;
+    requires org.slf4j;
+    requires org.eclipse.jetty.util;
 
     requires transitive org.eclipse.jetty.security;
-    requires org.slf4j;
 
     // Only required if using JDBCLoginModule.
     requires static java.sql;
-    requires org.eclipse.jetty.util;
+
+    exports org.eclipse.jetty.jaas;
+    exports org.eclipse.jetty.jaas.callback;
+    exports org.eclipse.jetty.jaas.spi;
 }
diff --git a/jetty-jaspi/src/main/java/module-info.java b/jetty-jaspi/src/main/java/module-info.java
index a4cade9e4c50..bbe7b27409c2 100644
--- a/jetty-jaspi/src/main/java/module-info.java
+++ b/jetty-jaspi/src/main/java/module-info.java
@@ -11,20 +11,19 @@
 // ========================================================================
 //
 
-import org.eclipse.jetty.security.Authenticator;
-import org.eclipse.jetty.security.jaspi.JaspiAuthenticatorFactory;
-
 module org.eclipse.jetty.security.jaspi
 {
+    requires jetty.servlet.api;
+    requires org.slf4j;
+
+    requires transitive javax.security.auth.message;
+    requires transitive org.eclipse.jetty.security;
+
     exports org.eclipse.jetty.security.jaspi;
     exports org.eclipse.jetty.security.jaspi.callback;
     exports org.eclipse.jetty.security.jaspi.modules;
     exports org.eclipse.jetty.security.jaspi.provider;
 
-    requires transitive javax.security.auth.message;
-    requires jetty.servlet.api;
-    requires transitive org.eclipse.jetty.security;
-    requires org.slf4j;
-
-    provides Authenticator.Factory with JaspiAuthenticatorFactory;
+    provides org.eclipse.jetty.security.Authenticator.Factory with
+        org.eclipse.jetty.security.jaspi.JaspiAuthenticatorFactory;
 }
diff --git a/jetty-jmx/src/main/java/module-info.java b/jetty-jmx/src/main/java/module-info.java
index 713c562fb31d..0c753ae103f5 100644
--- a/jetty-jmx/src/main/java/module-info.java
+++ b/jetty-jmx/src/main/java/module-info.java
@@ -13,14 +13,15 @@
 
 module org.eclipse.jetty.jmx
 {
-    exports org.eclipse.jetty.jmx;
+    requires org.slf4j;
 
     // Applications that use ObjectMBean must use JMX classes too.
     requires transitive java.management;
     requires transitive org.eclipse.jetty.util;
-    requires org.slf4j;
 
     // Only required if using ConnectorServer.
     requires static java.management.rmi;
     requires static java.rmi;
+
+    exports org.eclipse.jetty.jmx;
 }
diff --git a/jetty-jndi/src/main/java/module-info.java b/jetty-jndi/src/main/java/module-info.java
index 49cdb5aae1b9..22d116303726 100644
--- a/jetty-jndi/src/main/java/module-info.java
+++ b/jetty-jndi/src/main/java/module-info.java
@@ -13,18 +13,19 @@
 
 module org.eclipse.jetty.jndi
 {
-    exports org.eclipse.jetty.jndi;
-    exports org.eclipse.jetty.jndi.factories;
-    exports org.eclipse.jetty.jndi.java;
-    exports org.eclipse.jetty.jndi.local;
+    requires org.slf4j;
 
     requires transitive java.naming;
     requires transitive org.eclipse.jetty.server;
-    requires org.slf4j;
 
-    // Only required if using DataSourceCloser.
-    requires static java.sql;
     // Only required if using MailSessionReference.
     requires static javax.mail.glassfish;
+    // Only required if using DataSourceCloser.
+    requires static java.sql;
     requires static org.eclipse.jetty.security;
+
+    exports org.eclipse.jetty.jndi;
+    exports org.eclipse.jetty.jndi.factories;
+    exports org.eclipse.jetty.jndi.java;
+    exports org.eclipse.jetty.jndi.local;
 }
diff --git a/jetty-memcached/jetty-memcached-sessions/src/main/java/module-info.java b/jetty-memcached/jetty-memcached-sessions/src/main/java/module-info.java
index 01b313cfc3cb..9b83c74aec22 100644
--- a/jetty-memcached/jetty-memcached-sessions/src/main/java/module-info.java
+++ b/jetty-memcached/jetty-memcached-sessions/src/main/java/module-info.java
@@ -18,4 +18,4 @@
     requires transitive xmemcached;
 
     exports org.eclipse.jetty.memcached.session;
-}
\ No newline at end of file
+}
diff --git a/jetty-openid/src/main/java/module-info.java b/jetty-openid/src/main/java/module-info.java
index 2c70122d18cd..f518a176f3b6 100644
--- a/jetty-openid/src/main/java/module-info.java
+++ b/jetty-openid/src/main/java/module-info.java
@@ -13,9 +13,10 @@
 
 module org.eclipse.jetty.security.openid
 {
+    requires org.eclipse.jetty.util.ajax;
+
     requires transitive org.eclipse.jetty.client;
     requires transitive org.eclipse.jetty.security;
-    requires org.eclipse.jetty.util.ajax;
 
     exports org.eclipse.jetty.security.openid;
-}
\ No newline at end of file
+}
diff --git a/jetty-plus/src/main/java/module-info.java b/jetty-plus/src/main/java/module-info.java
index 52a0fb308168..18fce3d9be41 100644
--- a/jetty-plus/src/main/java/module-info.java
+++ b/jetty-plus/src/main/java/module-info.java
@@ -11,21 +11,13 @@
 // ========================================================================
 //
 
-import org.eclipse.jetty.plus.webapp.EnvConfiguration;
-import org.eclipse.jetty.plus.webapp.PlusConfiguration;
-import org.eclipse.jetty.webapp.Configuration;
-
 module org.eclipse.jetty.plus
 {
-    exports org.eclipse.jetty.plus.annotation;
-    exports org.eclipse.jetty.plus.jndi;
-    exports org.eclipse.jetty.plus.security;
-    exports org.eclipse.jetty.plus.webapp;
-
     requires org.eclipse.jetty.jndi;
-    requires transitive org.eclipse.jetty.webapp;
     requires org.slf4j;
 
+    requires transitive org.eclipse.jetty.webapp;
+
     // Only required if using DataSourceLoginService.
     requires static java.sql;
     // Only required if using Transaction.
@@ -33,5 +25,12 @@
     // Only required if using RunAs.
     requires static org.eclipse.jetty.servlet;
 
-    provides Configuration with EnvConfiguration, PlusConfiguration;
+    exports org.eclipse.jetty.plus.annotation;
+    exports org.eclipse.jetty.plus.jndi;
+    exports org.eclipse.jetty.plus.security;
+    exports org.eclipse.jetty.plus.webapp;
+
+    provides org.eclipse.jetty.webapp.Configuration with
+        org.eclipse.jetty.plus.webapp.EnvConfiguration,
+        org.eclipse.jetty.plus.webapp.PlusConfiguration;
 }
diff --git a/jetty-proxy/src/main/java/module-info.java b/jetty-proxy/src/main/java/module-info.java
index 7f6e8580415c..9bc4f5a5e750 100644
--- a/jetty-proxy/src/main/java/module-info.java
+++ b/jetty-proxy/src/main/java/module-info.java
@@ -13,9 +13,9 @@
 
 module org.eclipse.jetty.proxy
 {
-    exports org.eclipse.jetty.proxy;
-
     requires transitive org.eclipse.jetty.client;
     requires transitive org.eclipse.jetty.server;
     requires transitive org.slf4j;
+
+    exports org.eclipse.jetty.proxy;
 }
diff --git a/jetty-quickstart/src/main/java/module-info.java b/jetty-quickstart/src/main/java/module-info.java
index d5cdf8f5fd5e..38fda9e40840 100644
--- a/jetty-quickstart/src/main/java/module-info.java
+++ b/jetty-quickstart/src/main/java/module-info.java
@@ -13,9 +13,10 @@
 
 module org.eclipse.jetty.quickstart
 {
-    exports org.eclipse.jetty.quickstart;
-
     requires jetty.servlet.api;
-    requires transitive org.eclipse.jetty.annotations;
     requires org.slf4j;
+
+    requires transitive org.eclipse.jetty.annotations;
+
+    exports org.eclipse.jetty.quickstart;
 }
diff --git a/jetty-rewrite/src/main/java/module-info.java b/jetty-rewrite/src/main/java/module-info.java
index 24a8777d8417..6508b1f1349b 100644
--- a/jetty-rewrite/src/main/java/module-info.java
+++ b/jetty-rewrite/src/main/java/module-info.java
@@ -13,10 +13,11 @@
 
 module org.eclipse.jetty.rewrite
 {
-    exports org.eclipse.jetty.rewrite;
-    exports org.eclipse.jetty.rewrite.handler;
-
     requires jetty.servlet.api;
-    requires transitive org.eclipse.jetty.server;
     requires org.slf4j;
+
+    requires transitive org.eclipse.jetty.server;
+
+    exports org.eclipse.jetty.rewrite;
+    exports org.eclipse.jetty.rewrite.handler;
 }
diff --git a/jetty-security/src/main/java/module-info.java b/jetty-security/src/main/java/module-info.java
index 20eb1d2907cf..8ea25e789b0d 100644
--- a/jetty-security/src/main/java/module-info.java
+++ b/jetty-security/src/main/java/module-info.java
@@ -11,20 +11,20 @@
 // ========================================================================
 //
 
-import org.eclipse.jetty.security.Authenticator;
-
 module org.eclipse.jetty.security
 {
-    exports org.eclipse.jetty.security;
-    exports org.eclipse.jetty.security.authentication;
+    requires org.slf4j;
 
     requires transitive org.eclipse.jetty.server;
-    requires org.slf4j;
 
-    // Only required if using JDBCLoginService.
-    requires static java.sql;
     // Only required if using SPNEGO.
     requires static java.security.jgss;
+    // Only required if using JDBCLoginService.
+    requires static java.sql;
+
+    exports org.eclipse.jetty.security;
+    exports org.eclipse.jetty.security.authentication;
 
-    uses Authenticator.Factory;
+    uses org.eclipse.jetty.security.Authenticator.Factory;
 }
+
diff --git a/jetty-server/src/main/java/module-info.java b/jetty-server/src/main/java/module-info.java
index 0d15a24947ae..0af03e21647a 100644
--- a/jetty-server/src/main/java/module-info.java
+++ b/jetty-server/src/main/java/module-info.java
@@ -13,13 +13,6 @@
 
 module org.eclipse.jetty.server
 {
-    exports org.eclipse.jetty.server;
-    exports org.eclipse.jetty.server.handler;
-    exports org.eclipse.jetty.server.handler.gzip;
-    exports org.eclipse.jetty.server.handler.jmx to org.eclipse.jetty.jmx;
-    exports org.eclipse.jetty.server.jmx to org.eclipse.jetty.jmx;
-    exports org.eclipse.jetty.server.session;
-
     requires transitive jetty.servlet.api;
     requires transitive org.eclipse.jetty.http;
     requires transitive org.slf4j;
@@ -29,4 +22,15 @@
     requires static java.naming;
     // Only required if using JMX.
     requires static org.eclipse.jetty.jmx;
+
+    exports org.eclipse.jetty.server;
+    exports org.eclipse.jetty.server.handler;
+    exports org.eclipse.jetty.server.handler.gzip;
+    exports org.eclipse.jetty.server.session;
+
+    exports org.eclipse.jetty.server.handler.jmx to
+         org.eclipse.jetty.jmx;
+
+    exports org.eclipse.jetty.server.jmx to
+         org.eclipse.jetty.jmx;
 }
diff --git a/jetty-servlet/src/main/java/module-info.java b/jetty-servlet/src/main/java/module-info.java
index f1035d2d7d66..4221c8a9113f 100644
--- a/jetty-servlet/src/main/java/module-info.java
+++ b/jetty-servlet/src/main/java/module-info.java
@@ -13,18 +13,21 @@
 
 module org.eclipse.jetty.servlet
 {
-    exports org.eclipse.jetty.servlet;
-    exports org.eclipse.jetty.servlet.jmx to org.eclipse.jetty.jmx;
-    exports org.eclipse.jetty.servlet.listener;
+    requires org.slf4j;
 
     requires transitive org.eclipse.jetty.security;
-    requires org.slf4j;
 
-    // Only required if using StatisticsServlet.
-    requires static java.management;
-    requires static org.eclipse.jetty.util.ajax;
     // Only required if using IntrospectorCleaner.
     requires static java.desktop;
+    // Only required if using StatisticsServlet.
+    requires static java.management;
     // Only required if using JMX.
     requires static org.eclipse.jetty.jmx;
+    requires static org.eclipse.jetty.util.ajax;
+
+    exports org.eclipse.jetty.servlet;
+    exports org.eclipse.jetty.servlet.listener;
+
+    exports org.eclipse.jetty.servlet.jmx to
+         org.eclipse.jetty.jmx;
 }
diff --git a/jetty-servlets/src/main/java/module-info.java b/jetty-servlets/src/main/java/module-info.java
index 4ca60c9233f4..fd0762edde4c 100644
--- a/jetty-servlets/src/main/java/module-info.java
+++ b/jetty-servlets/src/main/java/module-info.java
@@ -16,10 +16,9 @@
 // but other utility classes that depend on some Jetty module.
 module org.eclipse.jetty.servlets
 {
-    exports org.eclipse.jetty.servlets;
+    requires org.slf4j;
 
     requires transitive jetty.servlet.api;
-    requires org.slf4j;
 
     // Only required if using CloseableDoSFilter.
     requires static org.eclipse.jetty.io;
@@ -28,4 +27,6 @@
     requires static org.eclipse.jetty.server;
     // Only required if using CrossOriginFilter, DoSFilter, etc.
     requires static org.eclipse.jetty.util;
+
+    exports org.eclipse.jetty.servlets;
 }
diff --git a/jetty-slf4j-impl/src/main/java/module-info.java b/jetty-slf4j-impl/src/main/java/module-info.java
index 40372a04ed8d..0d0b42c88133 100644
--- a/jetty-slf4j-impl/src/main/java/module-info.java
+++ b/jetty-slf4j-impl/src/main/java/module-info.java
@@ -11,15 +11,13 @@
 // ========================================================================
 //
 
-import org.eclipse.jetty.logging.JettyLoggingServiceProvider;
-import org.slf4j.spi.SLF4JServiceProvider;
-
 module org.eclipse.jetty.logging
 {
-    exports org.eclipse.jetty.logging;
-
     requires transitive java.management;
     requires transitive org.slf4j;
 
-    provides SLF4JServiceProvider with JettyLoggingServiceProvider;
+    exports org.eclipse.jetty.logging;
+
+    provides org.slf4j.spi.SLF4JServiceProvider with
+        org.eclipse.jetty.logging.JettyLoggingServiceProvider;
 }
diff --git a/jetty-unixdomain-server/src/main/java/module-info.java b/jetty-unixdomain-server/src/main/java/module-info.java
index 97065cabeadf..f6132447fdf8 100644
--- a/jetty-unixdomain-server/src/main/java/module-info.java
+++ b/jetty-unixdomain-server/src/main/java/module-info.java
@@ -13,8 +13,9 @@
 
 module org.eclipse.jetty.unixdomain.server
 {
-    exports org.eclipse.jetty.unixdomain.server;
+    requires org.slf4j;
 
     requires transitive org.eclipse.jetty.server;
-    requires org.slf4j;
+
+    exports org.eclipse.jetty.unixdomain.server;
 }
diff --git a/jetty-unixsocket/jetty-unixsocket-client/src/main/java/module-info.java b/jetty-unixsocket/jetty-unixsocket-client/src/main/java/module-info.java
index 40fdda1994a8..da8b976d258b 100644
--- a/jetty-unixsocket/jetty-unixsocket-client/src/main/java/module-info.java
+++ b/jetty-unixsocket/jetty-unixsocket-client/src/main/java/module-info.java
@@ -13,11 +13,12 @@
 
 module org.eclipse.jetty.unixsocket.client
 {
-    exports org.eclipse.jetty.unixsocket.client;
+    requires org.eclipse.jetty.unixsocket.common;
+    requires org.slf4j;
 
+    requires transitive org.eclipse.jetty.client;
     requires transitive org.jnrproject.enxio;
     requires transitive org.jnrproject.unixsocket;
-    requires transitive org.eclipse.jetty.client;
-    requires org.eclipse.jetty.unixsocket.common;
-    requires org.slf4j;
+
+    exports org.eclipse.jetty.unixsocket.client;
 }
diff --git a/jetty-unixsocket/jetty-unixsocket-common/src/main/java/module-info.java b/jetty-unixsocket/jetty-unixsocket-common/src/main/java/module-info.java
index 52fd7e519e12..e0a2686b0df8 100644
--- a/jetty-unixsocket/jetty-unixsocket-common/src/main/java/module-info.java
+++ b/jetty-unixsocket/jetty-unixsocket-common/src/main/java/module-info.java
@@ -13,9 +13,10 @@
 
 module org.eclipse.jetty.unixsocket.common
 {
-    exports org.eclipse.jetty.unixsocket.common;
+    requires org.slf4j;
 
-    requires transitive org.jnrproject.unixsocket;
     requires transitive org.eclipse.jetty.io;
-    requires org.slf4j;
+    requires transitive org.jnrproject.unixsocket;
+
+    exports org.eclipse.jetty.unixsocket.common;
 }
diff --git a/jetty-unixsocket/jetty-unixsocket-server/src/main/java/module-info.java b/jetty-unixsocket/jetty-unixsocket-server/src/main/java/module-info.java
index 75b7daa7381b..1a48df4f7f2d 100644
--- a/jetty-unixsocket/jetty-unixsocket-server/src/main/java/module-info.java
+++ b/jetty-unixsocket/jetty-unixsocket-server/src/main/java/module-info.java
@@ -13,11 +13,12 @@
 
 module org.eclipse.jetty.unixsocket.server
 {
-    exports org.eclipse.jetty.unixsocket.server;
+    requires org.slf4j;
 
-    requires transitive org.jnrproject.enxio;
-    requires transitive org.jnrproject.unixsocket;
     requires transitive org.eclipse.jetty.server;
     requires transitive org.eclipse.jetty.unixsocket.common;
-    requires org.slf4j;
+    requires transitive org.jnrproject.enxio;
+    requires transitive org.jnrproject.unixsocket;
+
+    exports org.eclipse.jetty.unixsocket.server;
 }
diff --git a/jetty-util-ajax/src/main/java/module-info.java b/jetty-util-ajax/src/main/java/module-info.java
index 28d9c437c07e..d298c454dc33 100644
--- a/jetty-util-ajax/src/main/java/module-info.java
+++ b/jetty-util-ajax/src/main/java/module-info.java
@@ -13,8 +13,8 @@
 
 module org.eclipse.jetty.util.ajax
 {
-    exports org.eclipse.jetty.util.ajax;
-
     requires org.eclipse.jetty.util;
     requires org.slf4j;
+
+    exports org.eclipse.jetty.util.ajax;
 }
diff --git a/jetty-util/src/main/java/module-info.java b/jetty-util/src/main/java/module-info.java
index fd75dcc635c0..6c3ff94320ed 100644
--- a/jetty-util/src/main/java/module-info.java
+++ b/jetty-util/src/main/java/module-info.java
@@ -11,10 +11,21 @@
 // ========================================================================
 //
 
-import org.eclipse.jetty.util.security.CredentialProvider;
-
 module org.eclipse.jetty.util
 {
+    // Standard Jetty Logging now.
+    requires org.slf4j;
+
+    // Required by SSL code (for X509).
+    requires transitive java.naming;
+
+    // Only required if using AppContextLeakPreventer/AWTLeakPreventer.
+    requires static java.desktop;
+    // Only required if using JavaUtilLog.
+    requires static java.logging;
+    // Only required if using DriverManagerLeakPreventer.
+    requires static java.sql;
+
     exports org.eclipse.jetty.util;
     exports org.eclipse.jetty.util.annotation;
     exports org.eclipse.jetty.util.component;
@@ -28,17 +39,5 @@
     exports org.eclipse.jetty.util.thread;
     exports org.eclipse.jetty.util.thread.strategy;
 
-    // Required by SSL code (for X509).
-    requires transitive java.naming;
-
-    // Standard Jetty Logging now.
-    requires org.slf4j;
-    // Only required if using DriverManagerLeakPreventer.
-    requires static java.sql;
-    // Only required if using AppContextLeakPreventer/AWTLeakPreventer.
-    requires static java.desktop;
-    // Only required if using JavaUtilLog.
-    requires static java.logging;
-
-    uses CredentialProvider;
+    uses org.eclipse.jetty.util.security.CredentialProvider;
 }
diff --git a/jetty-webapp/src/main/java/module-info.java b/jetty-webapp/src/main/java/module-info.java
index 5121f5eca995..89cfecc76cb6 100644
--- a/jetty-webapp/src/main/java/module-info.java
+++ b/jetty-webapp/src/main/java/module-info.java
@@ -11,20 +11,19 @@
 // ========================================================================
 //
 
-import org.eclipse.jetty.webapp.Configuration;
-
 module org.eclipse.jetty.webapp
 {
-    exports org.eclipse.jetty.webapp;
+    requires org.slf4j;
 
     requires transitive java.instrument;
     requires transitive org.eclipse.jetty.servlet;
     requires transitive org.eclipse.jetty.xml;
-    requires org.slf4j;
 
-    uses Configuration;
+    exports org.eclipse.jetty.webapp;
+
+    uses org.eclipse.jetty.webapp.Configuration;
 
-    provides Configuration with
+    provides org.eclipse.jetty.webapp.Configuration with 
         org.eclipse.jetty.webapp.FragmentConfiguration,
         org.eclipse.jetty.webapp.JaasConfiguration,
         org.eclipse.jetty.webapp.JaspiConfiguration,
diff --git a/jetty-websocket/websocket-core-client/src/main/java/module-info.java b/jetty-websocket/websocket-core-client/src/main/java/module-info.java
index 950c2060a166..e1139735009d 100644
--- a/jetty-websocket/websocket-core-client/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-core-client/src/main/java/module-info.java
@@ -13,12 +13,13 @@
 
 module org.eclipse.jetty.websocket.core.client
 {
-    exports org.eclipse.jetty.websocket.core.client;
-
     requires org.slf4j;
+
     requires transitive org.eclipse.jetty.client;
     requires transitive org.eclipse.jetty.websocket.core.common;
 
     // Only required if using XmlHttpClientProvider.
     requires static org.eclipse.jetty.xml;
+
+    exports org.eclipse.jetty.websocket.core.client;
 }
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 822e3c6c6ac1..8703605be28a 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
@@ -11,14 +11,14 @@
 // ========================================================================
 //
 
-import org.eclipse.jetty.websocket.core.Extension;
-import org.eclipse.jetty.websocket.core.internal.FragmentExtension;
-import org.eclipse.jetty.websocket.core.internal.IdentityExtension;
-import org.eclipse.jetty.websocket.core.internal.PerMessageDeflateExtension;
-import org.eclipse.jetty.websocket.core.internal.ValidationExtension;
-
 module org.eclipse.jetty.websocket.core.common
 {
+    requires org.eclipse.jetty.http;
+    requires org.slf4j;
+
+    requires transitive org.eclipse.jetty.io;
+    requires transitive org.eclipse.jetty.util;
+
     exports org.eclipse.jetty.websocket.core;
     exports org.eclipse.jetty.websocket.core.exception;
 
@@ -44,16 +44,11 @@
         org.eclipse.jetty.websocket.javax.client,
         org.eclipse.jetty.websocket.javax.server;
 
-    requires org.eclipse.jetty.http;
-    requires transitive org.eclipse.jetty.io;
-    requires transitive org.eclipse.jetty.util;
-    requires org.slf4j;
-
-    uses Extension;
-
-    provides Extension with
-        FragmentExtension,
-        IdentityExtension,
-        PerMessageDeflateExtension,
-        ValidationExtension;
+    uses org.eclipse.jetty.websocket.core.Extension;
+    
+    provides org.eclipse.jetty.websocket.core.Extension with
+        org.eclipse.jetty.websocket.core.internal.FragmentExtension,
+        org.eclipse.jetty.websocket.core.internal.IdentityExtension,
+        org.eclipse.jetty.websocket.core.internal.PerMessageDeflateExtension,
+        org.eclipse.jetty.websocket.core.internal.ValidationExtension;
 }
diff --git a/jetty-websocket/websocket-core-server/src/main/java/module-info.java b/jetty-websocket/websocket-core-server/src/main/java/module-info.java
index 915f30ecb0ac..6b31a5c2fb75 100644
--- a/jetty-websocket/websocket-core-server/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/module-info.java
@@ -13,9 +13,10 @@
 
 module org.eclipse.jetty.websocket.core.server
 {
-    exports org.eclipse.jetty.websocket.core.server;
-
     requires org.slf4j;
+
     requires transitive org.eclipse.jetty.server;
     requires transitive org.eclipse.jetty.websocket.core.common;
+
+    exports org.eclipse.jetty.websocket.core.server;
 }
diff --git a/jetty-websocket/websocket-javax-client/src/main/java/module-info.java b/jetty-websocket/websocket-javax-client/src/main/java/module-info.java
index 41fd30729401..c667ce00f746 100644
--- a/jetty-websocket/websocket-javax-client/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-javax-client/src/main/java/module-info.java
@@ -11,21 +11,22 @@
 // ========================================================================
 //
 
-import javax.websocket.ContainerProvider;
-
-import org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainerProvider;
-
 module org.eclipse.jetty.websocket.javax.client
 {
-    exports org.eclipse.jetty.websocket.javax.client;
-    exports org.eclipse.jetty.websocket.javax.client.internal to org.eclipse.jetty.websocket.javax.server;
-
-    requires static jetty.servlet.api;
-    requires org.slf4j;
     requires org.eclipse.jetty.websocket.core.client;
     requires org.eclipse.jetty.websocket.javax.common;
-    requires transitive org.eclipse.jetty.client;
+    requires org.slf4j;
+
     requires transitive jetty.websocket.api;
+    requires transitive org.eclipse.jetty.client;
+
+    requires static jetty.servlet.api;
+
+    exports org.eclipse.jetty.websocket.javax.client;
+
+    exports org.eclipse.jetty.websocket.javax.client.internal to
+        org.eclipse.jetty.websocket.javax.server;
 
-    provides ContainerProvider with JavaxWebSocketClientContainerProvider;
+    provides javax.websocket.ContainerProvider with
+        org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainerProvider;
 }
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/module-info.java b/jetty-websocket/websocket-javax-common/src/main/java/module-info.java
index a4a97dd8a1b4..2d50df733ca3 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/module-info.java
@@ -13,12 +13,13 @@
 
 module org.eclipse.jetty.websocket.javax.common
 {
+    requires org.slf4j;
+
+    requires transitive jetty.websocket.api;
+    requires transitive org.eclipse.jetty.websocket.core.client;
+
     exports org.eclipse.jetty.websocket.javax.common;
     exports org.eclipse.jetty.websocket.javax.common.decoders;
     exports org.eclipse.jetty.websocket.javax.common.encoders;
     exports org.eclipse.jetty.websocket.javax.common.messages;
-
-    requires org.slf4j;
-    requires transitive jetty.websocket.api;
-    requires transitive org.eclipse.jetty.websocket.core.client;
 }
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/module-info.java b/jetty-websocket/websocket-javax-server/src/main/java/module-info.java
index 5f525eb58817..cdc4e481b0f9 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-javax-server/src/main/java/module-info.java
@@ -11,26 +11,24 @@
 // ========================================================================
 //
 
-import javax.servlet.ServletContainerInitializer;
-import javax.websocket.server.ServerEndpointConfig;
-
-import org.eclipse.jetty.webapp.Configuration;
-import org.eclipse.jetty.websocket.javax.server.config.ContainerDefaultConfigurator;
-import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketConfiguration;
-import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;
-
 module org.eclipse.jetty.websocket.javax.server
 {
-    exports org.eclipse.jetty.websocket.javax.server.config;
-
     requires org.eclipse.jetty.websocket.core.server;
     requires org.eclipse.jetty.websocket.javax.common;
     requires org.eclipse.jetty.websocket.servlet;
     requires org.slf4j;
+
     requires transitive org.eclipse.jetty.webapp;
     requires transitive org.eclipse.jetty.websocket.javax.client;
 
-    provides Configuration with JavaxWebSocketConfiguration;
-    provides ServerEndpointConfig.Configurator with ContainerDefaultConfigurator;
-    provides ServletContainerInitializer with JavaxWebSocketServletContainerInitializer;
+    exports org.eclipse.jetty.websocket.javax.server.config;
+
+    provides javax.servlet.ServletContainerInitializer with
+        org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;
+
+    provides javax.websocket.server.ServerEndpointConfig.Configurator with
+        org.eclipse.jetty.websocket.javax.server.config.ContainerDefaultConfigurator;
+
+    provides  org.eclipse.jetty.webapp.Configuration with
+        org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketConfiguration;
 }
diff --git a/jetty-websocket/websocket-jetty-api/src/main/java/module-info.java b/jetty-websocket/websocket-jetty-api/src/main/java/module-info.java
index 5dff1f650443..a262968bbbe9 100644
--- a/jetty-websocket/websocket-jetty-api/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-jetty-api/src/main/java/module-info.java
@@ -11,8 +11,6 @@
 // ========================================================================
 //
 
-import org.eclipse.jetty.websocket.api.ExtensionConfig;
-
 module org.eclipse.jetty.websocket.jetty.api
 {
     exports org.eclipse.jetty.websocket.api;
@@ -20,5 +18,5 @@
     exports org.eclipse.jetty.websocket.api.exceptions;
     exports org.eclipse.jetty.websocket.api.util;
 
-    uses ExtensionConfig.Parser;
+    uses org.eclipse.jetty.websocket.api.ExtensionConfig.Parser;
 }
diff --git a/jetty-websocket/websocket-jetty-client/src/main/java/module-info.java b/jetty-websocket/websocket-jetty-client/src/main/java/module-info.java
index b1027d23fd7a..02866a7c7b1c 100644
--- a/jetty-websocket/websocket-jetty-client/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-jetty-client/src/main/java/module-info.java
@@ -13,12 +13,14 @@
 
 module org.eclipse.jetty.websocket.jetty.client
 {
-    exports org.eclipse.jetty.websocket.client;
-
-    requires static org.eclipse.jetty.webapp;
     requires org.eclipse.jetty.websocket.core.client;
     requires org.eclipse.jetty.websocket.jetty.common;
     requires org.slf4j;
+
     requires transitive org.eclipse.jetty.client;
     requires transitive org.eclipse.jetty.websocket.jetty.api;
+
+    requires static org.eclipse.jetty.webapp;
+
+    exports org.eclipse.jetty.websocket.client;
 }
diff --git a/jetty-websocket/websocket-jetty-common/src/main/java/module-info.java b/jetty-websocket/websocket-jetty-common/src/main/java/module-info.java
index 3ab332598ebe..6773b72e99a8 100644
--- a/jetty-websocket/websocket-jetty-common/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-jetty-common/src/main/java/module-info.java
@@ -11,17 +11,16 @@
 // ========================================================================
 //
 
-import org.eclipse.jetty.websocket.api.ExtensionConfig;
-import org.eclipse.jetty.websocket.common.ExtensionConfigParser;
-
 module org.eclipse.jetty.websocket.jetty.common
 {
-    exports org.eclipse.jetty.websocket.common;
-
     requires org.eclipse.jetty.util;
     requires org.slf4j;
+
     requires transitive org.eclipse.jetty.websocket.core.common;
     requires transitive org.eclipse.jetty.websocket.jetty.api;
 
-    provides ExtensionConfig.Parser with ExtensionConfigParser;
+    exports org.eclipse.jetty.websocket.common;
+
+    provides org.eclipse.jetty.websocket.api.ExtensionConfig.Parser with
+        org.eclipse.jetty.websocket.common.ExtensionConfigParser;
 }
diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/module-info.java b/jetty-websocket/websocket-jetty-server/src/main/java/module-info.java
index 4368b3a98adf..ba66c1e2744f 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-jetty-server/src/main/java/module-info.java
@@ -11,28 +11,26 @@
 // ========================================================================
 //
 
-import javax.servlet.ServletContainerInitializer;
-
-import org.eclipse.jetty.webapp.Configuration;
-import org.eclipse.jetty.websocket.server.config.JettyWebSocketConfiguration;
-import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
-
 module org.eclipse.jetty.websocket.jetty.server
 {
-    exports org.eclipse.jetty.websocket.server;
-    exports org.eclipse.jetty.websocket.server.config;
-
     requires jetty.servlet.api;
     requires org.eclipse.jetty.websocket.core.server;
     requires org.eclipse.jetty.websocket.jetty.common;
     requires org.eclipse.jetty.websocket.servlet;
     requires org.slf4j;
+
     requires transitive org.eclipse.jetty.webapp;
     requires transitive org.eclipse.jetty.websocket.jetty.api;
 
     // Only required if using JMX.
     requires static org.eclipse.jetty.jmx;
 
-    provides ServletContainerInitializer with JettyWebSocketServletContainerInitializer;
-    provides Configuration with JettyWebSocketConfiguration;
+    exports org.eclipse.jetty.websocket.server;
+    exports org.eclipse.jetty.websocket.server.config;
+
+    provides javax.servlet.ServletContainerInitializer with
+        org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
+
+    provides org.eclipse.jetty.webapp.Configuration with
+        org.eclipse.jetty.websocket.server.config.JettyWebSocketConfiguration;
 }
diff --git a/jetty-websocket/websocket-servlet/src/main/java/module-info.java b/jetty-websocket/websocket-servlet/src/main/java/module-info.java
index 3939f04080f6..524fc537ab90 100644
--- a/jetty-websocket/websocket-servlet/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-servlet/src/main/java/module-info.java
@@ -13,9 +13,10 @@
 
 module org.eclipse.jetty.websocket.servlet
 {
-    exports org.eclipse.jetty.websocket.servlet;
-
-    requires transitive org.eclipse.jetty.servlet;
     requires org.eclipse.jetty.websocket.core.server;
     requires org.slf4j;
+
+    requires transitive org.eclipse.jetty.servlet;
+
+    exports org.eclipse.jetty.websocket.servlet;
 }
diff --git a/jetty-xml/src/main/java/module-info.java b/jetty-xml/src/main/java/module-info.java
index 94ca49b6e13a..f89a840ef172 100644
--- a/jetty-xml/src/main/java/module-info.java
+++ b/jetty-xml/src/main/java/module-info.java
@@ -11,15 +11,14 @@
 // ========================================================================
 //
 
-import org.eclipse.jetty.xml.ConfigurationProcessorFactory;
-
 module org.eclipse.jetty.xml
 {
-    exports org.eclipse.jetty.xml;
+    requires org.slf4j;
 
     requires transitive java.xml;
     requires transitive org.eclipse.jetty.util;
-    requires org.slf4j;
 
-    uses ConfigurationProcessorFactory;
+    exports org.eclipse.jetty.xml;
+
+    uses org.eclipse.jetty.xml.ConfigurationProcessorFactory;
 }
diff --git a/tests/test-jpms/test-jpms-websocket-core/src/main/java/module-info.java b/tests/test-jpms/test-jpms-websocket-core/src/main/java/module-info.java
index c10573d1531f..d733160b5135 100644
--- a/tests/test-jpms/test-jpms-websocket-core/src/main/java/module-info.java
+++ b/tests/test-jpms/test-jpms-websocket-core/src/main/java/module-info.java
@@ -17,6 +17,6 @@
  */
 module org.eclipse.jetty.websocket.core.tests
 {
-    requires org.eclipse.jetty.websocket.core.server;
     requires org.eclipse.jetty.websocket.core.client;
+    requires org.eclipse.jetty.websocket.core.server;
 }