More JPMS updates

Signed-off-by: jansupol <[email protected]>

Author: jansupol

bom/pom.xml

@@ -351,6 +351,11 @@
                 <artifactId>jersey-hk2</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.glassfish.jersey.inject</groupId>
+                <artifactId>jersey-cdi2-se</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.glassfish.jersey.test-framework</groupId>
                 <artifactId>jersey-test-framework-core</artifactId>

connectors/jetty-connector/pom.xml

@@ -97,10 +97,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty.toolchain</groupId>
-            <artifactId>jetty-jakarta-servlet-api</artifactId>
-            <version>${jetty.servlet.api.version}</version>
-            <scope>provided</scope>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

connectors/jetty11-connector/src/main/java/module-info.java

@@ -36,7 +36,8 @@
     requires org.glassfish.jersey.core.server;
 
     exports org.glassfish.jersey.netty.connector;
-    exports org.glassfish.jersey.netty.connector.internal to org.glassfish.jersey.container.netty.http;
+    exports org.glassfish.jersey.netty.connector.internal;
 
     opens org.glassfish.jersey.netty.connector;
+    opens org.glassfish.jersey.netty.connector.internal;
 }

connectors/jetty11-connector/src/test/java/module-info.java

@@ -21,17 +21,17 @@
     requires jakarta.inject;
     requires static jakarta.persistence;
     requires jakarta.ws.rs;
-    requires static jakarta.servlet;
+    requires jakarta.servlet;
 
     requires org.glassfish.jersey.core.common;
     requires org.glassfish.jersey.core.server;
 
+    exports org.glassfish.jersey.servlet;
     exports org.glassfish.jersey.servlet.async;
     exports org.glassfish.jersey.servlet.init;
     exports org.glassfish.jersey.servlet.internal.l10n;
     exports org.glassfish.jersey.servlet.internal.spi; //
     exports org.glassfish.jersey.servlet.spi;
-    exports org.glassfish.jersey.servlet;
 
     opens org.glassfish.jersey.servlet;
     opens org.glassfish.jersey.servlet.async;
@@ -44,6 +44,8 @@
     uses org.glassfish.jersey.servlet.spi.AsyncContextDelegateProvider;
     uses org.glassfish.jersey.servlet.spi.FilterUrlMappingsProvider;
 
+    provides jakarta.servlet.ServletContainerInitializer with
+            org.glassfish.jersey.servlet.init.JerseyServletContainerInitializer;
     provides org.glassfish.jersey.servlet.spi.AsyncContextDelegateProvider with
             org.glassfish.jersey.servlet.async.AsyncContextDelegateProviderImpl;
     provides org.glassfish.jersey.servlet.spi.FilterUrlMappingsProvider with

connectors/netty-connector/src/main/java/module-info.java

@@ -17,16 +17,17 @@
 module org.glassfish.jersey.container.jetty.servlet {
 
     requires jakarta.ws.rs;
-//    requires jakarta.servlet; //taken from jetty.servlet.api which is part of jetty server
+    requires jakarta.servlet;
 
     requires org.eclipse.jetty.http;
     requires org.eclipse.jetty.server;
     requires org.eclipse.jetty.util;
-    requires org.eclipse.jetty.webapp;
 
     requires org.glassfish.jersey.core.common;
     requires org.glassfish.jersey.container.jetty.http;
     requires static org.glassfish.jersey.container.servlet;
+    requires org.eclipse.jetty.ee10.webapp;
 
     exports org.glassfish.jersey.jetty.servlet;
+    opens org.glassfish.jersey.jetty.servlet;
 }

containers/jersey-servlet/src/main/java/module-info.java

@@ -33,15 +33,6 @@
 
     <description>Jersey core client implementation</description>
 
-    <properties>
-        <surefire.coverage.argline>
-            --add-exports org.glassfish.jersey.core.common/org.glassfish.jersey.innate=ALL-UNNAMED
-            --add-exports org.glassfish.jersey.core.common/org.glassfish.jersey.innate.virtual=ALL-UNNAMED
-            --add-exports org.glassfish.jersey.core.common/org.glassfish.jersey.innate.io=ALL-UNNAMED
-            --add-exports org.glassfish.jersey.core.common/org.glassfish.jersey.innate.inject=ALL-UNNAMED
-        </surefire.coverage.argline>
-    </properties>
-
     <build>
         <plugins>
             <plugin>

containers/jetty-http/src/main/java11/org/glassfish/jersey/jetty/JettyHttpContainer.java

@@ -316,7 +316,12 @@
 
     <properties>
         <surefire.security.argline>-Djava.security.manager -Djava.security.policy=${project.build.directory}/test-classes/server.policy</surefire.security.argline>
-        <surefire.coverage.argline>--add-opens org.glassfish.jersey.core.server/org.glassfish.jersey.server.internal.inject=jakarta.xml.bind</surefire.coverage.argline>
+        <surefire.coverage.argline>
+            --add-opens org.glassfish.jersey.core.server/org.glassfish.jersey.server.internal.inject=jakarta.xml.bind
+            --add-reads org.glassfish.jersey.core.server=org.glassfish.hk2.api
+            --add-reads org.glassfish.jersey.core.server=org.glassfish.hk2.locator
+            --add-reads org.glassfish.jersey.core.server=org.glassfish.jersey.inject.hk2
+        </surefire.coverage.argline>
     </properties>
 
 </project>