From d7ef7c9deab08c449a42eaecc0a9be250b8ffa9f Mon Sep 17 00:00:00 2001
From: Oliver Drotbohm <odrotbohm@vmware.com>
Date: Tue, 2 May 2023 14:28:10 +0200
Subject: [PATCH] GH-198 - Upgrade to Spring Boot 3.1 snapshots.

Switch verification of mock beans as Mockito 5.3.0 uses a different MockMaker by default that doesn't add the explicit interface we have previously checked for.

Remove obsolete init- and destroy method declarations from service bean definitions in examples.
---
 pom.xml                                                       | 2 +-
 spring-modulith-examples/pom.xml                              | 2 +-
 .../src/test/java/example/ApplicationIntegrationTests.java    | 2 +-
 .../src/test/java/example/ApplicationIntegrationTests.java    | 2 +-
 .../src/test/java/com/acme/myproject/moduleB/ModuleBTest.java | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index b625021a..97eb6e3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<spring.version>6.0.8</spring.version> <!-- For Javadoc links only -->
 		<spring-asciidoctor-backends.version>0.0.5</spring-asciidoctor-backends.version>
-		<spring-boot.version>3.0.6</spring-boot.version>
+		<spring-boot.version>3.1.0-SNAPSHOT</spring-boot.version>
 
 	</properties>
 
diff --git a/spring-modulith-examples/pom.xml b/spring-modulith-examples/pom.xml
index 6a80c4e6..e3101338 100644
--- a/spring-modulith-examples/pom.xml
+++ b/spring-modulith-examples/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.0-RC1</version>
+		<version>3.1.0-SNAPSHOT</version>
 		<relativePath />
 	</parent>
 
diff --git a/spring-modulith-examples/spring-modulith-examples-epr-jdbc/src/test/java/example/ApplicationIntegrationTests.java b/spring-modulith-examples/spring-modulith-examples-epr-jdbc/src/test/java/example/ApplicationIntegrationTests.java
index d6f741e4..808d8806 100644
--- a/spring-modulith-examples/spring-modulith-examples-epr-jdbc/src/test/java/example/ApplicationIntegrationTests.java
+++ b/spring-modulith-examples/spring-modulith-examples-epr-jdbc/src/test/java/example/ApplicationIntegrationTests.java
@@ -48,8 +48,8 @@ class ApplicationIntegrationTests {
 	@TestConfiguration
 	static class Infrastructure {
 
+		@Bean
 		@ServiceConnection
-		@Bean(initMethod = "start", destroyMethod = "stop")
 		PostgreSQLContainer<?> database() {
 			return new PostgreSQLContainer<>("postgres:15.2");
 		}
diff --git a/spring-modulith-examples/spring-modulith-examples-epr-mongodb/src/test/java/example/ApplicationIntegrationTests.java b/spring-modulith-examples/spring-modulith-examples-epr-mongodb/src/test/java/example/ApplicationIntegrationTests.java
index 1410e937..4cfe7cbd 100644
--- a/spring-modulith-examples/spring-modulith-examples-epr-mongodb/src/test/java/example/ApplicationIntegrationTests.java
+++ b/spring-modulith-examples/spring-modulith-examples-epr-mongodb/src/test/java/example/ApplicationIntegrationTests.java
@@ -51,8 +51,8 @@ class ApplicationIntegrationTests {
 	@TestConfiguration
 	static class MongoDbInfrastructureConfiguration {
 
+		@Bean
 		@ServiceConnection
-		@Bean(initMethod = "start", destroyMethod = "stop")
 		MongoDBContainer mongoDBContainer() {
 			return new MongoDBContainer("mongo:6.0.3");
 		}
diff --git a/spring-modulith-integration-test/src/test/java/com/acme/myproject/moduleB/ModuleBTest.java b/spring-modulith-integration-test/src/test/java/com/acme/myproject/moduleB/ModuleBTest.java
index 9955b99b..f02ec9d7 100644
--- a/spring-modulith-integration-test/src/test/java/com/acme/myproject/moduleB/ModuleBTest.java
+++ b/spring-modulith-integration-test/src/test/java/com/acme/myproject/moduleB/ModuleBTest.java
@@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*;
 
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import org.mockito.internal.creation.bytebuddy.MockAccess;
+import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigurationPackages;
 import org.springframework.boot.test.mock.mockito.MockBean;
@@ -62,7 +62,7 @@ class ModuleBTest {
 
 			context.getBean(ServiceComponentB.class);
 
-			assertThat(context.getBean(ServiceComponentA.class)).isInstanceOf(MockAccess.class);
+			assertThat(Mockito.mockingDetails(context.getBean(ServiceComponentA.class)).isMock()).isTrue();
 		}
 
 		@Test