Skip to content

Commit 2bd9238

Browse files
committed
GH-1454 - Upgrade to Spring Framework 7.0.
Requires upgrade to Boot 4 snapshots, too.
1 parent 39cc49c commit 2bd9238

File tree

6 files changed

+18
-6
lines changed

6 files changed

+18
-6
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
<nullaway.version>0.12.10</nullaway.version>
4747
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4848
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
49-
<spring-boot.version>4.0.0-RC1</spring-boot.version>
50-
<spring-framework.version>7.0.0-RC2</spring-framework.version> <!-- For Javadoc links only -->
49+
<spring-boot.version>4.0.0-SNAPSHOT</spring-boot.version>
50+
<spring-framework.version>7.0.0</spring-framework.version> <!-- For Javadoc links only -->
5151
<testcontainers.version>2.0.1</testcontainers.version>
5252
<structurizr.version>4.1.0</structurizr.version>
5353
<micrometer-tracing.version>1.6.0</micrometer-tracing.version>

spring-modulith-events/spring-modulith-events-mongodb/src/main/java/org/springframework/modulith/events/mongodb/MongoDbEventPublicationRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
import org.bson.Document;
2929
import org.jspecify.annotations.Nullable;
3030
import org.springframework.data.annotation.Id;
31+
import org.springframework.data.core.TypeInformation;
3132
import org.springframework.data.domain.Sort;
3233
import org.springframework.data.mongodb.core.MongoTemplate;
3334
import org.springframework.data.mongodb.core.aggregation.Fields;
3435
import org.springframework.data.mongodb.core.aggregation.MergeOperation.WhenDocumentsMatch;
3536
import org.springframework.data.mongodb.core.query.Criteria;
3637
import org.springframework.data.mongodb.core.query.Query;
3738
import org.springframework.data.mongodb.core.query.Update;
38-
import org.springframework.data.util.TypeInformation;
3939
import org.springframework.modulith.events.EventPublication.Status;
4040
import org.springframework.modulith.events.core.EventPublicationRepository;
4141
import org.springframework.modulith.events.core.PublicationTargetIdentifier;

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>4.0.0-RC1</version>
7+
<version>4.0.0-SNAPSHOT</version>
88
<relativePath />
99
</parent>
1010

@@ -27,7 +27,7 @@
2727
<properties>
2828
<java.version>17</java.version>
2929
<jmolecules.version>2025.0.0-RC5</jmolecules.version>
30-
<spring-framework.version>7.0.0-RC2</spring-framework.version>
30+
<spring-framework.version>7.0.0</spring-framework.version>
3131
<maven.deploy.skip>true</maven.deploy.skip>
3232
</properties>
3333

spring-modulith-integration-test/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,12 @@
8484
<scope>test</scope>
8585
</dependency>
8686

87+
<dependency>
88+
<groupId>org.springframework.boot</groupId>
89+
<artifactId>spring-boot-webtestclient</artifactId>
90+
<scope>test</scope>
91+
</dependency>
92+
8793
<dependency>
8894
<groupId>org.jgrapht</groupId>
8995
<artifactId>jgrapht-core</artifactId>

spring-modulith-integration-test/src/test/java/com/acme/myproject/moduleA/ApplicationModuleTestIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.junit.jupiter.api.Nested;
2121
import org.junit.jupiter.api.Test;
2222
import org.springframework.beans.factory.annotation.Autowired;
23-
import org.springframework.boot.webtestclient.AutoConfigureWebTestClient;
23+
import org.springframework.boot.webtestclient.autoconfigure.AutoConfigureWebTestClient;
2424
import org.springframework.context.ApplicationContext;
2525
import org.springframework.test.context.ContextConfiguration;
2626
import org.springframework.test.web.reactive.server.WebTestClient;

spring-modulith-observability/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,12 @@
101101
<artifactId>spring-boot-starter-actuator-test</artifactId>
102102
<scope>test</scope>
103103
</dependency>
104+
105+
<dependency>
106+
<groupId>org.springframework.boot</groupId>
107+
<artifactId>spring-boot-micrometer-tracing-test</artifactId>
108+
<scope>test</scope>
109+
</dependency>
104110

105111
<dependency>
106112
<groupId>io.micrometer</groupId>

0 commit comments

Comments
 (0)