diff --git a/pom.xml b/pom.xml index d801f041..7cdd7049 100755 --- a/pom.xml +++ b/pom.xml @@ -405,7 +405,7 @@ 3.8.1 1.0.0 1.0.31 - 10.0.7 + 11.0.7 9.2.13.v20150730 9.3.5.v20151012 6.0.35 @@ -422,7 +422,7 @@ 3.1.0 3.2.1 - 2.7.2 + 3.0.0-SNAPSHOT 2.6.6-SNAPSHOT 2.1.2 diff --git a/samples/chat/pom.xml b/samples/chat/pom.xml index f62800a2..492e6ba7 100644 --- a/samples/chat/pom.xml +++ b/samples/chat/pom.xml @@ -33,11 +33,12 @@ org.atmosphere atmosphere-runtime - ${atmosphere-version} + 3.0.0-SNAPSHOT - org.apache.geronimo.specs - geronimo-servlet_3.0_spec + jakarta.inject + jakarta.inject-api + 2.0.1 @@ -55,11 +56,6 @@ - - javax.inject - javax.inject - 1 - com.fasterxml.jackson.core jackson-databind 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 index 9694ac6b..761c7cfa 100644 --- 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 index 7e35d69e..ba6eba16 100644 --- 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 index 16ef214e..0d29e006 100644 --- 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; /**