JPMS in e2e, e2e-server, e2e-entity

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>
 

core-client/src/main/java/module-info.java

@@ -51,18 +51,17 @@
             org.glassfish.jersey.incubator.injectless.client;
 
     opens org.glassfish.jersey.client;
-    opens org.glassfish.jersey.client.spi;
+    opens org.glassfish.jersey.client.authentication;
     opens org.glassfish.jersey.client.filter;
+    opens org.glassfish.jersey.client.http;
+    opens org.glassfish.jersey.client.inject;
+    opens org.glassfish.jersey.client.spi;
 
     // for Localization messages
     opens org.glassfish.jersey.client.internal;
 
-    uses org.glassfish.jersey.client.spi.AsyncConnectorCallback;
     uses org.glassfish.jersey.client.spi.ConnectorProvider;
     uses org.glassfish.jersey.client.spi.DefaultSslContextProvider;
-    uses org.glassfish.jersey.client.spi.InvocationBuilderListener;
-    uses org.glassfish.jersey.client.spi.PostInvocationInterceptor;
-    uses org.glassfish.jersey.client.spi.PreInvocationInterceptor;
 
     provides jakarta.ws.rs.client.ClientBuilder with
             org.glassfish.jersey.client.JerseyClientBuilder;

core-common/pom.xml

@@ -78,22 +78,6 @@
         </testResources>
 
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${compiler.common.mvn.plugin.version}</version>
-                <inherited>false</inherited>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                    <compilerArguments>
-                        <!-- Do not warn about using sun.misc.Unsafe -->
-                        <XDignore.symbol.file />
-                    </compilerArguments>
-                    <showWarnings>false</showWarnings>
-                    <fork>false</fork>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>com.sun.istack</groupId>
                 <artifactId>istack-commons-maven-plugin</artifactId>
@@ -301,7 +285,7 @@
                         <artifactId>build-helper-maven-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>add.java20-</id>
+                                <id>add.java20+</id>
                                 <phase>generate-sources</phase>
                                 <goals>
                                     <goal>add-source</goal>
@@ -474,10 +458,6 @@
         <surefire.security.argline>-Djava.security.manager -Djava.security.policy=${project.build.directory}/test-classes/surefire.policy</surefire.security.argline>
         <java21.build.outputDirectory>${project.build.directory}/classes-java21</java21.build.outputDirectory>
         <java21.sourceDirectory>${project.basedir}/src/main/java21</java21.sourceDirectory>
-        <surefire.coverage.argline>
-            --add-reads org.glassfish.jersey.core.common=ALL-UNNAMED
-            --add-modules=ALL-MODULE-PATH
-        </surefire.coverage.argline>
     </properties>
 
 </project>

core-common/src/main/java/module-info.java

@@ -42,6 +42,7 @@
     exports org.glassfish.jersey.internal.routing; //
     exports org.glassfish.jersey.internal.util;
     exports org.glassfish.jersey.internal.util.collection;
+    exports org.glassfish.jersey.io.spi;
     exports org.glassfish.jersey.logging;
     exports org.glassfish.jersey.message;
     exports org.glassfish.jersey.message.internal; // Providers
@@ -62,28 +63,32 @@
                                            org.glassfish.jersey.container.jetty.http,
                                            org.glassfish.jersey.netty.connector,
                                            org.glassfish.jersey.ext.mp.rest.client,
+                                           org.glassfish.jersey.inject.cdi2.se,
                                            org.glassfish.jersey.incubator.cdi.inject.weld;
 
-    exports org.glassfish.jersey.innate.inject to org.glassfish.jersey.inject.hk2,
-                                                  org.glassfish.jersey.inject.cdi2.se,
-                                                  org.glassfish.jersey.core.client,
-                                                  org.glassfish.jersey.core.server,
-                                                  org.glassfish.jersey.container.grizzly2.http,
-                                                  org.glassfish.jersey.container.servlet,
-                                                  org.glassfish.jersey.container.jetty.http,
-                                                  org.glassfish.jersey.media.sse,
-                                                  org.glassfish.jersey.media.jaxb,
-                                                  org.glassfish.jersey.media.moxy,
-                                                  org.glassfish.jersey.media.multipart,
-                                                  org.glassfish.jersey.ext.bean.validation,
-                                                  org.glassfish.jersey.ext.cdi1x,
-                                                  org.glassfish.jersey.ext.cdi1x.transaction,
-                                                  org.glassfish.jersey.ext.entity.filtering,
-                                                  org.glassfish.jersey.ext.metainf.services,
-                                                  org.glassfish.jersey.ext.mvc,
-                                                  org.glassfish.jersey.incubator.cdi.inject.weld,
-                                                  org.glassfish.jersey.gf.ejb,
-                                                  org.glassfish.jersey.security.oauth1.signature;
+    exports org.glassfish.jersey.innate.inject to
+            org.glassfish.jersey.inject.hk2,
+            org.glassfish.jersey.core.client,
+            org.glassfish.jersey.core.server,
+            org.glassfish.jersey.container.grizzly2.http,
+            org.glassfish.jersey.container.servlet,
+            org.glassfish.jersey.container.jetty.http,
+            org.glassfish.jersey.media.sse,
+            org.glassfish.jersey.media.jaxb,
+            org.glassfish.jersey.media.json.jackson,
+            org.glassfish.jersey.media.moxy,
+            org.glassfish.jersey.media.multipart,
+            org.glassfish.jersey.ext.bean.validation,
+            org.glassfish.jersey.ext.cdi1x,
+            org.glassfish.jersey.ext.cdi1x.transaction,
+            org.glassfish.jersey.ext.entity.filtering,
+            org.glassfish.jersey.ext.metainf.services,
+            org.glassfish.jersey.ext.mvc,
+            org.glassfish.jersey.incubator.cdi.inject.weld,
+            org.glassfish.jersey.incubator.declarative.linking,
+            org.glassfish.jersey.inject.cdi2.se,
+            org.glassfish.jersey.gf.ejb,
+            org.glassfish.jersey.security.oauth1.signature;
     exports org.glassfish.jersey.innate.virtual to org.glassfish.jersey.container.grizzly2.http,
                                                    org.glassfish.jersey.container.jetty.http,
                                                    org.glassfish.jersey.netty.connector,
