diff --git a/NOTICE.md b/NOTICE.md
index 84b56c9a..3a821056 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -51,6 +51,11 @@ jakarta.xml.bind-api Version: 3.0
 * License: BSD-3-Clause
 * Copyright (c) 2017, 2018 Oracle and/or its affiliates
 
+jline (2.14.5)
+* License: BSD-3-Clause
+* Project: https://github.com/jline/jline2
+* Source: https://github.com/jline/jline2
+
 ## Cryptography
 
 Content may contain encryption software. The country in which you are currently
diff --git a/README.md b/README.md
index 56d10a04..8cf70135 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,7 @@ Building Tyrus can be done using `mvn clean install`, but sometimes (such as for
 
 ## Links
 
+- Documentation: https://eclipse-ee4j.github.io/tyrus/
 - Website: https://projects.eclipse.org/projects/ee4j.tyrus
 - Issues tracker: https://github.com/eclipse-ee4j/tyrus/issues
 - Mailing list: https://accounts.eclipse.org/mailing-list/tyrus-dev 
diff --git a/archetypes/echo/src/main/resources/archetype-resources/pom.xml b/archetypes/echo/src/main/resources/archetype-resources/pom.xml
index f1abf557..0d025d76 100644
--- a/archetypes/echo/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/echo/src/main/resources/archetype-resources/pom.xml
@@ -15,7 +15,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.2</version>
+                <version>3.4.0</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                 </configuration>
@@ -23,11 +23,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.9.0</version>
+                <inherited>true</inherited>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
-                    <encoding>UTF-8</encoding>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <showWarnings>false</showWarnings>
+                    <fork>false</fork>
                 </configuration>
             </plugin>
         </plugins>
@@ -66,6 +67,7 @@
     </dependencies>
     <properties>
         <websocket-api.version>2.1.0</websocket-api.version>
+        <java.version>11</java.version>
         <tyrus.version>${project.version}</tyrus.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
diff --git a/bundles/samples/pom.xml b/bundles/samples/pom.xml
index 9640307f..76f10de2 100644
--- a/bundles/samples/pom.xml
+++ b/bundles/samples/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2013, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 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
@@ -125,7 +125,7 @@
                         <id>make-assembly</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>attached</goal>
+                            <goal>single</goal>
                         </goals>
                     </execution>
                 </executions>
diff --git a/bundles/websocket-ri-archive/pom.xml b/bundles/websocket-ri-archive/pom.xml
index 0196ba2e..e1c98cca 100755
--- a/bundles/websocket-ri-archive/pom.xml
+++ b/bundles/websocket-ri-archive/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2013, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 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
@@ -176,7 +176,7 @@
                         <phase>package</phase>
                         <!-- append to the packaging phase. -->
                         <goals>
-                            <goal>attached</goal>
+                            <goal>single</goal>
                             <!-- goals == mojos -->
                         </goals>
                     </execution>
diff --git a/bundles/websocket-ri-bundle/pom.xml b/bundles/websocket-ri-bundle/pom.xml
index 4da4cc29..5ea073d7 100755
--- a/bundles/websocket-ri-bundle/pom.xml
+++ b/bundles/websocket-ri-bundle/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2013, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 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
diff --git a/bundles/websocket-risrc-licensee/pom.xml b/bundles/websocket-risrc-licensee/pom.xml
index fdfec9a4..63cd50ac 100755
--- a/bundles/websocket-risrc-licensee/pom.xml
+++ b/bundles/websocket-risrc-licensee/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 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
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.bundles</groupId>
         <artifactId>tyrus-bundles</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>2.0.99-SNAPSHOT</version>
     </parent>
 
     <artifactId>websocket-risrc-licensee</artifactId>
@@ -103,7 +103,7 @@
                         <phase>package</phase>
                         <!-- append to the packaging phase. -->
                         <goals>
-                            <goal>attached</goal>
+                            <goal>single</goal>
                             <!-- goals == mojos -->
                         </goals>
                     </execution>
diff --git a/containers/glassfish/cdi/pom.xml b/containers/glassfish/cdi/pom.xml
index a30b6c28..c5c20ec9 100755
--- a/containers/glassfish/cdi/pom.xml
+++ b/containers/glassfish/cdi/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2013, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 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
diff --git a/docs/pom.xml b/docs/pom.xml
index 861af3b0..9aced340 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2013, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 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
@@ -44,7 +44,7 @@
                 <executions>
                     <execution>
                         <configuration>
-                            <tasks>
+                            <target>
                                 <echo message="Preparing char entities" />
                                 <mkdir dir="${src.dir}" />
                                 <copy todir="${src.dir}">
@@ -53,7 +53,7 @@
                                 <replace file="${src.dir}/tyrus.ent" token="$version" value="${project.version}" />
                                 <replace file="${src.dir}/tyrus.ent" token="$repository" value="${javanet.repository.id}" />
                                 <replace file="${src.dir}/tyrus.ent" token="$websocket-api-version" value="${websocket-api.version}" />
-                            </tasks>
+                            </target>
                         </configuration>
                         <id>process-entities</id>
                         <phase>package</phase>
@@ -137,7 +137,7 @@
                         <id>make-assembly</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>attached</goal>
+                            <goal>single</goal>
                         </goals>
                     </execution>
                 </executions>
diff --git a/ext/extension-deflate/pom.xml b/ext/extension-deflate/pom.xml
index bae206df..63cf3bd2 100644
--- a/ext/extension-deflate/pom.xml
+++ b/ext/extension-deflate/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2014, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2014, 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
@@ -28,6 +28,12 @@
     <packaging>bundle</packaging>
     <name>Tyrus Extension - Per Message Deflate</name>
 
+    <properties>
+        <argLine>
+            --add-reads org.glassfish.tyrus.ext.extension.deflate=org.glassfish.tyrus.client
+        </argLine>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.glassfish.tyrus</groupId>
diff --git a/ext/monitoring-jmx/pom.xml b/ext/monitoring-jmx/pom.xml
index c532347f..3c474c43 100644
--- a/ext/monitoring-jmx/pom.xml
+++ b/ext/monitoring-jmx/pom.xml
@@ -28,6 +28,12 @@
     <artifactId>tyrus-monitoring-jmx</artifactId>
     <name>Tyrus Monitoring JMX</name>
 
+    <properties>
+        <argLine>
+            --add-reads org.glassfish.tyrus.ext.monitoring.jmx=org.glassfish.tyrus.client
+        </argLine>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.glassfish.tyrus</groupId>
diff --git a/pom.xml b/pom.xml
index 62a1196f..a8601f58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.8</version>
+        <version>1.0.9</version>
     </parent>
 
     <groupId>org.glassfish.tyrus</groupId>
@@ -117,6 +117,8 @@
         <servlet.api.version>6.0.0</servlet.api.version>
         <spring.boot.version>2.6.7</spring.boot.version>
 
+        <maven.surefire.plugin.version>3.2.1</maven.surefire.plugin.version>
+
         <api_package>jakarta.websocket</api_package>
         <impl_namespace>org.glassfish</impl_namespace>
         <spec_version>0.0</spec_version>
@@ -156,101 +158,55 @@
     </modules>
 
     <build>
-        <plugins>
-            <plugin>
-                <groupId>org.commonjava.maven.plugins</groupId>
-                <artifactId>directory-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>directories</id>
-                        <goals>
-                            <goal>highest-basedir</goal>
-                        </goals>
-                        <phase>initialize</phase>
-                        <configuration>
-                            <property>legal.source.folder</property>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.0</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <inherited>true</inherited>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
-                <configuration>
-                    <source>11</source>
-                    <target>11</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <configuration>
-                    <mavenExecutorId>forked-path</mavenExecutorId>
-                    <useReleaseProfile>false</useReleaseProfile>
-                    <arguments>${release.arguments}</arguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.8.1</version>
-                <configuration>
-                    <retryFailedDeploymentCount>10</retryFailedDeploymentCount>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.1.0</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.puppycrawl.tools</groupId>
-                        <artifactId>checkstyle</artifactId>
-                        <version>8.30</version>
-                    </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <configuration>
-                            <consoleOutput>true</consoleOutput>
-                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                            <configLocation>etc/config/checkstyle-build.xml</configLocation>
-                            <failOnViolation>true</failOnViolation>
-                            <excludes>**/guide/*,**/org/glassfish/tyrus/core/wsadl/model/**/*,**/LocalizationMessages.java,**/module-info.java</excludes>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <version>3.1.0</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>3.6.0</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>3.3.0</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.11.0</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>3.0.1</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>3.6.1</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>3.1.1</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${maven.surefire.plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <version>3.2.1</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-shade-plugin</artifactId>
+                    <version>3.5.1</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>3.4.0</version>
+                    <configuration>
+                        <failOnMissingWebXml>false</failOnMissingWebXml>
+                    </configuration>
+                </plugin>
                 <plugin>
                     <groupId>org.glassfish.copyright</groupId>
                     <artifactId>glassfish-copyright-maven-plugin</artifactId>
@@ -276,7 +232,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.4.0</version>
                     <executions>
                         <execution>
                             <phase>generate-sources</phase>
@@ -325,7 +281,7 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>5.1.2</version>
+                    <version>5.1.4</version> <!-- 5.1.5  brings dependencies on JDK packages -->
                     <extensions>true</extensions>
                     <configuration>
                         <instructions>
@@ -335,14 +291,6 @@
                         </instructions>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>3.3.1</version>
-                    <configuration>
-                        <failOnMissingWebXml>false</failOnMissingWebXml>
-                    </configuration>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
@@ -368,28 +316,112 @@
                         </execution>
                     </executions>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.0.0-M5</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-shade-plugin</artifactId>
-                    <version>3.2.4</version>
-                </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>exec-maven-plugin</artifactId>
-                    <version>1.2.1</version>
+                    <version>3.1.0</version>
                 </plugin>
                 <plugin>
                     <groupId>com.sun.tools.xjc.maven2</groupId>
                     <artifactId>maven-jaxb-plugin</artifactId>
                     <version>1.1.1</version>
                 </plugin>
+
             </plugins>
         </pluginManagement>
+
+        <plugins>
+            <plugin>
+                <groupId>org.commonjava.maven.plugins</groupId>
+                <artifactId>directory-maven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <id>directories</id>
+                        <goals>
+                            <goal>highest-basedir</goal>
+                        </goals>
+                        <phase>initialize</phase>
+                        <configuration>
+                            <property>legal.source.folder</property>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <inherited>true</inherited>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.10.1</version>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <configuration>
+                    <mavenExecutorId>forked-path</mavenExecutorId>
+                    <useReleaseProfile>false</useReleaseProfile>
+                    <arguments>${release.arguments}</arguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.1</version>
+                <configuration>
+                    <retryFailedDeploymentCount>10</retryFailedDeploymentCount>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.1.0</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.puppycrawl.tools</groupId>
+                        <artifactId>checkstyle</artifactId>
+                        <version>8.30</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <configuration>
+                            <consoleOutput>true</consoleOutput>
+                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
+                            <configLocation>etc/config/checkstyle-build.xml</configLocation>
+                            <failOnViolation>true</failOnViolation>
+                            <excludes>**/guide/*,**/org/glassfish/tyrus/core/wsadl/model/**/*,**/LocalizationMessages.java,**/module-info.java</excludes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 
     <profiles>
diff --git a/samples/cdi/pom.xml b/samples/cdi/pom.xml
index 80d21518..98ccf465 100755
--- a/samples/cdi/pom.xml
+++ b/samples/cdi/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2013, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2023 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/samples/pom.xml b/samples/pom.xml
index 53766bd8..2323ce1b 100755
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2011, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2023 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -70,7 +70,7 @@
                                     <id>assemble-src-zip</id>
                                     <phase>package</phase>
                                     <goals>
-                                        <goal>attached</goal>
+                                        <goal>single</goal>
                                     </goals>
                                     <configuration>
                                         <descriptors>
diff --git a/tests/servlet/async/src/main/java/module-info.java b/tests/servlet/async/src/main/java/module-info.java
new file mode 100644
index 00000000..5bbeaa27
--- /dev/null
+++ b/tests/servlet/async/src/main/java/module-info.java
@@ -0,0 +1,4 @@
+module org.glassfish.tyrus.tests.servlet.async {
+    requires jakarta.websocket;
+    exports org.glassfish.tyrus.tests.servlet.async;
+}
\ No newline at end of file
diff --git a/tests/servlet/async/src/test/java/module-info.java b/tests/servlet/async/src/test/java/module-info.java
new file mode 100644
index 00000000..9c65ad97
--- /dev/null
+++ b/tests/servlet/async/src/test/java/module-info.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 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
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+module org.glassfish.tyrus.tests.servlet.async.test {
+    requires jakarta.websocket;
+    requires jakarta.websocket.client;
+
+    requires org.glassfish.tyrus.client;
+    requires org.glassfish.tyrus.core;
+    requires org.glassfish.tyrus.server;
+    requires org.glassfish.tyrus.tests.servlet.async;
+    requires org.glassfish.tyrus.test.tools;
+
+    requires junit;
+
+    exports org.glassfish.tyrus.tests.servlet.async.test to junit;
+}
\ No newline at end of file
diff --git a/tests/servlet/async/src/test/java/org/glassfish/tyrus/tests/servlet/async/AsyncBinaryTest.java b/tests/servlet/async/src/test/java/org/glassfish/tyrus/tests/servlet/async/test/AsyncBinaryTest.java
similarity index 96%
rename from tests/servlet/async/src/test/java/org/glassfish/tyrus/tests/servlet/async/AsyncBinaryTest.java
rename to tests/servlet/async/src/test/java/org/glassfish/tyrus/tests/servlet/async/test/AsyncBinaryTest.java
index 8b14814e..58981d80 100644
--- a/tests/servlet/async/src/test/java/org/glassfish/tyrus/tests/servlet/async/AsyncBinaryTest.java
+++ b/tests/servlet/async/src/test/java/org/glassfish/tyrus/tests/servlet/async/test/AsyncBinaryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.tyrus.tests.servlet.async;
+package org.glassfish.tyrus.tests.servlet.async.test;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -36,6 +36,9 @@
 import org.glassfish.tyrus.server.Server;
 import org.glassfish.tyrus.test.tools.TestContainer;
 
+import org.glassfish.tyrus.tests.servlet.async.BinaryFutureEndpoint;
+import org.glassfish.tyrus.tests.servlet.async.BinaryHandlerEndpoint;
+import org.glassfish.tyrus.tests.servlet.async.ServiceEndpoint;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/servlet/async/src/test/java/org/glassfish/tyrus/tests/servlet/async/AsyncObjectTest.java b/tests/servlet/async/src/test/java/org/glassfish/tyrus/tests/servlet/async/test/AsyncObjectTest.java
similarity index 96%
rename from tests/servlet/async/src/test/java/org/glassfish/tyrus/tests/servlet/async/AsyncObjectTest.java
rename to tests/servlet/async/src/test/java/org/glassfish/tyrus/tests/servlet/async/test/AsyncObjectTest.java
index d63c6702..9ac1c55b 100644
--- a/tests/servlet/async/src/test/java/org/glassfish/tyrus/tests/servlet/async/AsyncObjectTest.java
+++ b/tests/servlet/async/src/test/java/org/glassfish/tyrus/tests/servlet/async/test/AsyncObjectTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.tyrus.tests.servlet.async;
+package org.glassfish.tyrus.tests.servlet.async.test;
 
 import java.io.IOException;
 import java.util.concurrent.CountDownLatch;
@@ -35,6 +35,9 @@
 import org.glassfish.tyrus.server.Server;
 import org.glassfish.tyrus.test.tools.TestContainer;
 
+import org.glassfish.tyrus.tests.servlet.async.ObjectFutureEndpoint;
+import org.glassfish.tyrus.tests.servlet.async.ObjectHandlerEndpoint;
+import org.glassfish.tyrus.tests.servlet.async.ServiceEndpoint;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/servlet/async/src/test/java/org/glassfish/tyrus/tests/servlet/async/AsyncTextTest.java b/tests/servlet/async/src/test/java/org/glassfish/tyrus/tests/servlet/async/test/AsyncTextTest.java
similarity index 96%
rename from tests/servlet/async/src/test/java/org/glassfish/tyrus/tests/servlet/async/AsyncTextTest.java
rename to tests/servlet/async/src/test/java/org/glassfish/tyrus/tests/servlet/async/test/AsyncTextTest.java
index 46de0b23..49ac4540 100644
--- a/tests/servlet/async/src/test/java/org/glassfish/tyrus/tests/servlet/async/AsyncTextTest.java
+++ b/tests/servlet/async/src/test/java/org/glassfish/tyrus/tests/servlet/async/test/AsyncTextTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.tyrus.tests.servlet.async;
+package org.glassfish.tyrus.tests.servlet.async.test;
 
 import java.io.IOException;
 import java.util.concurrent.CountDownLatch;
@@ -35,6 +35,9 @@
 import org.glassfish.tyrus.server.Server;
 import org.glassfish.tyrus.test.tools.TestContainer;
 
+import org.glassfish.tyrus.tests.servlet.async.ServiceEndpoint;
+import org.glassfish.tyrus.tests.servlet.async.TextFutureEndpoint;
+import org.glassfish.tyrus.tests.servlet.async.TextHandlerEndpoint;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/tests/servlet/embedded-glassfish-test/pom.xml b/tests/servlet/embedded-glassfish-test/pom.xml
index d40a16ac..8199f3d6 100644
--- a/tests/servlet/embedded-glassfish-test/pom.xml
+++ b/tests/servlet/embedded-glassfish-test/pom.xml
@@ -134,7 +134,6 @@
         <plugins>
             <plugin>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.0.0-M5</version>
                 <inherited>false</inherited>
                 <executions>
                     <execution>
@@ -166,19 +165,18 @@
                     <dependency>
                         <groupId>org.apache.maven.surefire</groupId>
                         <artifactId>surefire-api</artifactId>
-                        <version>3.0.0-M5</version>
+                        <version>${maven.surefire.plugin.version}</version>
                     </dependency>
                     <dependency>
                         <groupId>org.apache.maven.surefire</groupId>
                         <artifactId>common-java5</artifactId>
-                        <version>3.0.0-M5</version>
+                        <version>${maven.surefire.plugin.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <id>unpack</id>
@@ -305,7 +303,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
                 <configuration>
                     <target>11</target>
                 </configuration>
diff --git a/tests/tools/pom.xml b/tests/tools/pom.xml
index 22f95e8c..33570951 100755
--- a/tests/tools/pom.xml
+++ b/tests/tools/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2013, 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 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
@@ -52,6 +52,10 @@
             <artifactId>tyrus-container-servlet</artifactId>
             <!--<scope>provided</scope>-->
         </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>jakarta.websocket</groupId>
             <artifactId>jakarta.websocket-api</artifactId>