From 78972899ffb2af9edf8aa61f2a564b32b6ac108d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20L=C3=B6vdahl?= <slovdahl@hibox.fi>
Date: Fri, 26 Jan 2024 11:59:39 +0200
Subject: [PATCH] Update atmosphere-spring to Spring 6 and jakarta.servlet

---
 pom.xml                                             |  3 ++-
 spring/modules/pom.xml                              | 13 ++++---------
 .../atmosphere/spring/SpringWebObjectFactory.java   |  5 +++--
 .../spring/bean/AtmosphereSpringContext.java        |  6 ++----
 .../spring/bean/AtmosphereSpringServlet.java        | 10 +++++-----
 5 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index d8fc32814..cbdce7a99 100755
--- a/pom.xml
+++ b/pom.xml
@@ -510,7 +510,7 @@
         <felix-version>2.4.0</felix-version>
         <jms-version>1.1-rev-1</jms-version>
         <guice-version>3.0</guice-version>
-        <spring-version>3.2.16.RELEASE</spring-version>
+        <spring-version>6.1.3</spring-version>
         <wicket.version>1.4.12</wicket.version>
         <ahc.version>1.8.3</ahc.version>
         <jedis.version>2.0.0</jedis.version>
@@ -519,6 +519,7 @@
         <logback-version>1.1.2</logback-version>
 
         <atmosphere-version>2.7.5</atmosphere-version>
+        <atmosphere3-version>3.0.4</atmosphere3-version>
         <javascript-version>3.1.2</javascript-version>
     </properties>
 </project>
diff --git a/spring/modules/pom.xml b/spring/modules/pom.xml
index 6f186e132..a1813a334 100644
--- a/spring/modules/pom.xml
+++ b/spring/modules/pom.xml
@@ -17,17 +17,12 @@
         <dependency>
             <groupId>org.atmosphere</groupId>
             <artifactId>atmosphere-runtime</artifactId>
-            <version>${atmosphere-version}</version>
+            <version>${atmosphere3-version}</version>
         </dependency>
         <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib</artifactId>
-            <version>3.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_3.0_spec</artifactId>
-            <version>1.0</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>6.0.0</version>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
diff --git a/spring/modules/src/main/java/org/atmosphere/spring/SpringWebObjectFactory.java b/spring/modules/src/main/java/org/atmosphere/spring/SpringWebObjectFactory.java
index 1cd9dd695..5c0fe4d78 100644
--- a/spring/modules/src/main/java/org/atmosphere/spring/SpringWebObjectFactory.java
+++ b/spring/modules/src/main/java/org/atmosphere/spring/SpringWebObjectFactory.java
@@ -25,6 +25,7 @@ public class SpringWebObjectFactory implements AtmosphereObjectFactory<Class<?>>
     public static final String ATMOSPHERE_SPRING_EXCLUDE_CLASSES = "org.atmosphere.spring.excludedClasses";
 
     private static final Logger logger = LoggerFactory.getLogger(SpringWebObjectFactory.class);
+
     protected boolean preventSpringInjection = false;
     private final List<Class<?>> excludedFromInjection = new ArrayList<Class<?>>();
 
@@ -47,8 +48,7 @@ public <T, U extends T> U newClassInstance(Class<T> classType,
         U t = context.getAutowireCapableBeanFactory().createBean(classToInstantiate);
 
         if (t == null) {
-            logger.info("Unable to find {}. Creating the object directly."
-                    + classToInstantiate.getName());
+            logger.info("Unable to find {}. Creating the object directly.", classToInstantiate.getName());
             return classToInstantiate.newInstance();
         }
         return t;
@@ -60,6 +60,7 @@ public AtmosphereObjectFactory allowInjectionOf(Class<?> aClass) {
         return this;
     }
 
+    @Override
     public String toString() {
         return "Spring Web ObjectFactory";
     }
diff --git a/spring/modules/src/main/java/org/atmosphere/spring/bean/AtmosphereSpringContext.java b/spring/modules/src/main/java/org/atmosphere/spring/bean/AtmosphereSpringContext.java
index dd43c88ba..b7a344522 100644
--- a/spring/modules/src/main/java/org/atmosphere/spring/bean/AtmosphereSpringContext.java
+++ b/spring/modules/src/main/java/org/atmosphere/spring/bean/AtmosphereSpringContext.java
@@ -19,8 +19,8 @@
 import java.util.Enumeration;
 import java.util.Map;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
 
 /**
  * Spring context.
@@ -64,6 +64,4 @@ public Map<String, String> getConfig() {
     public void setConfig(Map<String, String> config) {
         this.config = config;
     }
-
 }
-
diff --git a/spring/modules/src/main/java/org/atmosphere/spring/bean/AtmosphereSpringServlet.java b/spring/modules/src/main/java/org/atmosphere/spring/bean/AtmosphereSpringServlet.java
index 9852609bf..6bd163b22 100644
--- a/spring/modules/src/main/java/org/atmosphere/spring/bean/AtmosphereSpringServlet.java
+++ b/spring/modules/src/main/java/org/atmosphere/spring/bean/AtmosphereSpringServlet.java
@@ -21,11 +21,11 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**