From 901e6e8cfb9be08918b273baa971158e51274489 Mon Sep 17 00:00:00 2001
From: Automated workflow <m_riem@hotmail.com>
Date: Wed, 29 Nov 2023 16:16:52 -0600
Subject: [PATCH] Fixes #2198 - Adjust module-info

---
 modules/comet/src/main/java/module-info.java  |  7 +++---
 .../src/main/java/module-info.java            | 24 +++++++++----------
 .../src/main/java/module-info.java            |  2 +-
 modules/http2/src/main/java/module-info.java  |  3 +--
 .../websockets/src/main/java/module-info.java |  2 +-
 5 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/modules/comet/src/main/java/module-info.java b/modules/comet/src/main/java/module-info.java
index 3f2049282..8a74bd64b 100644
--- a/modules/comet/src/main/java/module-info.java
+++ b/modules/comet/src/main/java/module-info.java
@@ -19,12 +19,11 @@
     exports org.glassfish.grizzly.comet;
     
     opens org.glassfish.grizzly.comet;
-
-    requires jakarta.servlet;
+    
+    requires static jakarta.servlet;
     requires java.logging;
+    requires static java.management;
     requires org.glassfish.grizzly;
     requires org.glassfish.grizzly.http.server;
     requires org.glassfish.grizzly.http;
-
-    requires static java.management;
 }
diff --git a/modules/http-server/src/main/java/module-info.java b/modules/http-server/src/main/java/module-info.java
index be9d6c128..8fb83fa6e 100644
--- a/modules/http-server/src/main/java/module-info.java
+++ b/modules/http-server/src/main/java/module-info.java
@@ -38,16 +38,16 @@
     requires org.glassfish.grizzly.http;
     requires org.glassfish.grizzly;
     
-    requires gmbal;
-    requires org.glassfish.external.management.api;
-    requires pfl.basic;
-    requires pfl.tf;
-    requires org.objectweb.asm;
-    requires pfl.dynamic;
-    requires org.objectweb.asm.util;
-    requires org.objectweb.asm.tree;
-    requires org.objectweb.asm.tree.analysis;
-    requires pfl.basic.tools;
-    requires pfl.tf.tools;
-    requires org.objectweb.asm.commons;
+    requires static gmbal;
+    requires static org.glassfish.external.management.api;
+    requires static pfl.basic.tools;
+    requires static pfl.dynamic;
+    requires static pfl.basic;
+    requires static pfl.tf;
+    requires static pfl.tf.tools;
+    requires static org.objectweb.asm;
+    requires static org.objectweb.asm.util;
+    requires static org.objectweb.asm.tree;
+    requires static org.objectweb.asm.tree.analysis;
+    requires static org.objectweb.asm.commons;
 }
diff --git a/modules/http-servlet/src/main/java/module-info.java b/modules/http-servlet/src/main/java/module-info.java
index cf1ec0440..f6f8237d2 100644
--- a/modules/http-servlet/src/main/java/module-info.java
+++ b/modules/http-servlet/src/main/java/module-info.java
@@ -22,7 +22,7 @@
     
     opens org.glassfish.grizzly.servlet;
     
-    requires jakarta.servlet;
+    requires static jakarta.servlet;
     requires java.logging;
     requires org.glassfish.grizzly.http.server;
     requires org.glassfish.grizzly.http;
diff --git a/modules/http2/src/main/java/module-info.java b/modules/http2/src/main/java/module-info.java
index 9c3a1076d..b538312b4 100644
--- a/modules/http2/src/main/java/module-info.java
+++ b/modules/http2/src/main/java/module-info.java
@@ -26,10 +26,9 @@
     opens org.glassfish.grizzly.http2.hpack;
     opens org.glassfish.grizzly.http2.utils;
     
+    requires static grizzly.npn.api;
     requires java.logging;
     requires org.glassfish.grizzly.http;
     requires org.glassfish.grizzly;
     requires org.glassfish.grizzly.http.server;
-
-    requires static grizzly.npn.api;
 }
diff --git a/modules/websockets/src/main/java/module-info.java b/modules/websockets/src/main/java/module-info.java
index 34ea96599..fa162b5c4 100644
--- a/modules/websockets/src/main/java/module-info.java
+++ b/modules/websockets/src/main/java/module-info.java
@@ -26,7 +26,7 @@
     opens org.glassfish.grizzly.websockets.glassfish;
     opens org.glassfish.grizzly.websockets.rfc6455;
 
-    requires jakarta.servlet;
+    requires static jakarta.servlet;
     requires java.logging;
     requires org.glassfish.grizzly;
     requires org.glassfish.grizzly.http;