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 02691171d5)
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

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;
 }

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 transitive org.eclipse.jetty.io;
     requires org.slf4j;
 
-    uses ALPNProcessor.Client;
+    requires transitive org.eclipse.jetty.io;
+
+    exports org.eclipse.jetty.alpn.client;
+
+    uses org.eclipse.jetty.io.ssl.ALPNProcessor.Client;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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 transitive org.eclipse.jetty.server;
     requires org.slf4j;
 
-    uses ALPNProcessor.Server;
+    requires transitive org.eclipse.jetty.server;
+
+    exports org.eclipse.jetty.alpn.server;
+
+    uses org.eclipse.jetty.io.ssl.ALPNProcessor.Server;
 }

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 transitive org.eclipse.jetty.plus;
-    requires transitive org.objectweb.asm;
     requires org.slf4j;
 
-    uses ServletContainerInitializer;
+    requires transitive org.eclipse.jetty.plus;
+    requires transitive org.objectweb.asm;
 
-    provides Configuration with AnnotationConfiguration;
+    exports org.eclipse.jetty.annotations;
+
+    uses javax.servlet.ServletContainerInitializer;
+
+    provides org.eclipse.jetty.webapp.Configuration with
+        org.eclipse.jetty.annotations.AnnotationConfiguration;
 }

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;
-} 
+} 

jetty-client/src/main/java/module-info.java

@@ -13,20 +13,23 @@
 
 module org.eclipse.jetty.client
 {
+    requires org.eclipse.jetty.alpn.client;
+    requires org.slf4j;
+
+    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.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;
-    // Only required if using JMX.
-    requires static java.management;
-    requires static org.eclipse.jetty.jmx;
+    exports org.eclipse.jetty.client.jmx to
+        org.eclipse.jetty.jmx;
 }

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;
 }

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;
 }

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;
 }

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
 {
+    requires org.slf4j;
+
+    requires transitive org.eclipse.jetty.io;
+
     exports org.eclipse.jetty.http;
     exports org.eclipse.jetty.http.pathmap;
 
-    requires transitive org.eclipse.jetty.io;
-    requires org.slf4j;
+    uses org.eclipse.jetty.http.HttpFieldPreEncoder;
 
-    uses HttpFieldPreEncoder;
-
-    provides HttpFieldPreEncoder with Http1FieldPreEncoder;
+    provides org.eclipse.jetty.http.HttpFieldPreEncoder with
+        org.eclipse.jetty.http.Http1FieldPreEncoder;
 }

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;
 }

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;
 }

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 transitive org.eclipse.jetty.http;
     requires org.slf4j;
 
-    provides HttpFieldPreEncoder with HpackFieldPreEncoder;
+    requires transitive org.eclipse.jetty.http;
+
+    exports org.eclipse.jetty.http2.hpack;
+
+    provides org.eclipse.jetty.http.HttpFieldPreEncoder with
+        org.eclipse.jetty.http2.hpack.HpackFieldPreEncoder;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

jetty-jndi/src/main/java/module-info.java

@@ -13,18 +13,19 @@
 
 module org.eclipse.jetty.jndi
 {
+    requires org.slf4j;
+
+    requires transitive java.naming;
+    requires transitive org.eclipse.jetty.server;
+
+    // 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;
-
-    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;
-    requires static org.eclipse.jetty.security;
 }

jetty-memcached/jetty-memcached-sessions/src/main/java/module-info.java

@@ -18,4 +18,4 @@ module org.eclipse.jetty.memcached.session
     requires transitive xmemcached;
 
     exports org.eclipse.jetty.memcached.session;
-}
+}

jetty-openid/src/main/java/module-info.java

@@ -13,9 +13,10 @@
 
 module org.eclipse.jetty.security.openid
 {
-    requires transitive org.eclipse.jetty.client;
-    requires transitive org.eclipse.jetty.security;
     requires org.eclipse.jetty.util.ajax;
 
+    requires transitive org.eclipse.jetty.client;
+    requires transitive org.eclipse.jetty.security;
+
     exports org.eclipse.jetty.security.openid;
-}
+}

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 @@ module org.eclipse.jetty.plus
     // 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;
 }

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;
 }

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;
 }

jetty-rewrite/src/main/java/module-info.java

@@ -13,10 +13,11 @@
 
 module org.eclipse.jetty.rewrite
 {
+    requires jetty.servlet.api;
+    requires org.slf4j;
+
+    requires transitive org.eclipse.jetty.server;
+
     exports org.eclipse.jetty.rewrite;
     exports org.eclipse.jetty.rewrite.handler;
-
-    requires jetty.servlet.api;
-    requires transitive org.eclipse.jetty.server;
-    requires org.slf4j;
 }

jetty-security/src/main/java/module-info.java

@@ -11,20 +11,20 @@
 // ========================================================================
 //
 
-import org.eclipse.jetty.security.Authenticator;
-
 module org.eclipse.jetty.security
 {
+    requires org.slf4j;
+
+    requires transitive org.eclipse.jetty.server;
+
+    // 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;
 
-    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;
-
-    uses Authenticator.Factory;
+    uses org.eclipse.jetty.security.Authenticator.Factory;
 }
+

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 @@ module org.eclipse.jetty.server
     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;
 }

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 transitive org.eclipse.jetty.security;
     requires org.slf4j;
 
-    // Only required if using StatisticsServlet.
-    requires static java.management;
-    requires static org.eclipse.jetty.util.ajax;
+    requires transitive org.eclipse.jetty.security;
+
     // 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;
 }

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 @@ module org.eclipse.jetty.servlets
     requires static org.eclipse.jetty.server;
     // Only required if using CrossOriginFilter, DoSFilter, etc.
     requires static org.eclipse.jetty.util;
+
+    exports org.eclipse.jetty.servlets;
 }

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;
 }

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;
 }

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 transitive org.jnrproject.enxio;
-    requires transitive org.jnrproject.unixsocket;
-    requires transitive org.eclipse.jetty.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;
+
+    exports org.eclipse.jetty.unixsocket.client;
 }

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 transitive org.jnrproject.unixsocket;
-    requires transitive org.eclipse.jetty.io;
     requires org.slf4j;
+
+    requires transitive org.eclipse.jetty.io;
+    requires transitive org.jnrproject.unixsocket;
+
+    exports org.eclipse.jetty.unixsocket.common;
 }

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;
 }

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;
 }

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 @@ module org.eclipse.jetty.util
     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;
 }

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;
 
-    provides Configuration with
+    uses org.eclipse.jetty.webapp.Configuration;
+
+    provides org.eclipse.jetty.webapp.Configuration with 
         org.eclipse.jetty.webapp.FragmentConfiguration,
         org.eclipse.jetty.webapp.JaasConfiguration,
         org.eclipse.jetty.webapp.JaspiConfiguration,

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;
 }

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 @@ module org.eclipse.jetty.websocket.core.common
         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;
 }

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;
 }

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 transitive jetty.websocket.api;
+    requires org.slf4j;
 
-    provides ContainerProvider with JavaxWebSocketClientContainerProvider;
+    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 javax.websocket.ContainerProvider with
+        org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainerProvider;
 }

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;
 }

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;
 }

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 @@ module org.eclipse.jetty.websocket.jetty.api
     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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }