From 471135b289f05646912a198a2185c4b8cb94edfe Mon Sep 17 00:00:00 2001
From: Simon Klein <simon.klein@cloudogu.com>
Date: Wed, 29 Mar 2023 15:21:39 +0200
Subject: [PATCH] #207 Update imports

---
 pom.xml                                                  | 9 ---------
 .../infrastructure/CasInfrastructureRegistration.java    | 2 +-
 .../java/com/cloudogu/smeagol/AccountServiceTest.java    | 6 +++---
 .../AjaxAwareAuthenticationRedirectStrategyTest.java     | 4 ++--
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index f36fe6b0..68d76f19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,15 +185,6 @@
             <artifactId>httpclient5</artifactId>
             <version>5.2.1</version>
         </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>provided</scope>
-        </dependency>
-
-
     </dependencies>
 
 
diff --git a/src/main/java/com/cloudogu/smeagol/authc/infrastructure/CasInfrastructureRegistration.java b/src/main/java/com/cloudogu/smeagol/authc/infrastructure/CasInfrastructureRegistration.java
index 196065cc..96514898 100644
--- a/src/main/java/com/cloudogu/smeagol/authc/infrastructure/CasInfrastructureRegistration.java
+++ b/src/main/java/com/cloudogu/smeagol/authc/infrastructure/CasInfrastructureRegistration.java
@@ -83,7 +83,7 @@ public FilterRegistrationBean authenticationFilter() {
     }
 
     /**
-     * Registers a servlet filter that wraps the {@link javax.servlet.http.HttpServletRequest} and overrides the
+     * Registers a servlet filter that wraps the {@link jakarta.servlet.http.HttpServletRequest} and overrides the
      * authentication related methods.
      *
      * @return filter registration
diff --git a/src/test/java/com/cloudogu/smeagol/AccountServiceTest.java b/src/test/java/com/cloudogu/smeagol/AccountServiceTest.java
index 053fff0b..960314f6 100644
--- a/src/test/java/com/cloudogu/smeagol/AccountServiceTest.java
+++ b/src/test/java/com/cloudogu/smeagol/AccountServiceTest.java
@@ -1,7 +1,9 @@
 package com.cloudogu.smeagol;
 
 import com.google.common.collect.ImmutableMap;
-import org.jasig.cas.client.authentication.AttributePrincipal;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+import org.apereo.cas.client.authentication.AttributePrincipal;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -16,8 +18,6 @@
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.client.MockRestServiceServer;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
 import java.io.IOException;
 import java.util.Map;
 
diff --git a/src/test/java/com/cloudogu/smeagol/authc/infrastructure/AjaxAwareAuthenticationRedirectStrategyTest.java b/src/test/java/com/cloudogu/smeagol/authc/infrastructure/AjaxAwareAuthenticationRedirectStrategyTest.java
index 093dcb32..ee8a4df1 100644
--- a/src/test/java/com/cloudogu/smeagol/authc/infrastructure/AjaxAwareAuthenticationRedirectStrategyTest.java
+++ b/src/test/java/com/cloudogu/smeagol/authc/infrastructure/AjaxAwareAuthenticationRedirectStrategyTest.java
@@ -1,5 +1,7 @@
 package com.cloudogu.smeagol.authc.infrastructure;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -7,8 +9,6 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 import static com.cloudogu.smeagol.authc.infrastructure.AjaxAwareAuthenticationRedirectStrategy.AJAX_HEADER;