Updated Jetty, GlassFish, Grizzly and fixes to pass all tests locally

bundles/client/pom.xml

@@ -66,7 +66,7 @@
                             jakarta.websocket;version=${apijar.bundle.version}
                         </Export-Package>
                         <Import-Package>
-                            org.glassfish.grizzly.*;version="[3.0,5)",*
+                            org.glassfish.grizzly.*;version="3",*
                         </Import-Package>
                     </instructions>
                     <unpackBundle>true</unpackBundle>

bundles/websocket-ri-bundle/pom.xml

@@ -246,9 +246,7 @@
                             jakarta.enterprise.context.spi;version="[3.0,5)",
                             jakarta.enterprise.inject.spi;version="[3.0,5)",
                             jakarta.xml.bind.*;version="[3.0,5)",
-                            org.glassfish.grizzly.*;version="[3.0,5)",
-<!--                            org.glassfish.grizzly.http.server.*;version=${grizzly.version}-->
-<!--                            org.glassfish.grizzly.*;version=${grizzly.version},-->
+                            org.glassfish.grizzly.*;version="3",
                             *
                         </Import-Package>
                     </instructions>

containers/grizzly-client/pom.xml

@@ -61,7 +61,7 @@
                     <instructions>
                         <Export-Package>org.glassfish.tyrus.container.grizzly.client.*;version=${project.version}
                         </Export-Package>
-                        <Import-Package>org.glassfish.grizzly.*;version="[3.0,5)",*</Import-Package>
+                        <Import-Package>org.glassfish.grizzly.*;version="3",*</Import-Package>
                     </instructions>
                     <unpackBundle>true</unpackBundle>
                 </configuration>

containers/grizzly-server/pom.xml

@@ -62,7 +62,7 @@
                         </Export-Package>
                         <Import-Package>
                             jakarta.xml.bind.*;version="[3.0,5)",
-                            org.glassfish.grizzly.*;version="[3.0,5)",
+                            org.glassfish.grizzly.*;version="3",
                             *
                         </Import-Package>
                     </instructions>

ext/monitoring-jmx/pom.xml

@@ -70,7 +70,7 @@
                 <configuration>
                     <instructions>
                         <Export-Package>org.glassfish.tyrus.ext.monitoring.jmx.*;version=${project.version}</Export-Package>
-                        <Import-Package>org.glassfish.grizzly.*;version="[3.0,5)",*</Import-Package>
+                        <Import-Package>org.glassfish.grizzly.*;version="3",*</Import-Package>
                     </instructions>
                     <unpackBundle>true</unpackBundle>
                 </configuration>

ext/monitoring-jmx/src/test/java/org/glassfish/tyrus/ext/monitoring/jmx/MessageStatisticsTest.java

@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2026 Contributors to the Eclipse Foundation.
  * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -52,6 +53,9 @@
  */
 public class MessageStatisticsTest extends TestContainer {
 
+    private final int serverPort1 = getPort();
+    private final int serverPort2 = serverPort1 + 1;
+
     @ServerEndpoint("/jmxStatisticsServerEndpoint1")
     public static class ServerEndpoint1 {
 
@@ -170,7 +174,7 @@ public void test(boolean monitorOnSessionLevel) {
                     new TestApplicationEventListener(applicationMonitor, null, null, messageSentLatch,
                                                      messageReceivedLatch, null);
             server1Properties.put(ApplicationEventListener.APPLICATION_EVENT_LISTENER, application1EventListener);
-            server1 = new Server("localhost", 8025, "/jmxTestApp", server1Properties, ServerEndpoint1.class,
+            server1 = new Server("localhost", serverPort1, "/jmxTestApp", server1Properties, ServerEndpoint1.class,
                                  ServerEndpoint2.class);
             server1.start();
 
@@ -179,28 +183,28 @@ public void test(boolean monitorOnSessionLevel) {
                     new TestApplicationEventListener(new ApplicationMonitor(monitorOnSessionLevel), null, null,
                                                      messageSentLatch, messageReceivedLatch, null);
             server2Properties.put(ApplicationEventListener.APPLICATION_EVENT_LISTENER, application2EventListener);
-            server2 = new Server("localhost", 8026, "/jmxTestApp2", server2Properties, ServerEndpoint2.class,
+            server2 = new Server("localhost", serverPort2, "/jmxTestApp2", server2Properties, ServerEndpoint2.class,
                                  ServerEndpoint3.class);
             server2.start();
 
             ClientManager client = createClient();
             Session session1 = client.connectToServer(AnnotatedClientEndpoint.class,
-                                                      new URI("ws", null, "localhost", 8025,
+                                                      new URI("ws", null, "localhost", serverPort1,
                                                               "/jmxTestApp/jmxStatisticsServerEndpoint1", null, null));
             Session session2 = client.connectToServer(AnnotatedClientEndpoint.class,
-                                                      new URI("ws", null, "localhost", 8025,
+                                                      new URI("ws", null, "localhost", serverPort1,
                                                               "/jmxTestApp/jmxStatisticsServerEndpoint2", null, null));
             Session session3 = client.connectToServer(AnnotatedClientEndpoint.class,
-                                                      new URI("ws", null, "localhost", 8025,
+                                                      new URI("ws", null, "localhost", serverPort1,
                                                               "/jmxTestApp/jmxStatisticsServerEndpoint2", null, null));
             Session session4 = client.connectToServer(AnnotatedClientEndpoint.class,
-                                                      new URI("ws", null, "localhost", 8026,
+                                                      new URI("ws", null, "localhost", serverPort2,
                                                               "/jmxTestApp2/jmxStatisticsServerEndpoint2", null, null));
             Session session5 = client.connectToServer(AnnotatedClientEndpoint.class,
-                                                      new URI("ws", null, "localhost", 8026,
+                                                      new URI("ws", null, "localhost", serverPort2,
                                                               "/jmxTestApp2/jmxStatisticsServerEndpoint3", null, null));
             Session session6 = client.connectToServer(AnnotatedClientEndpoint.class,
-                                                      new URI("ws", null, "localhost", 8026,
+                                                      new URI("ws", null, "localhost", serverPort2,
                                                               "/jmxTestApp2/jmxStatisticsServerEndpoint3", null, null));
 
             session1.getBasicRemote().sendText(getText(1));

ext/monitoring-jmx/src/test/java/org/glassfish/tyrus/ext/monitoring/jmx/RegisteredEndpointsTest.java

@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2026 Contributors to the Eclipse Foundation.
  * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -46,6 +47,9 @@
  */
 public class RegisteredEndpointsTest extends TestContainer {
 
+    private final int serverPort1 = getPort();
+    private final int serverPort2 = serverPort1 + 1;
+
     @ServerEndpoint("/jmxServerEndpoint1")
     public static class AnnotatedServerEndpoint1 {
     }
@@ -66,14 +70,14 @@ public void testJmx() {
             Map<String, Object> server1Properties = new HashMap<String, Object>();
             ApplicationEventListener application1EventListener = new SessionAwareApplicationMonitor();
             server1Properties.put(ApplicationEventListener.APPLICATION_EVENT_LISTENER, application1EventListener);
-            server1 = new Server("localhost", 8025, "/jmxTestApp", server1Properties, AnnotatedServerEndpoint1.class,
+            server1 = new Server("localhost", serverPort1, "/jmxTestApp", server1Properties, AnnotatedServerEndpoint1.class,
                                  AnnotatedServerEndpoint2.class);
             server1.start();
 
             Map<String, Object> server2Properties = new HashMap<String, Object>();
             server2Properties
                     .put(ApplicationEventListener.APPLICATION_EVENT_LISTENER, new SessionAwareApplicationMonitor());
-            server2 = new Server("localhost", 8026, "/jmxTestApp2", server2Properties, AnnotatedServerEndpoint2.class,
+            server2 = new Server("localhost", serverPort2, "/jmxTestApp2", server2Properties, AnnotatedServerEndpoint2.class,
                                  AnnotatedServerEndpoint3.class);
             server2.start();
 

pom.xml

@@ -1,5 +1,5 @@
 <!--
-
+    Copyright 2026 Contributors to the Eclipse Foundation.
     Copyright (c) 2011, 2025 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -111,7 +111,7 @@
         <cdi-api.version>4.1.0</cdi-api.version>
         <ejb-api.version>4.0.1</ejb-api.version>
         <grizzly.version>4.0.2</grizzly.version>
-        <glassfish.version>8.0.0-JDK17-M6</glassfish.version>
+        <glassfish.version>7.1.0</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.2</jaxb.api.version>
         <jaxb.ri.version>4.0.5</jaxb.ri.version>
@@ -127,7 +127,7 @@
         <maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
         <maven.surefire.plugin.version>3.5.3</maven.surefire.plugin.version>
         <maven.war.plugin.version>3.4.0</maven.war.plugin.version>
-        <maven.bundle.plugin.version>5.1.9</maven.bundle.plugin.version>
+        <maven.bundle.plugin.version>6.0.0</maven.bundle.plugin.version>
         <cyclonedx.mvn.plugin.version>2.8.0</cyclonedx.mvn.plugin.version>
 
         <api_package>jakarta.websocket</api_package>
@@ -154,6 +154,8 @@
         <netbeans.hint.license>gf-cddl-gpl</netbeans.hint.license>
 
         <jar.updater.modules.skip>org.glassfish.tyrus.samples:*,*:*-project,*:tyrus-archetype*,*:*-documentation,org.glassfish.tyrus.tests:*e2e*,org.glassfish.tyrus.tests.servlet*:*,org.glassfish.tyrus.bundles:*,org.glassfish.tyrus.tests:*containers*</jar.updater.modules.skip>
+
+        <tyrus.test.port>8025</tyrus.test.port>
     </properties>
 
     <modules>
@@ -299,7 +301,7 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>${maven.bundle.plugin.version}</version> <!-- 5.1.5  brings dependencies on JDK packages -->
+                    <version>${maven.bundle.plugin.version}</version>
                     <extensions>true</extensions>
                     <configuration>
                         <instructions>

tests/e2e/jetty/auth-basic/pom.xml

@@ -25,7 +25,7 @@
         <version>2.2.99-SNAPSHOT</version>
     </parent>
 
-    <packaging>jar</packaging>
+    <packaging>war</packaging>
     <artifactId>tyrus-tests-e2e-auth-basic</artifactId>
 
     <name>Tyrus End-to-End Basic Auth Tests</name>
@@ -70,16 +70,6 @@
                     </loginServices>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <!-- Exclude until Jetty plugin 10.0 final -->
-                        <exclude>org/glassfish/tyrus/tests/e2e/auth/basic/BasicAuthTest.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>

tests/e2e/jetty/auth-digest/pom.xml

@@ -25,7 +25,7 @@
         <version>2.2.99-SNAPSHOT</version>
     </parent>
 
-    <packaging>jar</packaging>
+    <packaging>war</packaging>
     <artifactId>tyrus-tests-e2e-auth-digest</artifactId>
 
     <name>Tyrus End-to-End Digest Auth Tests</name>
@@ -70,16 +70,6 @@
                     </loginServices>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <!-- Exclude until Jetty plugin 10.0 final -->
-                        <exclude>org/glassfish/tyrus/tests/e2e/auth/basic/DigestAuthTest.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>

tests/e2e/jetty/pom.xml

@@ -64,23 +64,25 @@
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
+            <properties>
+                <tyrus.test.port2>8026</tyrus.test.port2>
+            </properties>
             <build>
                 <pluginManagement>
                     <plugins>
                         <plugin>
                             <groupId>org.eclipse.jetty</groupId>
                             <artifactId>jetty-maven-plugin</artifactId>
-                            <version>9.2.1.v20140609</version>
+                            <version>11.0.26</version>
                             <configuration>
-                                <scanIntervalSeconds>10</scanIntervalSeconds>
-                                <stopPort>8026</stopPort>
+                                <stopPort>${tyrus.test.port2}</stopPort>
                                 <stopKey>STOP</stopKey>
                                 <stopWait>5</stopWait>
                                 <webApp>
                                     <contextPath>/</contextPath>
                                 </webApp>
                                 <httpConnector>
-                                    <port>8025</port>
+                                    <port>${tyrus.test.port}</port>
                                     <idleTimeout>10000</idleTimeout>
                                 </httpConnector>
                             </configuration>
@@ -91,10 +93,6 @@
                                     <goals>
                                         <goal>start</goal>
                                     </goals>
-                                    <configuration>
-                                        <scanIntervalSeconds>0</scanIntervalSeconds>
-                                        <daemon>true</daemon>
-                                    </configuration>
                                 </execution>
                                 <execution>
                                     <id>stop-jetty</id>