Skip to content

Commit ef7f114

Browse files
committed
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.
1 parent d325c83 commit ef7f114

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
<lombok.version>1.18.30</lombok.version>
4141
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4242
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
43-
<spring-boot.version>3.3.0-M1</spring-boot.version>
44-
<spring-framework.version>6.1.3</spring-framework.version> <!-- For Javadoc links only -->
43+
<spring-boot.version>3.3.0-M2</spring-boot.version>
44+
<spring-framework.version>6.1.4</spring-framework.version> <!-- For Javadoc links only -->
4545
<spring-cloud-aws-bom.version>3.1.0</spring-cloud-aws-bom.version>
4646

4747
</properties>

spring-modulith-events/spring-modulith-events-neo4j/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@
2626
<dependency>
2727
<groupId>org.springframework.data</groupId>
2828
<artifactId>spring-data-neo4j</artifactId>
29+
<exclusions>
30+
<exclusion>
31+
<groupId>io.projectreactor</groupId>
32+
<artifactId>reactor-core</artifactId>
33+
</exclusion>
34+
</exclusions>
2935
</dependency>
3036

3137
<dependency>

spring-modulith-examples/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.springframework.boot</groupId>
66
<artifactId>spring-boot-starter-parent</artifactId>
7-
<version>3.3.0-M1</version>
7+
<version>3.3.0-M2</version>
88
<relativePath />
99
</parent>
1010

@@ -26,7 +26,7 @@
2626
<properties>
2727
<java.version>17</java.version>
2828
<jmolecules.version>2023.1.1</jmolecules.version>
29-
<spring-boot.version>3.3.0-M1</spring-boot.version>
29+
<spring-boot.version>3.3.0-M2</spring-boot.version>
3030
</properties>
3131

3232
<build>

spring-modulith-examples/spring-modulith-example-epr-neo4j/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@
3131
<dependency>
3232
<groupId>org.springframework.boot</groupId>
3333
<artifactId>spring-boot-starter-data-neo4j</artifactId>
34+
<exclusions>
35+
<exclusion>
36+
<groupId>io.projectreactor</groupId>
37+
<artifactId>reactor-core</artifactId>
38+
</exclusion>
39+
</exclusions>
3440
</dependency>
3541

3642
<dependency>

0 commit comments

Comments
 (0)