From ef7f11486695f4bd01ba5b41840050dbbfe70c5c Mon Sep 17 00:00:00 2001
From: Oliver Drotbohm <oliver.drotbohm@broadcom.com>
Date: Fri, 23 Feb 2024 14:21:16 +0100
Subject: [PATCH] GH-510 - Upgrade to Spring Boot 3.3 M2.

Explicitly exclude Reactor Core to avoid the Neo4j reactive auto-configuration kicking in, now unconditionally registering a reactive transaction manager causing simple @Transactional declarations to break as two transaction manager beans are present.

Also upgrade to Spring Framework 6.1.4 for Javadoc reference.
---
 pom.xml                                                     | 4 ++--
 spring-modulith-events/spring-modulith-events-neo4j/pom.xml | 6 ++++++
 spring-modulith-examples/pom.xml                            | 4 ++--
 .../spring-modulith-example-epr-neo4j/pom.xml               | 6 ++++++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 97d40cd0..3f5f259e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,8 +40,8 @@
 		<lombok.version>1.18.30</lombok.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<spring-boot.version>3.3.0-M1</spring-boot.version>
-		<spring-framework.version>6.1.3</spring-framework.version> <!-- For Javadoc links only -->
+		<spring-boot.version>3.3.0-M2</spring-boot.version>
+		<spring-framework.version>6.1.4</spring-framework.version> <!-- For Javadoc links only -->
 		<spring-cloud-aws-bom.version>3.1.0</spring-cloud-aws-bom.version>
 
 	</properties>
diff --git a/spring-modulith-events/spring-modulith-events-neo4j/pom.xml b/spring-modulith-events/spring-modulith-events-neo4j/pom.xml
index 718d8b22..93daac54 100644
--- a/spring-modulith-events/spring-modulith-events-neo4j/pom.xml
+++ b/spring-modulith-events/spring-modulith-events-neo4j/pom.xml
@@ -26,6 +26,12 @@
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-neo4j</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>io.projectreactor</groupId>
+					<artifactId>reactor-core</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>
diff --git a/spring-modulith-examples/pom.xml b/spring-modulith-examples/pom.xml
index a7d28c68..d27879bf 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.3.0-M1</version>
+		<version>3.3.0-M2</version>
 		<relativePath />
 	</parent>
 
@@ -26,7 +26,7 @@
 	<properties>
 		<java.version>17</java.version>
 		<jmolecules.version>2023.1.1</jmolecules.version>
-		<spring-boot.version>3.3.0-M1</spring-boot.version>
+		<spring-boot.version>3.3.0-M2</spring-boot.version>
 	</properties>
 
 	<build>
diff --git a/spring-modulith-examples/spring-modulith-example-epr-neo4j/pom.xml b/spring-modulith-examples/spring-modulith-example-epr-neo4j/pom.xml
index e8064348..aad08bc2 100644
--- a/spring-modulith-examples/spring-modulith-example-epr-neo4j/pom.xml
+++ b/spring-modulith-examples/spring-modulith-example-epr-neo4j/pom.xml
@@ -31,6 +31,12 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-neo4j</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>io.projectreactor</groupId>
+					<artifactId>reactor-core</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>