Fixes #6938 - module-info.java file do not use the canonical order fo…

…r the elements Changed order of entries in module-info.java to be canonical (cherry picked from commit 0269117) Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
jetty · Sep 30, 2021 · 64db46c · 64db46c
1 parent 8dd683c
commit 64db46c
Show file tree

Hide file tree

Showing 55 changed files with 301 additions and 295 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
-} 
+} 
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
 }