Adopt new Grizzly 4.0.2

Signed-off-by: jansupol <[email protected]>
jansupol · Jan 8, 2024 · 7e566d6 · 7e566d6
1 parent 64b74b7
commit 7e566d6
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 19 deletions.
diff --git a/containers/grizzly-client/src/main/java/module-info.java b/containers/grizzly-client/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024 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
@@ -21,8 +21,8 @@
 module org.glassfish.tyrus.container.grizzly.client {
     requires java.logging;
     requires jakarta.websocket;
-    requires grizzly.framework;
-    requires grizzly.http;
+    requires org.glassfish.grizzly;
+    requires org.glassfish.grizzly.http;
     requires org.glassfish.tyrus.spi;
     requires org.glassfish.tyrus.client;
     requires org.glassfish.tyrus.core;

diff --git a/containers/grizzly-server/src/main/java/module-info.java b/containers/grizzly-server/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024 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
@@ -24,9 +24,9 @@
     requires jakarta.websocket;
     requires jakarta.xml.bind;
 
-    requires grizzly.http;
-    requires grizzly.http.server;
-    requires grizzly.framework;
+    requires org.glassfish.grizzly;
+    requires org.glassfish.grizzly.http;
+    requires org.glassfish.grizzly.http.server;
 
     requires org.glassfish.tyrus.core;
     requires org.glassfish.tyrus.spi;

diff --git a/pom.xml b/pom.xml
@@ -107,7 +107,7 @@
         <activation.api.version>2.1.2</activation.api.version> <!-- inherited from JAX-B -->
         <cdi-api.version>4.0.1</cdi-api.version>
         <ejb-api.version>4.0.1</ejb-api.version>
-        <grizzly.version>4.0.0</grizzly.version>
+        <grizzly.version>4.0.2</grizzly.version>
         <glassfish.version>7.0.9</glassfish.version>
         <inject.api.version>2.0.1</inject.api.version><!-- inherited from CDI, do not update unless inline with it -->
         <jaxb.api.version>4.0.1</jaxb.api.version>

diff --git a/tests/e2e/non-deployable/src/test/java/module-info.java b/tests/e2e/non-deployable/src/test/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024 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
@@ -17,9 +17,9 @@
 module tyrus.tests.e2e.nondeployable {
     requires com.sun.xml.bind.osgi;
 
-    requires grizzly.framework;
-    requires grizzly.http;
-    requires grizzly.http.server;
+    requires org.glassfish.grizzly;
+    requires org.glassfish.grizzly.http;
+    requires org.glassfish.grizzly.http.server;
 
     requires java.logging;
 

diff --git a/tests/e2e/standard-config/src/test/java/module-info.java b/tests/e2e/standard-config/src/test/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024 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
@@ -21,7 +21,9 @@
 module org.glassfish.tyrus.tests.e2e.stdconfig {
     requires java.logging;
 
-    requires grizzly.http.server;
+    requires org.glassfish.grizzly;
+    requires org.glassfish.grizzly.http;
+    requires org.glassfish.grizzly.http.server;
 
     requires junit;
 

diff --git a/tests/servlet/pom.xml b/tests/servlet/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2011, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2024 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
@@ -34,7 +34,9 @@
         <module>async</module>
         <module>autobahn-server</module>
         <module>basic</module>
+<!-- Until new GF with new grizzly is released
         <module>embedded-glassfish-test</module>
+-->
         <module>dynamic-deploy</module>
         <module>noappconfig</module>
         <module>oneappconfig</module>

diff --git a/tests/tools/src/main/java/module-info.java b/tests/tools/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024 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
@@ -21,9 +21,9 @@
 module org.glassfish.tyrus.test.tools {
     requires jakarta.websocket;
 
-    requires grizzly.framework;
-    requires grizzly.http;
-    requires grizzly.http.server;
+    requires org.glassfish.grizzly;
+    requires org.glassfish.grizzly.http;
+    requires org.glassfish.grizzly.http.server;
 
     requires junit;