Fixes #11778 - jetty-http-spi does not properly provide SPI for modules.

Fixed all module-info.java files that did not have a "provides" declaration but had META-INF/services files. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
jetty · May 27, 2024 · 65a016d · 65a016d
1 parent b164602
commit 65a016d
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 13 deletions.
diff --git a/jetty-core/jetty-http-spi/src/main/java/module-info.java b/jetty-core/jetty-http-spi/src/main/java/module-info.java
@@ -11,6 +11,9 @@
 // ========================================================================
 //
 
+import com.sun.net.httpserver.spi.HttpServerProvider;
+import org.eclipse.jetty.http.spi.JettyHttpServerProvider;
+
 module org.eclipse.jetty.http.spi
 {
     requires transitive jdk.httpserver;
@@ -19,4 +22,6 @@
     requires transitive org.eclipse.jetty.util;
 
     exports org.eclipse.jetty.http.spi;
-}
+
+    provides HttpServerProvider with JettyHttpServerProvider;
+}
diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/module-info.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/module-info.java
@@ -27,9 +27,10 @@
         org.eclipse.jetty.util; // Export to DecoratedObjectFactory.
 
     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.FrameCaptureExtension,
         org.eclipse.jetty.websocket.core.internal.IdentityExtension,
         org.eclipse.jetty.websocket.core.internal.PerMessageDeflateExtension,
         org.eclipse.jetty.websocket.core.internal.ValidationExtension;

diff --git a/...re-common/src/main/resources/META-INF/services/org.eclipse.jetty.websocket.core.Extension b/...re-common/src/main/resources/META-INF/services/org.eclipse.jetty.websocket.core.Extension
@@ -1,5 +1,5 @@
-org.eclipse.jetty.websocket.core.internal.IdentityExtension
 org.eclipse.jetty.websocket.core.internal.FragmentExtension
+org.eclipse.jetty.websocket.core.internal.FrameCaptureExtension
+org.eclipse.jetty.websocket.core.internal.IdentityExtension
 org.eclipse.jetty.websocket.core.internal.PerMessageDeflateExtension
 org.eclipse.jetty.websocket.core.internal.ValidationExtension
-org.eclipse.jetty.websocket.core.internal.FrameCaptureExtension
diff --git a/jetty-ee10/jetty-ee10-cdi/src/main/java/module-info.java b/jetty-ee10/jetty-ee10-cdi/src/main/java/module-info.java
@@ -11,6 +11,11 @@
 // ========================================================================
 //
 
+import jakarta.servlet.ServletContainerInitializer;
+import org.eclipse.jetty.ee10.cdi.CdiConfiguration;
+import org.eclipse.jetty.ee10.cdi.CdiServletContainerInitializer;
+import org.eclipse.jetty.ee10.webapp.Configuration;
+
 module org.eclipse.jetty.ee10.cdi
 {
     requires org.eclipse.jetty.ee10.annotations;
@@ -19,4 +24,7 @@
     requires transitive org.eclipse.jetty.ee10.webapp;
 
     exports org.eclipse.jetty.ee10.cdi;
-} 
+
+    provides ServletContainerInitializer with CdiServletContainerInitializer;
+    provides Configuration with CdiConfiguration;
+}
diff --git a/...e10-plus/src/main/resources/META-INF/services/org.eclipse.jetty.ee10.webapp.Configuration b/...e10-plus/src/main/resources/META-INF/services/org.eclipse.jetty.ee10.webapp.Configuration
@@ -1,2 +1,2 @@
-org.eclipse.jetty.ee10.plus.webapp.PlusConfiguration
 org.eclipse.jetty.ee10.plus.webapp.EnvConfiguration
+org.eclipse.jetty.ee10.plus.webapp.PlusConfiguration
diff --git a/jetty-ee10/jetty-ee10-quickstart/src/main/java/module-info.java b/jetty-ee10/jetty-ee10-quickstart/src/main/java/module-info.java
@@ -11,6 +11,10 @@
 // ========================================================================
 //
 
+import org.eclipse.jetty.ee10.quickstart.QuickStartConfiguration;
+import org.eclipse.jetty.ee10.quickstart.QuickStartGeneratorConfiguration;
+import org.eclipse.jetty.ee10.webapp.Configuration;
+
 module org.eclipse.jetty.ee10.quickstart
 {
     requires  jakarta.servlet;
@@ -19,4 +23,6 @@
     requires transitive org.eclipse.jetty.ee10.annotations;
 
     exports org.eclipse.jetty.ee10.quickstart;
+
+    provides Configuration with QuickStartConfiguration, QuickStartGeneratorConfiguration;
 }
