JPMS adjustments to the actual 3.1

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
senivam · Dec 21, 2023 · 621b855 · 621b855
1 parent 5d9d9ac
commit 621b855
Show file tree

Hide file tree

Showing 47 changed files with 602 additions and 29 deletions.
diff --git a/...quickstart-grizzly2/src/main/resources/archetype-resources/src/main/java/module-info.java b/...quickstart-grizzly2/src/main/resources/archetype-resources/src/main/java/module-info.java
@@ -1,7 +1,7 @@
 module ${package}.module {
     requires jakarta.ws.rs;
 
-    requires grizzly.http.server;
+    requires org.glassfish.grizzly.http.server;
 
     requires org.glassfish.jersey.core.server;
     requires org.glassfish.jersey.container.grizzly2.http;

diff --git a/connectors/apache-connector/pom.xml b/connectors/apache-connector/pom.xml
@@ -55,6 +55,41 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <!--required by Grizzly* modules-->
+        <dependency>
+            <groupId>org.glassfish.pfl</groupId>
+            <artifactId>pfl-tf</artifactId>
+            <version>${pfl.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.gmbal</groupId>
+            <artifactId>gmbal</artifactId>
+            <version>${gmbal.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm-tree</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm-commons</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm-util</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm-analysis</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!--End of required by Grizzly* modules-->
     </dependencies>
 
     <build>

diff --git a/connectors/apache-connector/src/test/java/module-info.java b/connectors/apache-connector/src/test/java/module-info.java
@@ -34,7 +34,12 @@
 
     requires org.junit.jupiter.api;
     requires org.junit.jupiter.engine;
+    requires org.junit.platform.commons;
 
     exports org.glassfish.jersey.apache.connector;
     opens org.glassfish.jersey.apache.connector;
+//  required by Grizzly* modules
+    requires pfl.tf;
+    requires gmbal;
+//    end of required by Grizzly* modules
 }
diff --git a/connectors/grizzly-connector/pom.xml b/connectors/grizzly-connector/pom.xml
@@ -82,6 +82,37 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <!--required by Grizzly* modules-->
+        <dependency>
+            <groupId>org.glassfish.pfl</groupId>
+            <artifactId>pfl-tf</artifactId>
+            <version>${pfl.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.gmbal</groupId>
+            <artifactId>gmbal</artifactId>
+            <version>${gmbal.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm-commons</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm-tree</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm-analysis</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!--End of required by Grizzly* modules-->
     </dependencies>
 
     <build>

diff --git a/connectors/grizzly-connector/src/main/java/module-info.java b/connectors/grizzly-connector/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023 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
@@ -19,7 +19,7 @@
 
     requires jakarta.ws.rs;
 
-    requires grizzly.framework;
+    requires org.glassfish.grizzly;
     requires grizzly.http.client;
 
     requires org.glassfish.jersey.core.common;

diff --git a/connectors/grizzly-connector/src/test/java/module-info.java b/connectors/grizzly-connector/src/test/java/module-info.java
@@ -20,11 +20,14 @@
 
     requires jakarta.ws.rs;
 
-    requires grizzly.framework;
+    requires org.glassfish.grizzly;
     requires grizzly.http.client;
 
-//    requires grizzly.http.server;
-    requires grizzly.http;
+    requires org.glassfish.grizzly.http;
+//  required by Grizzly* modules
+    requires pfl.tf;
+    requires gmbal;
+//    end of required by Grizzly* modules
 
     requires org.glassfish.jersey.core.common;
     requires org.glassfish.jersey.core.client;

diff --git a/connectors/jdk-connector/pom.xml b/connectors/jdk-connector/pom.xml
@@ -65,6 +65,33 @@
             <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
+        <!--required by Grizzly* modules-->
+        <dependency>
+            <groupId>org.glassfish.pfl</groupId>
+            <artifactId>pfl-tf</artifactId>
+            <version>${pfl.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.gmbal</groupId>
+            <artifactId>gmbal</artifactId>
+            <version>${gmbal.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm-tree</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm-analysis</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!--End of required by Grizzly* modules-->
     </dependencies>
 
     <build>

diff --git a/connectors/jdk-connector/src/test/java/module-info.java b/connectors/jdk-connector/src/test/java/module-info.java
@@ -25,6 +25,14 @@
     requires org.junit.jupiter.api;
     requires org.junit.jupiter.engine;
 
+    requires org.glassfish.grizzly.http;
+    requires org.glassfish.grizzly.http.server;
+
+    //  required by Grizzly* modules
+    requires pfl.tf;
+    requires gmbal;
+//    end of required by Grizzly* modules
+
     requires org.glassfish.jersey.tests.framework.core;
     requires org.glassfish.jersey.tests.framework.provider.grizzly;
 

diff --git a/containers/grizzly2-http/pom.xml b/containers/grizzly2-http/pom.xml
@@ -72,7 +72,46 @@
             <artifactId>grizzly-npn-api</artifactId>
             <scope>test</scope>
         </dependency>
-
+        <!--required by Grizzly* modules-->
+        <dependency>
+            <groupId>org.glassfish.pfl</groupId>
+            <artifactId>pfl-tf</artifactId>
+            <version>${pfl.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.gmbal</groupId>
+            <artifactId>gmbal</artifactId>
+            <version>${gmbal.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm-tree</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm-commons</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm-util</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm-analysis</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-commons</artifactId>
+            <version>${asm.version}</version>
+        </dependency>
+        <!--End of required by Grizzly* modules-->
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-client</artifactId>

diff --git a/containers/grizzly2-http/src/main/java/module-info.java b/containers/grizzly2-http/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023 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
@@ -22,9 +22,9 @@
     requires jakarta.inject;
     requires static jakarta.xml.bind;
 
-    requires grizzly.framework;
-    requires grizzly.http.server;
-    requires grizzly.http;
+    requires org.glassfish.grizzly;
+    requires org.glassfish.grizzly.http.server;
+    requires org.glassfish.grizzly.http;
 
     requires org.glassfish.jersey.core.common;
     requires org.glassfish.jersey.core.server;

diff --git a/containers/grizzly2-http/src/test/java/module-info.java b/containers/grizzly2-http/src/test/java/module-info.java
@@ -23,7 +23,7 @@
     requires jakarta.ws.rs;
 
     requires org.eclipse.jetty.http2.client;
-    requires org.eclipse.jetty.http2.http.client.transport;
+    requires org.eclipse.jetty.http2.client.transport;
 
     requires org.bouncycastle.provider;
     requires org.bouncycastle.pkix;
@@ -32,9 +32,15 @@
     requires org.junit.jupiter.api;
     requires org.junit.jupiter.engine;
 
-    requires grizzly.http.server;
-    requires grizzly.http2;
-    requires grizzly.framework;
+    requires org.glassfish.grizzly.http.server;
+    requires org.glassfish.grizzly;
+    requires org.glassfish.grizzly.http;
+    requires org.glassfish.grizzly.http2;
+
+//  required by Grizzly* modules
+    requires pfl.tf;
+    requires gmbal;
+//    end of required by Grizzly* modules
 
     requires org.glassfish.hk2.api;
     requires org.glassfish.hk2.locator;

diff --git a/containers/grizzly2-servlet/src/main/java/module-info.java b/containers/grizzly2-servlet/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023 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
@@ -18,8 +18,8 @@
     requires jakarta.ws.rs;
     requires jakarta.servlet;
 
-    requires grizzly.http.servlet;
-    requires grizzly.http.server;
+    requires org.glassfish.grizzly.servlet;
+    requires org.glassfish.grizzly.http.server;
 
     requires org.glassfish.jersey.core.common;
     requires org.glassfish.jersey.container.servlet.core;

diff --git a/...rsey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/ResponseWriter.java b/...rsey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/ResponseWriter.java
@@ -312,4 +312,4 @@ public void close() throws IOException {
             // do not close - let the servlet container close the stream
         }
     }
-}
+}
diff --git a/containers/jetty-http/src/main/java/module-info.java b/containers/jetty-http/src/main/java/module-info.java
@@ -22,6 +22,7 @@
 
     requires org.eclipse.jetty.http;
     requires org.eclipse.jetty.server;
+    requires org.eclipse.jetty.security;
     requires org.eclipse.jetty.util;
 
     requires org.glassfish.jersey.core.common;

diff --git a/core-client/pom.xml b/core-client/pom.xml
@@ -119,6 +119,7 @@
             <artifactId>jakarta.inject-api</artifactId>
         </dependency>
 
+<!--
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
@@ -129,6 +130,7 @@
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
+-->
 
         <dependency>
             <!-- not to warn about missing activation -->

diff --git a/core-common/pom.xml b/core-common/pom.xml
@@ -213,12 +213,13 @@
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
+<!--
         <dependency>
             <groupId>org.eclipse.angus</groupId>
             <artifactId>angus-activation</artifactId>
             <scope>provided</scope>
             <optional>true</optional>
-        </dependency>
+        </dependency> -->
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>

diff --git a/core-common/src/main/java/module-info.java b/core-common/src/main/java/module-info.java
@@ -29,6 +29,7 @@
 
     // Exports rather all, which corresponds to previous state without module-info
     exports org.glassfish.jersey;
+    exports org.glassfish.jersey.http;
     exports org.glassfish.jersey.internal;
     exports org.glassfish.jersey.internal.config;
     exports org.glassfish.jersey.internal.guava;

diff --git a/examples/groovy/pom.xml b/examples/groovy/pom.xml
@@ -29,6 +29,20 @@
             <artifactId>groovy-all</artifactId>
             <type>pom</type>
             <version>${groovy.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm-commons</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm-tree</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.test-framework.providers</groupId>
-Original file line number
+Diff line change
@@ Expand Up / @@ -312,4 +312,4 @@ public void close() throws IOException { @@
                 // do not close - let the servlet container close the stream
             }
         }
-    }
+    }