Merge pull request #2202 from arjantijms/main

Update main branch with stray commits from other branches
eclipse-ee4j · Dec 18, 2023 · 75d2599 · 75d2599
2 parents 3d3bcb6 + 49e48dc
commit 75d2599
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 22 deletions.
diff --git 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/grizzly/src/main/java/org/glassfish/grizzly/attributes/AttributeBuilder.java b/modules/grizzly/src/main/java/org/glassfish/grizzly/attributes/AttributeBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -73,7 +73,6 @@ public interface AttributeBuilder {
      *
      * @return Attribute<T>
      */
-    @Deprecated
     <T> Attribute<T> createAttribute(String name, Supplier<T> initializer);
 
     /**

diff --git 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
@@ -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
@@ -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
@@ -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;