@@ -100,22 +105,38 @@
     exports org.glassfish.jersey.innate.spi to org.glassfish.jersey.core.client,
                                                org.glassfish.jersey.core.server,
                                                org.glassfish.jersey.media.multipart;
-    exports org.glassfish.jersey.io.spi to org.glassfish.jersey.core.server,
-                                               org.glassfish.jersey.media.multipart;
     exports org.glassfish.jersey.innate.inject.spi to org.glassfish.jersey.inject.hk2;
 
+    opens org.glassfish.jersey;
+    opens org.glassfish.jersey.http;
     opens org.glassfish.jersey.innate.spi to org.glassfish.jersey.media.multipart;
     opens org.glassfish.jersey.internal;
+    opens org.glassfish.jersey.internal.guava;
+    opens org.glassfish.jersey.internal.inject;
+    opens org.glassfish.jersey.internal.l10n;
+    opens org.glassfish.jersey.internal.sonar;
+    opens org.glassfish.jersey.internal.spi;
+    opens org.glassfish.jersey.internal.routing;
+    opens org.glassfish.jersey.internal.util;
     opens org.glassfish.jersey.internal.util.collection;
+    opens org.glassfish.jersey.io.spi;
+    opens org.glassfish.jersey.logging;
+    opens org.glassfish.jersey.message;
     opens org.glassfish.jersey.message.internal;
+    opens org.glassfish.jersey.model;
+    opens org.glassfish.jersey.model.internal;
+    opens org.glassfish.jersey.model.internal.spi;
+    opens org.glassfish.jersey.process;
+    opens org.glassfish.jersey.process.internal;
     opens org.glassfish.jersey.spi;
+    opens org.glassfish.jersey.uri;
+    opens org.glassfish.jersey.uri.internal;
 
     uses jakarta.ws.rs.core.Feature;
     uses jakarta.ws.rs.container.DynamicFeature;
     uses jakarta.ws.rs.ext.RuntimeDelegate;
 
     uses org.glassfish.jersey.innate.spi.EntityPartBuilderProvider;
-    uses org.glassfish.jersey.internal.ServiceFinder;
     uses org.glassfish.jersey.internal.inject.InjectionManagerFactory;
     uses org.glassfish.jersey.internal.spi.AutoDiscoverable;
     uses org.glassfish.jersey.internal.spi.ForcedAutoDiscoverable;

core-common/src/main/java/org/glassfish/jersey/innate/inject/BlindBinder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -77,7 +77,7 @@ void setInjectionManager(InjectionManager injectionManager) {
      * @param <T>   type of the managed instance returned using provider.
      * @return provider with instance of managed instance.
      */
-    protected final <T> Provider<T> createManagedInstanceProvider(Class<T> clazz) {
+    protected <T> Provider<T> createManagedInstanceProvider(Class<T> clazz) {
         return () -> {
             if (injectionManager == null) {
                 throw new IllegalStateException(LocalizationMessages.INJECTION_MANAGER_NOT_PROVIDED());

core-common/src/main/java/org/glassfish/jersey/innate/inject/ServiceFinderBinder.java → core-common/src/main/java/org/glassfish/jersey/internal/ServiceFinderBinder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -14,14 +14,13 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.jersey.innate.inject;
+package org.glassfish.jersey.internal;
 
 import java.util.Map;
 
 import jakarta.ws.rs.RuntimeType;
 
 import org.glassfish.jersey.innate.inject.InternalBinder;
-import org.glassfish.jersey.internal.ServiceFinder;
 import org.glassfish.jersey.internal.inject.InjectionManager;
 import org.glassfish.jersey.internal.util.PropertiesHelper;
 

core-common/src/main/java/org/glassfish/jersey/message/internal/MessagingBinders.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -37,7 +37,7 @@
 import org.glassfish.jersey.innate.inject.InjectionIds;
 import org.glassfish.jersey.innate.inject.InternalBinder;
 import org.glassfish.jersey.internal.LocalizationMessages;
-import org.glassfish.jersey.innate.inject.ServiceFinderBinder;
+import org.glassfish.jersey.internal.ServiceFinderBinder;
 import org.glassfish.jersey.internal.util.ReflectionHelper;
 import org.glassfish.jersey.internal.util.Tokenizer;
 import org.glassfish.jersey.spi.HeaderDelegateProvider;

core-server/pom.xml

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