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/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;

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/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-common/src/main/java/module-info.java

@@ -62,17 +62,18 @@
                                            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.json.jackson,
                                                   org.glassfish.jersey.media.moxy,
                                                   org.glassfish.jersey.media.multipart,
                                                   org.glassfish.jersey.ext.bean.validation,
@@ -82,6 +83,7 @@
                                                   org.glassfish.jersey.ext.metainf.services,
                                                   org.glassfish.jersey.ext.mvc,
                                                   org.glassfish.jersey.incubator.cdi.inject.weld,
+                                                  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,

…y/innate/inject/ServiceFinderBinder.java …jersey/internal/ServiceFinderBinder.javacore-common/src/main/java/org/glassfish/jersey/innate/inject/ServiceFinderBinder.java renamed to core-common/src/main/java/org/glassfish/jersey/internal/ServiceFinderBinder.java core-common/src/main/java/org/glassfish/jersey/innate/inject/ServiceFinderBinder.java renamed to 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>

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

@@ -64,12 +64,11 @@
             org.glassfish.jersey.ext.mvc;
     exports org.glassfish.jersey.server.internal.monitoring; // MonitoringFeature
     exports org.glassfish.jersey.server.internal.process to org.glassfish.hk2.locator;
-    exports org.glassfish.jersey.server.internal.routing to org.glassfish.hk2.locator;
+    exports org.glassfish.jersey.server.internal.routing;
     exports org.glassfish.jersey.server.internal.scanning to org.glassfish.jersey.container.servlet;
     exports org.glassfish.jersey.server.internal.sonar;
 
     exports com.sun.research.ws.wadl;
-    exports org.glassfish.jersey.server.internal.monitoring.core;
 
     uses org.glassfish.jersey.server.spi.ComponentProvider;
     uses org.glassfish.jersey.server.spi.ExternalRequestScope;
@@ -82,17 +81,33 @@
     opens org.glassfish.jersey.server.filter.internal to
             org.glassfish.hk2.locator,
             org.glassfish.hk2.utilities,
+            org.glassfish.jersey.inject.cdi2.se,
+            org.glassfish.jersey.incubator.cdi.inject.weld,
+            org.glassfish.jersey.core.client, // NonInjectionManager
             weld.core.impl;
-    opens org.glassfish.jersey.server.internal to org.glassfish.hk2.utilities, weld.core.impl;
-    opens org.glassfish.jersey.server.internal.inject;
-    opens org.glassfish.jersey.server.internal.monitoring to org.glassfish.hk2.utilities;
+    opens org.glassfish.jersey.server.internal;
+    opens org.glassfish.jersey.server.internal.inject to
+            org.glassfish.hk2.locator,
+            org.glassfish.hk2.utilities,
+            org.glassfish.jersey.core.common,
+            org.glassfish.jersey.media.sse,
+            org.glassfish.jersey.ext.bean.validation,
+            org.glassfish.jersey.media.multipart,
+            org.glassfish.jersey.ext.mvc;
+    opens org.glassfish.jersey.server.internal.monitoring;
     opens org.glassfish.jersey.server.internal.monitoring.jmx to org.glassfish.hk2.utilities;
     opens org.glassfish.jersey.server.internal.process to
             org.glassfish.hk2.locator,
             org.glassfish.hk2.utilities,
+            org.glassfish.jersey.inject.cdi2.se,
+            org.glassfish.jersey.incubator.cdi.inject.weld,
             weld.core.impl;
-    opens org.glassfish.jersey.server.internal.routing to org.glassfish.hk2.utilities;
+    opens org.glassfish.jersey.server.internal.routing;
+    opens org.glassfish.jersey.server.internal.sonar;
     opens org.glassfish.jersey.server.model;
+    opens org.glassfish.jersey.server.wadl.internal;
+    opens org.glassfish.jersey.server.wadl.internal.generators;
+    opens org.glassfish.jersey.server.wadl.internal.generators.resourcedoc;
     opens org.glassfish.jersey.server.wadl.processor;
 
     provides jakarta.ws.rs.ext.RuntimeDelegate