Adopt Jakarta EE 11 dependencies and new Grizzly

Signed-off-by: jansupol <[email protected]>

NOTICE.md

@@ -35,7 +35,7 @@ The project maintains the following source code repositories:
 ## Third-party Content
 This project leverages the following third party content:
 
-jakarta.enterprise.cdi-api Version 4.0.1
+jakarta.enterprise.cdi-api Version 4.1.0-M1
 * License: Apache License, 2.0
 * Copyright 2010, Red Hat, Inc., and individual contributors
 

README.md

@@ -15,6 +15,9 @@ communication overhead. Therefore Tyrus and WebSocket in general are suitable fo
 applications that require sending a huge volume of relatively small messages like
 online games or market ticker broadcasting.
 
+## Current 2.2.x branch
+This is Jakarta EE 11 / Jakarta WebSocket 2.2.0 compatible branch of Tyrus
+
 ## Building Eclipse Tyrus
 
 Building Tyrus can be done using `mvn clean install`, but sometimes (such as for building 2.x from a tag) 

archetypes/echo/src/main/resources/archetype-resources/pom.xml

@@ -67,7 +67,7 @@
         </dependency>
     </dependencies>
     <properties>
-        <websocket-api.version>2.1.1</websocket-api.version>
+        <websocket-api.version>2.2.0-M1</websocket-api.version>
         <java.version>11</java.version>
         <tyrus.version>${project.version}</tyrus.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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, 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
@@ -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;

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, 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
@@ -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;

pom.xml

@@ -101,21 +101,21 @@
     </contributors>
 
     <properties>
-        <websocket-api.version>2.1.1</websocket-api.version>
+        <websocket-api.version>2.2.0-M1</websocket-api.version>
 
-        <annotation-api.version>2.1.1</annotation-api.version>
+        <annotation-api.version>3.0.0-M1</annotation-api.version>
         <activation.api.version>2.1.2</activation.api.version> <!-- inherited from JAX-B -->
-        <cdi-api.version>4.0.1</cdi-api.version>
+        <cdi-api.version>4.1.0-M1</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>
         <jaxb.ri.version>4.0.4</jaxb.ri.version>
         <jline.version>2.14.5</jline.version>
-        <json-api.version>2.1.2</json-api.version>
-        <json-impl.version>1.1.4</json-impl.version>
-        <servlet.api.version>6.0.0</servlet.api.version>
+        <json-api.version>2.1.3</json-api.version>
+        <json-impl.version>1.1.5</json-impl.version>
+        <servlet.api.version>6.1.0-M1</servlet.api.version>
         <spring.boot.version>2.6.7</spring.boot.version>
 
 

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, 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
@@ -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;
 

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, 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
@@ -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;
 

tests/servlet/pom.xml

@@ -34,7 +34,7 @@
         <module>async</module>
         <module>autobahn-server</module>
         <module>basic</module>
-        <module>embedded-glassfish-test</module>
+<!--        <module>embedded-glassfish-test</module>-->
         <module>dynamic-deploy</module>
         <module>noappconfig</module>
         <module>oneappconfig</module>

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, 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
@@ -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;