[JAVA-39453] Upgraded spring-static-resources from spring-5 to spring-6 (#17579)

* [JAVA-39453] Upgraded spring-static-resources from spring-5 to spring-6

* [JAVA-39453] Clean up

Author: panos-kakos

spring-static-resources/pom.xml

@@ -10,9 +10,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-spring-5</artifactId>
+        <artifactId>parent-spring-6</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-spring-5</relativePath>
+        <relativePath>../parent-spring-6</relativePath>
     </parent>
 
     <dependencies>
@@ -95,21 +95,17 @@
             <artifactId>javax.inject</artifactId>
             <version>${inject.version}</version>
         </dependency>
-        <!-- Servlet -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet-api.version}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta.servlet-api.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.servlet.jsp</groupId>
-            <artifactId>javax.servlet.jsp-api</artifactId>
-            <version>${javax.servlet.jsp-api.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <version>${jstl.version}</version>
+            <groupId>jakarta.servlet.jsp.jstl</groupId>
+            <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+            <version>${jakarta.jstl-api.version}</version>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -194,6 +190,9 @@
     </build>
 
     <properties>
+        <spring-security.version>6.3.3</spring-security.version>
+        <jakarta.jstl-api.version>3.0.2</jakarta.jstl-api.version>
+        <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
         <aspectj.version>1.9.20.1</aspectj.version>
         <!-- various 1.3.2 -->
         <hibernate-validator.version>8.0.1.Final</hibernate-validator.version>

spring-static-resources/src/main/java/com/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java

@@ -1,9 +1,10 @@
 package com.baeldung.security;
 
 import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.core.Authentication;
@@ -17,6 +18,7 @@ public class MySimpleUrlAuthenticationSuccessHandler implements AuthenticationSu
 
     private RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();
 
+    @Override
     public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException {
         handle(request, response, authentication);
         HttpSession session = request.getSession(false);

spring-static-resources/src/main/java/com/baeldung/spring/MvcConfig.java

@@ -28,6 +28,7 @@
 @ComponentScan(basePackages = { "com.baeldung.web.controller", "com.baeldung.persistence.service", "com.baeldung.persistence.dao" })
 @EnableWebMvc
 public class MvcConfig implements WebMvcConfigurer {
+
     @Autowired
     Environment env;
 

spring-static-resources/src/main/java/com/baeldung/spring/SecSecurityConfig.java

@@ -1,10 +1,10 @@
 package com.baeldung.spring;
 
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.ImportResource;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
 @Configuration
-@ImportResource({ "classpath:webSecurityConfig.xml" })
+@EnableWebMvc
 public class SecSecurityConfig {
 
     public SecSecurityConfig() {

spring-static-resources/src/test/java/com/baeldung/SpringContextTest.java

@@ -5,11 +5,10 @@
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.support.AnnotationConfigContextLoader;
 import org.springframework.test.context.web.WebAppConfiguration;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = { SecSecurityConfig.class }, loader = AnnotationConfigContextLoader.class)
+@ContextConfiguration(classes = { SecSecurityConfig.class})
 @WebAppConfiguration
 public class SpringContextTest {
 

spring-static-resources/src/test/java/com/baeldung/loadresourceasstring/LoadResourceAsStringIntegrationTest.java

@@ -5,18 +5,13 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.core.io.DefaultResourceLoader;
+
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
-import org.springframework.util.FileCopyUtils;
-
-import java.io.InputStreamReader;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.junit.Assert.assertEquals;
 
 @RunWith(SpringJUnit4ClassRunner.class)