diff --git a/spring-security-modules/spring-security-web-react/pom.xml b/spring-security-modules/spring-security-web-react/pom.xml
index 3a519acf09..f8f98ced23 100644
--- a/spring-security-modules/spring-security-web-react/pom.xml
+++ b/spring-security-modules/spring-security-web-react/pom.xml
@@ -10,9 +10,9 @@
com.baeldung
- parent-spring-5
+ parent-spring-6
0.0.1-SNAPSHOT
- ../../parent-spring-5
+ ../../parent-spring-6
@@ -20,17 +20,17 @@
org.springframework.security
spring-security-web
- ${spring-security.version}
+ ${spring.version}
org.springframework.security
spring-security-config
- ${spring-security.version}
+ ${spring.version}
org.springframework.security
spring-security-taglibs
- ${spring-security.version}
+ ${spring.version}
@@ -65,22 +65,21 @@
- javax.servlet
- javax.servlet-api
- ${javax.servlet-api.version}
+ jakarta.servlet
+ jakarta.servlet-api
+ ${jakarta-servlet-api.version}
provided
- javax.servlet
- jstl
- ${jstl.version}
- runtime
+ jakarta.servlet.jsp.jstl
+ jakarta.servlet.jsp.jstl-api
+ ${jakarta-servlet-jsp.version}
org.springframework.boot
spring-boot-starter-test
- ${spring-boot-starter-test.version}
+ ${spring-boot.version}
test
@@ -153,6 +152,8 @@
v8.11.3
6.1.0
+ 3.0.0
+ 6.1.0-M1
\ No newline at end of file
diff --git a/spring-security-modules/spring-security-web-react/src/main/java/com/baeldung/spring/RestController.java b/spring-security-modules/spring-security-web-react/src/main/java/com/baeldung/spring/RestController.java
index 4084df9698..07e2b9c2ea 100644
--- a/spring-security-modules/spring-security-web-react/src/main/java/com/baeldung/spring/RestController.java
+++ b/spring-security-modules/spring-security-web-react/src/main/java/com/baeldung/spring/RestController.java
@@ -1,5 +1,4 @@
package com.baeldung.spring;
-import javax.servlet.http.HttpServletRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -10,6 +9,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import jakarta.servlet.http.HttpServletRequest;
+
@Controller
@RequestMapping("/rest")
public class RestController {
diff --git a/spring-security-modules/spring-security-web-react/src/main/java/com/baeldung/spring/SecSecurityConfig.java b/spring-security-modules/spring-security-web-react/src/main/java/com/baeldung/spring/SecSecurityConfig.java
index 7e588f4d97..67c0c181ca 100644
--- a/spring-security-modules/spring-security-web-react/src/main/java/com/baeldung/spring/SecSecurityConfig.java
+++ b/spring-security-modules/spring-security-web-react/src/main/java/com/baeldung/spring/SecSecurityConfig.java
@@ -38,28 +38,21 @@ public class SecSecurityConfig {
@Bean
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
- http.csrf()
- .csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse())
- .and()
- .authorizeRequests()
- .antMatchers("/admin/**")
- .hasRole("ADMIN")
- .antMatchers("/anonymous*")
- .anonymous()
- .antMatchers(HttpMethod.GET, "/index*", "/static/**", "/*.js", "/*.json", "/*.ico", "/rest")
- .permitAll()
- .anyRequest()
- .authenticated()
- .and()
- .formLogin()
- .loginPage("/index.html")
- .loginProcessingUrl("/perform_login")
- .defaultSuccessUrl("/homepage.html", true)
- .failureUrl("/index.html?error=true")
- .and()
- .logout()
- .logoutUrl("/perform_logout")
- .deleteCookies("JSESSIONID");
- return http.build();
+ return http.csrf(csrf -> csrf.csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse()))
+ .authorizeHttpRequests(request -> request.requestMatchers("/admin/**")
+ .hasRole("ADMIN")
+ .requestMatchers("/anonymous*")
+ .anonymous()
+ .requestMatchers(HttpMethod.GET, "/index*", "/static/**", "/*.js", "/*.json", "/*.ico", "/rest")
+ .permitAll()
+ .anyRequest()
+ .authenticated())
+ .formLogin(form -> form.loginPage("/index.html")
+ .loginProcessingUrl("/perform_login")
+ .defaultSuccessUrl("/homepage.html", true)
+ .failureUrl("/index.html?error=true"))
+ .logout(logout -> logout.logoutUrl("/perform_logout")
+ .deleteCookies("JSESSIONID"))
+ .build();
}
}
diff --git a/spring-security-modules/spring-security-web-react/src/test/java/com/baeldung/SpringContextTest.java b/spring-security-modules/spring-security-web-react/src/test/java/com/baeldung/SpringContextTest.java
index 43ddb515eb..fcb1764aa0 100644
--- a/spring-security-modules/spring-security-web-react/src/test/java/com/baeldung/SpringContextTest.java
+++ b/spring-security-modules/spring-security-web-react/src/test/java/com/baeldung/SpringContextTest.java
@@ -1,19 +1,22 @@
package com.baeldung;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.context.web.WebAppConfiguration;
+
import com.baeldung.spring.MvcConfig;
import com.baeldung.spring.SecSecurityConfig;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-@RunWith(SpringJUnit4ClassRunner.class)
@WebAppConfiguration
@ContextConfiguration(classes = { MvcConfig.class, SecSecurityConfig.class })
-public class SpringContextTest {
+@ExtendWith(SpringExtension.class)
+class SpringContextTest {
@Test
- public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+ void whenSpringContextIsBootstrapped_thenNoExceptions() {
}
}
+
+