diff --git a/...x-webapp/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer b/...x-webapp/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer
@@ -1 +1 @@
-org.eclipse.jetty.test.jmx.MyContainerInitializer
+org.eclipse.jetty.ee10.test.jmx.MyContainerInitializer
diff --git a/...0-webapp/src/main/resources/META-INF/services/org.eclipse.jetty.ee10.webapp.Configuration b/...0-webapp/src/main/resources/META-INF/services/org.eclipse.jetty.ee10.webapp.Configuration
@@ -1,7 +1,7 @@
 org.eclipse.jetty.ee10.webapp.FragmentConfiguration
-org.eclipse.jetty.ee10.webapp.JettyWebXmlConfiguration
 org.eclipse.jetty.ee10.webapp.JaasConfiguration
 org.eclipse.jetty.ee10.webapp.JaspiConfiguration
+org.eclipse.jetty.ee10.webapp.JettyWebXmlConfiguration
 org.eclipse.jetty.ee10.webapp.JmxConfiguration
 org.eclipse.jetty.ee10.webapp.JndiConfiguration
 org.eclipse.jetty.ee10.webapp.JspConfiguration

diff --git a/jetty-ee9/jetty-ee9-cdi/src/main/java/module-info.java b/jetty-ee9/jetty-ee9-cdi/src/main/java/module-info.java
@@ -11,11 +11,19 @@
 // ========================================================================
 //
 
+import jakarta.servlet.ServletContainerInitializer;
+import org.eclipse.jetty.ee9.cdi.CdiConfiguration;
+import org.eclipse.jetty.ee9.cdi.CdiServletContainerInitializer;
+import org.eclipse.jetty.ee9.webapp.Configuration;
+
 module org.eclipse.jetty.ee9.cdi
 {
     requires org.eclipse.jetty.ee9.annotations;
 
     requires transitive org.eclipse.jetty.ee9.webapp;
 
     exports org.eclipse.jetty.ee9.cdi;
-} 
+
+    provides ServletContainerInitializer with CdiServletContainerInitializer;
+    provides Configuration with CdiConfiguration;
+}
diff --git a/...-ee9-plus/src/main/resources/META-INF/services/org.eclipse.jetty.ee9.webapp.Configuration b/...-ee9-plus/src/main/resources/META-INF/services/org.eclipse.jetty.ee9.webapp.Configuration
@@ -1,2 +1,2 @@
-org.eclipse.jetty.ee9.plus.webapp.PlusConfiguration
 org.eclipse.jetty.ee9.plus.webapp.EnvConfiguration
+org.eclipse.jetty.ee9.plus.webapp.PlusConfiguration
diff --git a/jetty-ee9/jetty-ee9-quickstart/src/main/java/module-info.java b/jetty-ee9/jetty-ee9-quickstart/src/main/java/module-info.java
@@ -11,6 +11,10 @@
 // ========================================================================
 //
 
+import org.eclipse.jetty.ee9.quickstart.QuickStartConfiguration;
+import org.eclipse.jetty.ee9.quickstart.QuickStartGeneratorConfiguration;
+import org.eclipse.jetty.ee9.webapp.Configuration;
+
 module org.eclipse.jetty.ee9.quickstart
 {
     requires jetty.servlet.api;
@@ -19,4 +23,6 @@
     requires transitive org.eclipse.jetty.ee9.annotations;
 
     exports org.eclipse.jetty.ee9.quickstart;
+
+    provides Configuration with QuickStartConfiguration, QuickStartGeneratorConfiguration;
 }
diff --git a/...x-webapp/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer b/...x-webapp/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer
@@ -1 +1 @@
-org.eclipse.jetty.test.jmx.MyContainerInitializer
+org.eclipse.jetty.ee9.test.jmx.MyContainerInitializer
diff --git a/...i-webapp/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer b/...i-webapp/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer
diff --git a/...e9-webapp/src/main/resources/META-INF/services/org.eclipse.jetty.ee9.webapp.Configuration b/...e9-webapp/src/main/resources/META-INF/services/org.eclipse.jetty.ee9.webapp.Configuration
@@ -1,7 +1,7 @@
 org.eclipse.jetty.ee9.webapp.FragmentConfiguration
-org.eclipse.jetty.ee9.webapp.JettyWebXmlConfiguration
 org.eclipse.jetty.ee9.webapp.JaasConfiguration
 org.eclipse.jetty.ee9.webapp.JaspiConfiguration
+org.eclipse.jetty.ee9.webapp.JettyWebXmlConfiguration
 org.eclipse.jetty.ee9.webapp.JmxConfiguration
 org.eclipse.jetty.ee9.webapp.JndiConfiguration
 org.eclipse.jetty.ee9.webapp.JspConfiguration
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		org.eclipse.jetty.test.jmx.MyContainerInitializer
		org.eclipse.jetty.ee10.test.jmx.MyContainerInitializer
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		org.eclipse.jetty.test.jmx.MyContainerInitializer
		org.eclipse.jetty.ee9.test.jmx.MyContainerInitializer