This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/main by this push:
new bcb07b872a9 Bumps Spring Boot 4.0.0-M3 -> 4.0.0-RC1
bcb07b872a9 is described below
commit bcb07b872a9e481838b208e654ebc9883e8a8da9
Author: a.huber <[email protected]>
AuthorDate: Sat Oct 25 23:43:42 2025 +0200
Bumps Spring Boot 4.0.0-M3 -> 4.0.0-RC1
- more auto-configure modularization
---
bom/pom.xml | 4 ++--
.../jpa/springdata/SpringDataJpaBootstrappingTest.java | 11 +++++------
regressiontests/pom.xml | 4 ++++
.../causeway/testdomain/rest/jpa/RestServiceStressTest.java | 2 +-
.../apache/causeway/testdomain/rest/jpa/RestServiceTest.java | 2 +-
viewers/graphql/testsupport/pom.xml | 10 ++++++++++
.../testsupport/CausewayViewerGraphqlIntegTestAbstract.java | 4 ++--
viewers/restfulobjects/test/pom.xml | 7 ++++++-
.../test/CausewayViewerRestfulObjectsIntegTestAbstract.java | 3 ++-
9 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index bf1bf282919..5fc418ef56d 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -39,7 +39,7 @@ identified
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>4.0.0-M3</version>
+ <version>4.0.0-RC1</version>
<relativePath />
</parent>
<groupId>org.apache.causeway</groupId>
@@ -144,7 +144,7 @@ identified
<sql-formatter.version>2.0.5</sql-formatter.version>
<snakeyaml.version>2.0</snakeyaml.version>
- <spring-boot.version>4.0.0-M3</spring-boot.version>
+ <spring-boot.version>4.0.0-RC1</spring-boot.version>
<surefire-plugin.argLine>
-Xmx384m
diff --git
a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/springdata/SpringDataJpaBootstrappingTest.java
b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/springdata/SpringDataJpaBootstrappingTest.java
index e56256ecc0f..348f6fb26bc 100644
---
a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/springdata/SpringDataJpaBootstrappingTest.java
+++
b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/springdata/SpringDataJpaBootstrappingTest.java
@@ -33,10 +33,9 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.annotation.Rollback;
-import org.springframework.test.context.ContextConfiguration;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.support.DefaultTransactionDefinition;
@@ -48,13 +47,13 @@
import org.apache.causeway.testdomain.jpa.springdata.SpringDataJpaTestModule;
import
org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
-@DataJpaTest(
+@SpringBootTest(
+ classes = {
+ Configuration_usingSpringDataJpa.class,
+ },
properties = {
"spring.datasource.url=jdbc:h2:mem:SpringDataJpaBootstrappingTest",
})
-@ContextConfiguration(classes = {
- Configuration_usingSpringDataJpa.class,
-})
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
@DirtiesContext
// @Disabled // CAUSEWAY-2789 revert
diff --git a/regressiontests/pom.xml b/regressiontests/pom.xml
index e4c22abe2fd..f0efa7d2e47 100644
--- a/regressiontests/pom.xml
+++ b/regressiontests/pom.xml
@@ -155,6 +155,10 @@
<groupId>org.apache.causeway.testing</groupId>
<artifactId>causeway-testing-integtestsupport-applib</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-actuator-autoconfigure</artifactId>
+ </dependency>
</dependencies>
<modules>
diff --git
a/regressiontests/rest-jpa/src/test/java/org/apache/causeway/testdomain/rest/jpa/RestServiceStressTest.java
b/regressiontests/rest-jpa/src/test/java/org/apache/causeway/testdomain/rest/jpa/RestServiceStressTest.java
index 6ca2cc89635..2bd87138078 100644
---
a/regressiontests/rest-jpa/src/test/java/org/apache/causeway/testdomain/rest/jpa/RestServiceStressTest.java
+++
b/regressiontests/rest-jpa/src/test/java/org/apache/causeway/testdomain/rest/jpa/RestServiceStressTest.java
@@ -29,7 +29,7 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.test.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
import org.springframework.context.annotation.Import;
import org.springframework.web.client.RestClient;
diff --git
a/regressiontests/rest-jpa/src/test/java/org/apache/causeway/testdomain/rest/jpa/RestServiceTest.java
b/regressiontests/rest-jpa/src/test/java/org/apache/causeway/testdomain/rest/jpa/RestServiceTest.java
index 3e3f1ccc899..c68bbddf3dc 100644
---
a/regressiontests/rest-jpa/src/test/java/org/apache/causeway/testdomain/rest/jpa/RestServiceTest.java
+++
b/regressiontests/rest-jpa/src/test/java/org/apache/causeway/testdomain/rest/jpa/RestServiceTest.java
@@ -33,7 +33,7 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.test.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
import org.springframework.context.annotation.Import;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.annotation.DirtiesContext.ClassMode;
diff --git a/viewers/graphql/testsupport/pom.xml
b/viewers/graphql/testsupport/pom.xml
index dd3862e853e..d1b27745cac 100644
--- a/viewers/graphql/testsupport/pom.xml
+++ b/viewers/graphql/testsupport/pom.xml
@@ -118,11 +118,21 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-test-autoconfigure</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-actuator-autoconfigure</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-graphql-test</artifactId>
+ </dependency>
<dependency>
<groupId>org.springframework.graphql</groupId>
<artifactId>spring-graphql-test</artifactId>
</dependency>
+
<!-- temporary to bring in SNAPSHOT variant -->
<dependency>
<groupId>org.springframework.graphql</groupId>
diff --git
a/viewers/graphql/testsupport/src/main/java/org/apache/causeway/viewer/graphql/viewer/testsupport/CausewayViewerGraphqlIntegTestAbstract.java
b/viewers/graphql/testsupport/src/main/java/org/apache/causeway/viewer/graphql/viewer/testsupport/CausewayViewerGraphqlIntegTestAbstract.java
index 845b7495019..bdeac7f29cb 100644
---
a/viewers/graphql/testsupport/src/main/java/org/apache/causeway/viewer/graphql/viewer/testsupport/CausewayViewerGraphqlIntegTestAbstract.java
+++
b/viewers/graphql/testsupport/src/main/java/org/apache/causeway/viewer/graphql/viewer/testsupport/CausewayViewerGraphqlIntegTestAbstract.java
@@ -51,9 +51,9 @@
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import
org.springframework.boot.test.autoconfigure.graphql.tester.AutoConfigureHttpGraphQlTester;
+import
org.springframework.boot.graphql.test.autoconfigure.tester.AutoConfigureHttpGraphQlTester;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.test.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
diff --git a/viewers/restfulobjects/test/pom.xml
b/viewers/restfulobjects/test/pom.xml
index c0f9035d345..26feb289863 100644
--- a/viewers/restfulobjects/test/pom.xml
+++ b/viewers/restfulobjects/test/pom.xml
@@ -110,7 +110,12 @@
<artifactId>spring-boot-test-autoconfigure</artifactId>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-actuator-autoconfigure</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
diff --git
a/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/CausewayViewerRestfulObjectsIntegTestAbstract.java
b/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/CausewayViewerRestfulObjectsIntegTestAbstract.java
index 94c02e1dd2a..279656b06f0 100644
---
a/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/CausewayViewerRestfulObjectsIntegTestAbstract.java
+++
b/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/CausewayViewerRestfulObjectsIntegTestAbstract.java
@@ -40,7 +40,7 @@
import org.slf4j.Logger;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.test.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
import org.springframework.context.annotation.Import;
import org.springframework.core.io.ClassPathResource;
import org.springframework.http.HttpMethod;
@@ -58,6 +58,7 @@
import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
import
org.apache.causeway.viewer.restfulobjects.applib.client.ConversationLogger;
+
import static
org.apache.causeway.commons.internal.assertions._Assert.assertNotNull;
import lombok.SneakyThrows;
