Add Jetty 10/JDK 11

Atmosphere · Nov 24, 2021 · 967e1e5 · 967e1e5
1 parent 8b15054
commit 967e1e5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/extensions-samples/gwt/pom.xml b/extensions-samples/gwt/pom.xml
@@ -16,12 +16,12 @@
     <url>https://github.com/Atmosphere/atmosphere-extensions/gwt20</url>
 
     <properties>
-        <gwt-version>2.5.1</gwt-version>
+        <gwt-version>2.9.0</gwt-version>
     </properties>
 
     <modules>
-        <module>gwt20-jersey-rpc</module>
-        <module>gwt20-json</module>
+	    <!--        <module>gwt20-jersey-rpc</module> -->
+	    <!--        <module>gwt20-json</module> -->
         <module>gwt20-managed-rpc</module>
         <module>gwt20-rpc</module>
     </modules>

diff --git a/extensions-samples/pom.xml b/extensions-samples/pom.xml
@@ -17,7 +17,7 @@
 	    <module>sockjs/sockjs-chat</module>
 	    <module>sockjs/sockjs-demo</module>
         <module>guice/chat-guice</module>
-        <module>gwt</module>
+	<!--        <module>gwt</module> -->
         <module>hazelcast</module>
         <module>jgroups</module>
         <module>kafka/jersey-pubsub</module>

diff --git a/pom.xml b/pom.xml
@@ -405,7 +405,7 @@
         <junit-version>3.8.1</junit-version>
         <maven-plugin.version>1.0.0</maven-plugin.version>
         <grizzly10-version>1.0.31</grizzly10-version>
-        <jetty9-version>9.4.28.v20200408</jetty9-version>
+        <jetty9-version>10.0.7</jetty9-version>
         <jetty9_2-version>9.2.13.v20150730</jetty9_2-version>
         <jetty9_3-version>9.3.5.v20151012</jetty9_3-version>
         <tomcat-version>6.0.35</tomcat-version>
@@ -423,7 +423,7 @@
         <client-version>3.1.0</client-version>
         <nettosphere-version>3.2.1</nettosphere-version>
         <atmosphere-version>2.7.2</atmosphere-version>
-        <extensions-version>2.5.2</extensions-version>
+        <extensions-version>2.6.6-SNAPSHOT</extensions-version>
         <wasync-version>2.1.2</wasync-version>
 
         <vertx-version>3.5.0</vertx-version>

diff --git a/samples/embedded-jetty-websocket-chat/pom.xml b/samples/embedded-jetty-websocket-chat/pom.xml
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty.websocket</groupId>
-            <artifactId>websocket-server</artifactId>
+            <artifactId>websocket-jetty-server</artifactId>
             <version>${jetty9-version}</version>
         </dependency>
         <dependency>