From ddb9c4941b5df6a3c3370f5d9adbaa5fa455877f Mon Sep 17 00:00:00 2001
From: sam-gardner <53271849+sam-gardner@users.noreply.github.com>
Date: Fri, 8 Mar 2024 09:21:18 +0000
Subject: [PATCH] [JAVA-28947] Update Spring Activiti module to Spring Boot 3
 (#16064)

---
 spring-activiti/pom.xml                       | 14 ++++++--
 .../activiti/security/config/MvcConfig.java   |  4 +--
 .../security/withspring/SecurityConfig.java   | 32 +++++++++----------
 .../main/resources/templates/homepage.html    |  6 ++++
 4 files changed, 34 insertions(+), 22 deletions(-)
 create mode 100644 spring-activiti/src/main/resources/templates/homepage.html

diff --git a/spring-activiti/pom.xml b/spring-activiti/pom.xml
index ced1d74103..c0b13c7fff 100644
--- a/spring-activiti/pom.xml
+++ b/spring-activiti/pom.xml
@@ -10,11 +10,19 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>parent-boot-3</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <relativePath>../parent-boot-3</relativePath>
     </parent>
 
+    <repositories>
+        <repository>
+            <id>alfresco</id>
+            <name>alfresco</name>
+            <url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>org.activiti</groupId>
@@ -59,7 +67,7 @@
     </build>
 
     <properties>
-        <activiti.version>7.1.0.M6</activiti.version>
+        <activiti.version>8.0.0</activiti.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-activiti/src/main/java/com/baeldung/activiti/security/config/MvcConfig.java b/spring-activiti/src/main/java/com/baeldung/activiti/security/config/MvcConfig.java
index f9394742cd..f0c5e95ca5 100644
--- a/spring-activiti/src/main/java/com/baeldung/activiti/security/config/MvcConfig.java
+++ b/spring-activiti/src/main/java/com/baeldung/activiti/security/config/MvcConfig.java
@@ -3,11 +3,11 @@ package com.baeldung.activiti.security.config;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
 @EnableWebMvc
-public class MvcConfig extends WebMvcConfigurerAdapter {
+public class MvcConfig implements WebMvcConfigurer {
 
     @Override
     public void addViewControllers(ViewControllerRegistry registry) {
diff --git a/spring-activiti/src/main/java/com/baeldung/activiti/security/withspring/SecurityConfig.java b/spring-activiti/src/main/java/com/baeldung/activiti/security/withspring/SecurityConfig.java
index 8dc3eee05e..6f3885a7ed 100644
--- a/spring-activiti/src/main/java/com/baeldung/activiti/security/withspring/SecurityConfig.java
+++ b/spring-activiti/src/main/java/com/baeldung/activiti/security/withspring/SecurityConfig.java
@@ -3,6 +3,7 @@ package com.baeldung.activiti.security.withspring;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -14,28 +15,25 @@ public class SecurityConfig {
 
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-        http.antMatcher("/**")
-            .authorizeRequests()
-            .antMatchers("/protected-process*")
-            .authenticated()
-            .anyRequest()
-            .permitAll()
-            .and()
-            .formLogin()
-            .loginPage("/login")
-            .defaultSuccessUrl("/homepage")
-            .failureUrl("/login?error=true")
-            .and()
-            .csrf()
-            .disable()
-            .logout()
-            .logoutSuccessUrl("/login");
+        http.authorizeHttpRequests(auth -> auth
+                .requestMatchers("/protected-process*")
+                .authenticated()
+                .anyRequest()
+                .permitAll())
+            .formLogin(login -> login
+                .loginPage("/login")
+                .defaultSuccessUrl("/homepage")
+                .failureUrl("/login?error=true")
+                .permitAll())
+            .csrf(AbstractHttpConfigurer::disable)
+            .logout(logout -> logout.logoutSuccessUrl("/login"));
         return http.build();
     }
 
     @Bean
     public UserDetailsService userDetailsService() {
-        UserDetails user = User.withUsername("user")
+        User.UserBuilder users = User.withDefaultPasswordEncoder();
+        UserDetails user = users.username("user")
             .password("{noop}pass")
             .authorities("ROLE_ACTIVITI_USER")
             .build();
diff --git a/spring-activiti/src/main/resources/templates/homepage.html b/spring-activiti/src/main/resources/templates/homepage.html
new file mode 100644
index 0000000000..68a7c42537
--- /dev/null
+++ b/spring-activiti/src/main/resources/templates/homepage.html
@@ -0,0 +1,6 @@
+<html>
+<head></head>
+<body>
+<h1>Home page</h1>
+</body>
+</html>
\ No newline at end of file