WIP

Atmosphere · Jan 21, 2022 · a27c505 · a27c505
1 parent 967e1e5
commit a27c505
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 15 deletions.
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>10.0.7</jetty9-version>
+        <jetty9-version>11.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>
@@ -422,7 +422,7 @@
 
         <client-version>3.1.0</client-version>
         <nettosphere-version>3.2.1</nettosphere-version>
-        <atmosphere-version>2.7.2</atmosphere-version>
+        <atmosphere-version>3.0.0-SNAPSHOT</atmosphere-version>
         <extensions-version>2.6.6-SNAPSHOT</extensions-version>
         <wasync-version>2.1.2</wasync-version>
 

diff --git a/samples/chat/pom.xml b/samples/chat/pom.xml
@@ -33,11 +33,12 @@
         <dependency>
             <groupId>org.atmosphere</groupId>
             <artifactId>atmosphere-runtime</artifactId>
-            <version>${atmosphere-version}</version>
+            <version>3.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_3.0_spec</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <version>2.0.1</version>
         </dependency>
         <!-- Uncomment to use Atmosphere Pro: http://async-io.org/AtmospherePro.html -->
         <!--<dependency>-->
@@ -55,11 +56,6 @@
         <!--<artifactId>atmosphere-postman</artifactId>-->
         <!--<version>1.0.0</version>-->
         <!--</dependency>-->
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <version>1</version>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>

diff --git a/samples/chat/src/main/java/org/atmosphere/samples/chat/Chat.java b/samples/chat/src/main/java/org/atmosphere/samples/chat/Chat.java
@@ -27,8 +27,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import java.io.IOException;
 
 import static org.atmosphere.cpr.ApplicationConfig.MAX_INACTIVE;
@@ -77,7 +77,6 @@ public void onReady(/* In you don't want injection AtmosphereResource r */) {
         logger.info("Browser {} connected", r.uuid());
         logger.info("BroadcasterFactory used {}", factory.getClass().getName());
         logger.info("Broadcaster injected {}", broadcaster.getID());
-
     }
 
     /**

diff --git a/samples/chat/src/main/java/org/atmosphere/samples/chat/JacksonDecoder.java b/samples/chat/src/main/java/org/atmosphere/samples/chat/JacksonDecoder.java
@@ -18,7 +18,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.atmosphere.config.managed.Decoder;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.io.IOException;
 
 /**

diff --git a/samples/chat/src/main/java/org/atmosphere/samples/chat/JacksonEncoder.java b/samples/chat/src/main/java/org/atmosphere/samples/chat/JacksonEncoder.java
@@ -18,7 +18,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.atmosphere.config.managed.Encoder;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.io.IOException;
 
 /**