JPMS in e2e-server

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

Author: jansupol

connectors/helidon-connector/pom.xml

@@ -178,6 +178,7 @@
                         <configuration>
                             <instructions>
                                 <Multi-Release>true</Multi-Release>
+                                <Automatic-Module-Name>org.glassfish.jersey.helidon.connector</Automatic-Module-Name>
                             </instructions>
                         </configuration>
                     </plugin>

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

@@ -27,10 +27,18 @@
 
     exports org.glassfish.jersey.jdk.connector;
     exports org.glassfish.jersey.jdk.connector.internal to
+            org.glassfish.jersey.core.client,
             org.glassfish.hk2.locator,
-            org.glassfish.hk2.utilities;
+            org.glassfish.hk2.utilities,
+            weld.core.impl;
     exports org.glassfish.jersey.jdk.connector.internal.l10n;
 
     opens org.glassfish.jersey.jdk.connector;
+    opens org.glassfish.jersey.jdk.connector.internal to
+            org.glassfish.jersey.core.client,
+            org.glassfish.hk2.locator,
+            org.glassfish.hk2.utilities,
+            weld.core.impl;
+
     opens org.glassfish.jersey.jdk.connector.internal.l10n;
 }

connectors/jetty-http2-connector/src/test/java/module-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -30,6 +30,7 @@
     requires org.glassfish.jersey.core.client;
     requires org.glassfish.jersey.core.server;
     requires org.glassfish.jersey.jetty.connector;
+    requires org.glassfish.jersey.media.json.jackson;
 
     requires org.junit.jupiter.api;
     requires org.hamcrest;

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

@@ -41,6 +41,7 @@
     requires org.glassfish.jersey.core.client;
     requires org.glassfish.jersey.core.server;
     requires org.glassfish.jersey.jnh.connector;
+    requires org.glassfish.jersey.media.json.jackson;
 
     exports org.glassfish.jersey.jnh.connector.test;
     opens org.glassfish.jersey.jnh.connector.test;

connectors/jnh-connector/src/test/java/org/glassfish/jersey/jnh/connector/test/AbstractJavaConnectorTest.java

@@ -89,7 +89,7 @@ public void asyncPostWithTimeout(@QueryParam("timeout") @DefaultValue("10") Long
             asyncResponse.setTimeout(timeoutSeconds, TimeUnit.SECONDS);
             CompletableFuture.runAsync(() -> {
                         try {
-                            Thread.sleep(3000);
+                            Thread.sleep(2000);
                         } catch (InterruptedException e) {
                             Thread.currentThread().interrupt();
                             throw new RuntimeException(e);

containers/grizzly2-http/src/main/java/org/glassfish/jersey/grizzly2/httpserver/GrizzlyHttpContainer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2024 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -118,9 +118,11 @@ public GrizzlyResponseReferencingFactory(final Provider<Ref<Response>> reference
      * Note that since Grizzly {@code Request} class is not proxiable as it does not expose an empty constructor,
      * the injection of Grizzly request instance into singleton JAX-RS and Jersey providers is only supported via
      * {@link jakarta.inject.Provider injection provider}.
+     * <p/>
+     * Note that since Jersey 4, Grizzly {@code Response} is also supported via
+     * {@link jakarta.inject.Provider injection provider} only for the java module reasons.
      */
     static class GrizzlyBinder extends InternalBinder {
-
         @Override
         protected void configure() {
             bindFactory(GrizzlyRequestReferencingFactory.class).to(Request.class)
@@ -131,7 +133,7 @@ protected void configure() {
                     .id(InjectionIds.GRIZZLY_REQUEST.id());
 
             bindFactory(GrizzlyResponseReferencingFactory.class).to(Response.class)
-                    .proxy(true).proxyForSameScope(false).in(RequestScoped.class)
+                    .proxy(false).in(RequestScoped.class)
                     .id(InjectionIds.GRIZZLY_RESPONSE_REFERENCING_FACTORY.id());
             bindFactory(ReferencingFactory.<Response>referenceFactory()).to(new GenericType<Ref<Response>>() {})
                     .in(RequestScoped.class)

containers/helidon/pom.xml

@@ -91,6 +91,16 @@
                 <artifactId>build-helper-maven-plugin</artifactId>
                 <inherited>true</inherited>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <inherited>true</inherited>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.glassfish.jersey.container.helidon</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
 
         <resources>

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

@@ -34,7 +34,11 @@
     exports org.glassfish.jersey.servlet;
 
     opens org.glassfish.jersey.servlet;
+    opens org.glassfish.jersey.servlet.async;
+    opens org.glassfish.jersey.servlet.init;
+    opens org.glassfish.jersey.servlet.internal.spi;
     opens org.glassfish.jersey.servlet.internal.l10n;
+    opens org.glassfish.jersey.servlet.spi;
 
     uses org.glassfish.jersey.servlet.spi.AsyncContextDelegate;
     uses org.glassfish.jersey.servlet.spi.AsyncContextDelegateProvider;

containers/jersey-servlet/src/main/java/org/glassfish/jersey/servlet/WebComponent.java

@@ -35,7 +35,7 @@
 import jakarta.ws.rs.core.SecurityContext;
 import org.glassfish.jersey.innate.inject.InjectionIds;
 import org.glassfish.jersey.innate.inject.InternalBinder;
-import org.glassfish.jersey.innate.inject.ServiceFinderBinder;
+import org.glassfish.jersey.internal.ServiceFinderBinder;
 import org.glassfish.jersey.innate.io.InputStreamWrapper;
 import org.glassfish.jersey.internal.inject.InjectionManager;
 import org.glassfish.jersey.internal.inject.Providers;

core-client/pom.xml

@@ -39,7 +39,6 @@
             --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
-            --add-modules=ALL-MODULE-PATH
         </surefire.coverage.argline>
     </properties>