Upgrade to Spring Boot 3

spring-statemachine-core/src/test/java/org/springframework/statemachine/action/StateDoActivityActionTests.java

@@ -21,7 +21,6 @@ import static org.springframework.statemachine.TestUtils.doStartAndAssert;
 import static org.springframework.statemachine.TestUtils.resolveMachine;
 
 import java.util.concurrent.TimeUnit;
-
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -253,10 +252,10 @@ public class StateDoActivityActionTests extends AbstractStateMachineTests {
 		Message<TestEvents> event = MessageBuilder.withPayload(TestEvents.E1)
 				.setHeader(StateMachineMessageHeaders.HEADER_DO_ACTION_TIMEOUT, 4000).build();
 		doSendEventAndConsumeAll(machine, event);
-		assertThat(testActionS2.onExecuteStartLatch.await(2, TimeUnit.SECONDS)).isTrue();
+		assertThat(testActionS2.onExecuteStartLatch.await(6, TimeUnit.SECONDS)).isTrue();
 		doSendEventAndConsumeAll(machine, TestEvents.E2);
-		assertThat(testActionS2.onExecuteLatch.await(2, TimeUnit.SECONDS)).isTrue();
-		assertThat(testActionS2.interruptedLatch.await(2, TimeUnit.SECONDS)).isFalse();
+		assertThat(testActionS2.onExecuteLatch.await(6, TimeUnit.SECONDS)).isTrue();
+		assertThat(testActionS2.interruptedLatch.await(6, TimeUnit.SECONDS)).isFalse();
 	}
 
 	@Test

spring-statemachine-core/src/test/java/org/springframework/statemachine/config/ConfigurationErrorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 the original author or authors.
+ * Copyright 2016-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Configuration;
@@ -138,7 +137,7 @@ public class ConfigurationErrorTests extends AbstractStateMachineTests {
 			builder.build();
 		}).satisfies(e -> {
 			assertThat(e.getCause()).isInstanceOf(MalformedConfigurationException.class);
-			assertThat(e.getLocalizedMessage()).contains("No transitions for state S2");
+			assertThat(e.getCause().getLocalizedMessage()).contains("No transitions for state S2");
 		});
 	}
 

spring-statemachine-core/src/test/java/org/springframework/statemachine/docs/DocsConfigurationSampleTests12.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 the original author or authors.
+ * Copyright 2020-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@ import org.springframework.statemachine.config.EnableStateMachine;
 import org.springframework.statemachine.config.StateMachineConfigurerAdapter;
 import org.springframework.statemachine.config.builders.StateMachineStateConfigurer;
 import org.springframework.statemachine.config.builders.StateMachineTransitionConfigurer;
-
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
@@ -74,7 +73,7 @@ public class DocsConfigurationSampleTests12 {
 		StepVerifier.create(machine.sendEvent(Mono.just(MessageBuilder.withPayload("E1").build())))
 			.consumeNextWith(result -> {
 				StepVerifier.create(result.complete()).consumeErrorWith(e -> {
-					assertThat(e).isInstanceOf(StateMachineException.class).hasMessageContaining("example error");
+                    assertThat(e).isInstanceOf(StateMachineException.class).cause().hasMessageContaining("example error");
 				}).verify();
 			})
 			.verifyComplete();

spring-statemachine-core/src/test/java/org/springframework/statemachine/docs/DocsConfigurationSampleTests3.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,14 @@
  */
 package org.springframework.statemachine.docs;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
 import org.springframework.context.annotation.ScopedProxyMode;
 import org.springframework.security.access.annotation.Secured;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 import org.springframework.statemachine.StateContext;
 import org.springframework.statemachine.action.Action;
 import org.springframework.statemachine.config.EnableStateMachine;
@@ -139,14 +138,16 @@ public class DocsConfigurationSampleTests3 {
 
 // tag::snippetE[]
 		@Configuration
-		@EnableGlobalMethodSecurity(securedEnabled = true)
-		public static class Config5 extends WebSecurityConfigurerAdapter {
+        public static class Config5 {
 
-			@Autowired
-			public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-				auth
-					.inMemoryAuthentication()
-						.withUser("user").password("password").roles("USER");
+    @Bean
+    public InMemoryUserDetailsManager userDetailsService() {
+        UserDetails user = User.withDefaultPasswordEncoder()
+                .username("user")
+                .password("password")
+                .roles("USER")
+                .build();
+        return new InMemoryUserDetailsManager(user);
 			}
 		}
 // end::snippetE[]

spring-statemachine-core/src/test/java/org/springframework/statemachine/security/ActionSecurityTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@ import static org.springframework.statemachine.TestUtils.doSendEventAndConsumeAl
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -30,9 +29,9 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
 import org.springframework.context.annotation.ScopedProxyMode;
 import org.springframework.security.access.annotation.Secured;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.statemachine.AbstractStateMachineTests;
 import org.springframework.statemachine.StateContext;
@@ -103,16 +102,17 @@ public class ActionSecurityTests extends AbstractStateMachineTests {
 	}
 
 	@Configuration
-	@EnableGlobalMethodSecurity(securedEnabled = true)
-	public static class Config1 extends WebSecurityConfigurerAdapter {
+	public static class Config1 {
 
-		@Autowired
-		public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-			auth
-				.inMemoryAuthentication()
-					.withUser("user").password("password").roles("USER");
+		@Bean
+		public InMemoryUserDetailsManager userDetailsService() {
+			UserDetails user = User.withDefaultPasswordEncoder()
+					.username("user")
+					.password("password")
+					.roles("USER")
+					.build();
+			return new InMemoryUserDetailsManager(user);
 		}
-
 	}
 
 	@Configuration