Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
May 27, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion jetty-core/jetty-http-spi/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -19,4 +22,6 @@
requires transitive org.eclipse.jetty.util;

exports org.eclipse.jetty.http.spi;
}

provides HttpServerProvider with JettyHttpServerProvider;
}
3 changes: 2 additions & 1 deletion jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...re-common/src/main/resources/META-INF/services/org.eclipse.jetty.websocket.core.Extension
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
10 changes: 9 additions & 1 deletion jetty-ee10/jetty-ee10-cdi/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}
2 changes: 1 addition & 1 deletion ...e10-plus/src/main/resources/META-INF/services/org.eclipse.jetty.ee10.webapp.Configuration
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 6 additions & 0 deletions jetty-ee10/jetty-ee10-quickstart/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -19,4 +23,6 @@
requires transitive org.eclipse.jetty.ee10.annotations;

exports org.eclipse.jetty.ee10.quickstart;

provides Configuration with QuickStartConfiguration, QuickStartGeneratorConfiguration;
}
2 changes: 1 addition & 1 deletion ...x-webapp/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...0-webapp/src/main/resources/META-INF/services/org.eclipse.jetty.ee10.webapp.Configuration
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 9 additions & 1 deletion jetty-ee9/jetty-ee9-cdi/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
2 changes: 1 addition & 1 deletion ...-ee9-plus/src/main/resources/META-INF/services/org.eclipse.jetty.ee9.webapp.Configuration
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 6 additions & 0 deletions jetty-ee9/jetty-ee9-quickstart/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -19,4 +23,6 @@
requires transitive org.eclipse.jetty.ee9.annotations;

exports org.eclipse.jetty.ee9.quickstart;

provides Configuration with QuickStartConfiguration, QuickStartGeneratorConfiguration;
}
2 changes: 1 addition & 1 deletion ...x-webapp/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer
View file
Open in desktop
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
1 change: 0 additions & 1 deletion ...i-webapp/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...e9-webapp/src/main/resources/META-INF/services/org.eclipse.jetty.ee9.webapp.Configuration
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading