This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v4
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/v4 by this push:
new 8fe02a703fe Bumps Spring Boot 4.0.0-M2 -> 4.0.0-M3
8fe02a703fe is described below
commit 8fe02a703fe35efee82efe4c0c0c3672e4af5b17
Author: Andi Huber <[email protected]>
AuthorDate: Fri Sep 19 07:26:21 2025 +0200
Bumps Spring Boot 4.0.0-M2 -> 4.0.0-M3
---
bom/pom.xml | 4 +-
.../causeway/commons/handler/RetryHandler.java | 2 +-
.../CausewayModuleExtCommandLogPersistenceJpa.java | 2 +-
.../commandlog/jpa/integtests/AppManifest.java | 3 +-
...ausewayModuleExtExecutionLogPersistenceJpa.java | 2 +-
.../jpa/integtests/ExecutionLog_IntegTest.java | 2 +-
...ewayModuleExtExecutionOutboxPersistenceJpa.java | 2 +-
.../jpa/integtests/ExecutionOutbox_IntegTest.java | 2 +-
.../CausewayModuleExtAuditTrailPersistenceJpa.java | 2 +-
.../jpa/integtests/AuditTrail_IntegTest.java | 2 +-
.../jpa/CausewayModuleExtSecmanPersistenceJpa.java | 2 +-
.../CausewayModuleExtSessionLogPersistenceJpa.java | 2 +-
persistence/jpa/applib/pom.xml | 7 ++
.../applib/src/main/java-jigsaw/module-info.java | 1 +
persistence/jpa/integration/pom.xml | 96 ++++++++++++----------
.../jpa/integration/src/main/java/module-info.java | 1 +
.../CausewayModulePersistenceJpaIntegration.java | 4 +-
.../testdomain/jpa/JpaTestDomainModule.java | 2 +-
.../jpa/springdata/SpringDataJpaTestModule.java | 2 +-
.../integtests/CmdExecAuditSessLog_IntegTest.java | 2 +-
.../CoreWrapperFactory_IntegTestAbstract.java | 2 +-
valuetypes/asciidoc/persistence-jpa/pom.xml | 5 ++
.../persistence-jpa/src/main/java/module-info.java | 1 +
.../CausewayModuleValAsciidocPersistenceJpa.java | 2 +-
valuetypes/markdown/persistence-jpa/pom.xml | 65 ++++++++-------
.../persistence-jpa/src/main/java/module-info.java | 1 +
.../CausewayModuleValMarkdownPersistenceJpa.java | 2 +-
valuetypes/vega/persistence-jpa/pom.xml | 5 ++
.../persistence-jpa/src/main/java/module-info.java | 1 +
.../jpa/CausewayModuleValVegaPersistenceJpa.java | 2 +-
viewers/restfulobjects/test/pom.xml | 2 +
.../test/domain/UniversityModule.java | 2 +-
32 files changed, 138 insertions(+), 94 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 5c6ca3ca3a0..93be3344317 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-M2</version>
+ <version>4.0.0-M3</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-M2</spring-boot.version>
+ <spring-boot.version>4.0.0-M3</spring-boot.version>
<surefire-plugin.argLine>
-Xmx384m
diff --git
a/commons/src/main/java/org/apache/causeway/commons/handler/RetryHandler.java
b/commons/src/main/java/org/apache/causeway/commons/handler/RetryHandler.java
index a4ddaa4ae9d..5e982ae8b5e 100644
---
a/commons/src/main/java/org/apache/causeway/commons/handler/RetryHandler.java
+++
b/commons/src/main/java/org/apache/causeway/commons/handler/RetryHandler.java
@@ -91,7 +91,7 @@ public <T> Try<T> retryUntilValid(Callable<T> task,
Predicate<T> isValid, Suppli
}
// last attempt failed
- return Try.failure(new RetryException(onInvalidMessage.get()));
+ return Try.failure(new RuntimeException(onInvalidMessage.get()));
}
}
diff --git
a/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/CausewayModuleExtCommandLogPersistenceJpa.java
b/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/CausewayModuleExtCommandLogPersistenceJpa.java
index c4178534195..e0495a6ef5e 100644
---
a/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/CausewayModuleExtCommandLogPersistenceJpa.java
+++
b/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/CausewayModuleExtCommandLogPersistenceJpa.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.extensions.commandlog.jpa;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
diff --git
a/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/AppManifest.java
b/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/AppManifest.java
index 89d0de16587..d22dda2f2d8 100644
---
a/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/AppManifest.java
+++
b/extensions/core/commandlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/commandlog/jpa/integtests/AppManifest.java
@@ -20,9 +20,10 @@
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Import;
+
import
org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import
org.apache.causeway.extensions.commandlog.applib.integtest.model.CommandLogTestDomainModel;
import
org.apache.causeway.extensions.commandlog.jpa.CausewayModuleExtCommandLogPersistenceJpa;
diff --git
a/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionlog/jpa/CausewayModuleExtExecutionLogPersistenceJpa.java
b/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionlog/jpa/CausewayModuleExtExecutionLogPersistenceJpa.java
index 7fed9480fc1..cb09991c72f 100644
---
a/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionlog/jpa/CausewayModuleExtExecutionLogPersistenceJpa.java
+++
b/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionlog/jpa/CausewayModuleExtExecutionLogPersistenceJpa.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.extensions.executionlog.jpa;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
diff --git
a/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/ExecutionLog_IntegTest.java
b/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/ExecutionLog_IntegTest.java
index c62bf6a30c8..da72d7b5814 100644
---
a/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/ExecutionLog_IntegTest.java
+++
b/extensions/core/executionlog/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionlog/jpa/integtests/ExecutionLog_IntegTest.java
@@ -20,7 +20,7 @@
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Import;
diff --git
a/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionoutbox/jpa/CausewayModuleExtExecutionOutboxPersistenceJpa.java
b/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionoutbox/jpa/CausewayModuleExtExecutionOutboxPersistenceJpa.java
index dd8833b7dfe..18ab88941d9 100644
---
a/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionoutbox/jpa/CausewayModuleExtExecutionOutboxPersistenceJpa.java
+++
b/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/causeway/extensions/executionoutbox/jpa/CausewayModuleExtExecutionOutboxPersistenceJpa.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.extensions.executionoutbox.jpa;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
diff --git
a/extensions/core/executionoutbox/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionoutbox/jpa/integtests/ExecutionOutbox_IntegTest.java
b/extensions/core/executionoutbox/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionoutbox/jpa/integtests/ExecutionOutbox_IntegTest.java
index cc7a05cc87b..6d856f61cae 100644
---
a/extensions/core/executionoutbox/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionoutbox/jpa/integtests/ExecutionOutbox_IntegTest.java
+++
b/extensions/core/executionoutbox/persistence-jpa/src/test/java/org/apache/causeway/extensions/executionoutbox/jpa/integtests/ExecutionOutbox_IntegTest.java
@@ -20,7 +20,7 @@
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Import;
diff --git
a/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/causeway/extensions/audittrail/jpa/CausewayModuleExtAuditTrailPersistenceJpa.java
b/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/causeway/extensions/audittrail/jpa/CausewayModuleExtAuditTrailPersistenceJpa.java
index e84999de1b5..1b1405110ed 100644
---
a/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/causeway/extensions/audittrail/jpa/CausewayModuleExtAuditTrailPersistenceJpa.java
+++
b/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/causeway/extensions/audittrail/jpa/CausewayModuleExtAuditTrailPersistenceJpa.java
@@ -20,7 +20,7 @@
package org.apache.causeway.extensions.audittrail.jpa;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
diff --git
a/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/AuditTrail_IntegTest.java
b/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/AuditTrail_IntegTest.java
index 6710fa7ea11..d25b3c7c83b 100644
---
a/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/AuditTrail_IntegTest.java
+++
b/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/causeway/extensions/audittrail/jpa/integtests/AuditTrail_IntegTest.java
@@ -22,7 +22,7 @@
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Import;
diff --git
a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/CausewayModuleExtSecmanPersistenceJpa.java
b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/CausewayModuleExtSecmanPersistenceJpa.java
index 4b022861a0f..e7f0b56fe0b 100644
---
a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/CausewayModuleExtSecmanPersistenceJpa.java
+++
b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/causeway/extensions/secman/jpa/CausewayModuleExtSecmanPersistenceJpa.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.extensions.secman.jpa;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
diff --git
a/extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/sessionlog/jpa/CausewayModuleExtSessionLogPersistenceJpa.java
b/extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/sessionlog/jpa/CausewayModuleExtSessionLogPersistenceJpa.java
index 15965dc019d..a40f04e5358 100644
---
a/extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/sessionlog/jpa/CausewayModuleExtSessionLogPersistenceJpa.java
+++
b/extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/sessionlog/jpa/CausewayModuleExtSessionLogPersistenceJpa.java
@@ -20,7 +20,7 @@
package org.apache.causeway.extensions.sessionlog.jpa;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
diff --git a/persistence/jpa/applib/pom.xml b/persistence/jpa/applib/pom.xml
index 9a4cc4a647b..aa0ffe621a7 100644
--- a/persistence/jpa/applib/pom.xml
+++ b/persistence/jpa/applib/pom.xml
@@ -55,6 +55,13 @@
<artifactId>spring-data-jpa</artifactId>
</dependency>
+ <dependency>
+ <!-- provides EntityScan annotation-->
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-persistence</artifactId>
+ <version>${spring-boot.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.causeway.core</groupId>
<artifactId>causeway-core-transaction</artifactId>
diff --git a/persistence/jpa/applib/src/main/java-jigsaw/module-info.java
b/persistence/jpa/applib/src/main/java-jigsaw/module-info.java
index e756f7e2df0..e2ace2cc491 100644
--- a/persistence/jpa/applib/src/main/java-jigsaw/module-info.java
+++ b/persistence/jpa/applib/src/main/java-jigsaw/module-info.java
@@ -33,6 +33,7 @@
requires org.slf4j;
requires org.eclipse.persistence.core;
requires spring.context;
+ requires transitive spring.boot.persistence;
requires java.compiler;
requires com.querydsl.core;
}
\ No newline at end of file
diff --git a/persistence/jpa/integration/pom.xml
b/persistence/jpa/integration/pom.xml
index d2c17da5f19..bff02be53e9 100644
--- a/persistence/jpa/integration/pom.xml
+++ b/persistence/jpa/integration/pom.xml
@@ -17,63 +17,73 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.causeway.persistence</groupId>
- <artifactId>causeway-persistence-jpa</artifactId>
- <version>${revision}</version>
- </parent>
+ <parent>
+ <groupId>org.apache.causeway.persistence</groupId>
+ <artifactId>causeway-persistence-jpa</artifactId>
+ <version>${revision}</version>
+ </parent>
- <artifactId>causeway-persistence-jpa-integration</artifactId>
+ <artifactId>causeway-persistence-jpa-integration</artifactId>
- <name>Apache Causeway Persistence - JPA (integration)</name>
- <description>
+ <name>Apache Causeway Persistence - JPA (integration)</name>
+ <description>
JPA integration (facets, jpa-context)
</description>
- <properties>
-
<jar-plugin.automaticModuleName>org.apache.causeway.persistence.jpa.integration</jar-plugin.automaticModuleName>
-
<git-plugin.propertiesDir>org/apache/causeway/persistence/jpa/integration</git-plugin.propertiesDir>
- </properties>
+ <properties>
+ <jar-plugin.automaticModuleName>
+
org.apache.causeway.persistence.jpa.integration</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>
+
org/apache/causeway/persistence/jpa/integration</git-plugin.propertiesDir>
+ </properties>
- <dependencies>
+ <dependencies>
- <dependency>
- <groupId>org.apache.causeway.core</groupId>
- <artifactId>causeway-core-runtime</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.causeway.core</groupId>
+ <artifactId>causeway-core-runtime</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.causeway.persistence</groupId>
<artifactId>causeway-persistence-commons</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.causeway.persistence</groupId>
-
<artifactId>causeway-persistence-jpa-metamodel</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-jpa</artifactId>
- <exclusions>
- <!-- at the moment unavailable -->
- <exclusion>
- <groupId>org.springframework.roo</groupId>
-
<artifactId>org.springframework.roo.annotations</artifactId>
- </exclusion>
- <!-- version clash -->
- <exclusion>
-
<groupId>com.google.code.findbugs</groupId>
- <artifactId>annotations</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- TESTING -->
+ <dependency>
+ <groupId>org.apache.causeway.persistence</groupId>
+ <artifactId>causeway-persistence-jpa-metamodel</artifactId>
+ </dependency>
+
+ <dependency>
+ <!-- provides EntityScan annotation-->
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-persistence</artifactId>
+ <version>${spring-boot.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.data</groupId>
+ <artifactId>spring-data-jpa</artifactId>
+ <exclusions>
+ <!-- at the moment unavailable -->
+ <exclusion>
+ <groupId>org.springframework.roo</groupId>
+
<artifactId>org.springframework.roo.annotations</artifactId>
+ </exclusion>
+ <!-- version clash -->
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>annotations</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- TESTING -->
<dependency>
<groupId>org.apache.causeway.core</groupId>
diff --git a/persistence/jpa/integration/src/main/java/module-info.java
b/persistence/jpa/integration/src/main/java/module-info.java
index bfeba22c2d0..bdde072f86a 100644
--- a/persistence/jpa/integration/src/main/java/module-info.java
+++ b/persistence/jpa/integration/src/main/java/module-info.java
@@ -42,6 +42,7 @@
requires org.slf4j;
requires org.eclipse.persistence.core;
requires spring.boot.autoconfigure;
+ requires spring.boot.persistence;
requires spring.context;
requires spring.core;
requires spring.data.jpa;
diff --git
a/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/CausewayModulePersistenceJpaIntegration.java
b/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/CausewayModulePersistenceJpaIntegration.java
index 12e728d3596..d01144e19e2 100644
---
a/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/CausewayModulePersistenceJpaIntegration.java
+++
b/persistence/jpa/integration/src/main/java/org/apache/causeway/persistence/jpa/integration/CausewayModulePersistenceJpaIntegration.java
@@ -21,13 +21,15 @@
import java.util.Set;
import jakarta.persistence.EntityManager;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Primary;
import org.springframework.data.jpa.repository.JpaContext;
import org.springframework.data.jpa.repository.support.DefaultJpaContext;
+
import org.apache.causeway.core.runtime.CausewayModuleCoreRuntime;
import
org.apache.causeway.persistence.commons.CausewayModulePersistenceCommons;
import
org.apache.causeway.persistence.jpa.integration.entity.JpaEntityIntegration;
diff --git
a/regressiontests/base-jpa/src/main/java/org/apache/causeway/testdomain/jpa/JpaTestDomainModule.java
b/regressiontests/base-jpa/src/main/java/org/apache/causeway/testdomain/jpa/JpaTestDomainModule.java
index 34babe6593d..cef91f82426 100644
---
a/regressiontests/base-jpa/src/main/java/org/apache/causeway/testdomain/jpa/JpaTestDomainModule.java
+++
b/regressiontests/base-jpa/src/main/java/org/apache/causeway/testdomain/jpa/JpaTestDomainModule.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.testdomain.jpa;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
diff --git
a/regressiontests/base-jpa/src/main/java/org/apache/causeway/testdomain/jpa/springdata/SpringDataJpaTestModule.java
b/regressiontests/base-jpa/src/main/java/org/apache/causeway/testdomain/jpa/springdata/SpringDataJpaTestModule.java
index 5272d8b582f..33876eedbff 100644
---
a/regressiontests/base-jpa/src/main/java/org/apache/causeway/testdomain/jpa/springdata/SpringDataJpaTestModule.java
+++
b/regressiontests/base-jpa/src/main/java/org/apache/causeway/testdomain/jpa/springdata/SpringDataJpaTestModule.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.testdomain.jpa.springdata;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
diff --git
a/regressiontests/cmdexecauditsess/persistence-jpa/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jpa/integtests/CmdExecAuditSessLog_IntegTest.java
b/regressiontests/cmdexecauditsess/persistence-jpa/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jpa/integtests/CmdExecAuditSessLog_IntegTest.java
index 3d98b85d5ec..ee6f7d666e6 100644
---
a/regressiontests/cmdexecauditsess/persistence-jpa/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jpa/integtests/CmdExecAuditSessLog_IntegTest.java
+++
b/regressiontests/cmdexecauditsess/persistence-jpa/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jpa/integtests/CmdExecAuditSessLog_IntegTest.java
@@ -22,7 +22,7 @@
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Import;
diff --git
a/regressiontests/core-wrapperfactory/src/test/java/org/apache/causeway/regressiontests/core/wrapperfactory/integtests/CoreWrapperFactory_IntegTestAbstract.java
b/regressiontests/core-wrapperfactory/src/test/java/org/apache/causeway/regressiontests/core/wrapperfactory/integtests/CoreWrapperFactory_IntegTestAbstract.java
index dd4a5759aa0..329c7933830 100644
---
a/regressiontests/core-wrapperfactory/src/test/java/org/apache/causeway/regressiontests/core/wrapperfactory/integtests/CoreWrapperFactory_IntegTestAbstract.java
+++
b/regressiontests/core-wrapperfactory/src/test/java/org/apache/causeway/regressiontests/core/wrapperfactory/integtests/CoreWrapperFactory_IntegTestAbstract.java
@@ -24,7 +24,7 @@
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
diff --git a/valuetypes/asciidoc/persistence-jpa/pom.xml
b/valuetypes/asciidoc/persistence-jpa/pom.xml
index 3c8e9faf37c..dc109337b15 100644
--- a/valuetypes/asciidoc/persistence-jpa/pom.xml
+++ b/valuetypes/asciidoc/persistence-jpa/pom.xml
@@ -49,6 +49,11 @@
<artifactId>causeway-core-metamodel</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.causeway.persistence</groupId>
+ <artifactId>causeway-persistence-jpa-applib</artifactId>
+ </dependency>
+
</dependencies>
</project>
diff --git a/valuetypes/asciidoc/persistence-jpa/src/main/java/module-info.java
b/valuetypes/asciidoc/persistence-jpa/src/main/java/module-info.java
index 98a7def0b9b..e16f629e6a1 100644
--- a/valuetypes/asciidoc/persistence-jpa/src/main/java/module-info.java
+++ b/valuetypes/asciidoc/persistence-jpa/src/main/java/module-info.java
@@ -24,5 +24,6 @@
requires org.apache.causeway.core.config;
requires org.apache.causeway.valuetypes.asciidoc.applib;
requires spring.boot.autoconfigure;
+ requires spring.boot.persistence;
requires spring.context;
}
\ No newline at end of file
diff --git
a/valuetypes/asciidoc/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/asciidoc/persistence/jpa/CausewayModuleValAsciidocPersistenceJpa.java
b/valuetypes/asciidoc/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/asciidoc/persistence/jpa/CausewayModuleValAsciidocPersistenceJpa.java
index 507960fb8c5..271892b7055 100644
---
a/valuetypes/asciidoc/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/asciidoc/persistence/jpa/CausewayModuleValAsciidocPersistenceJpa.java
+++
b/valuetypes/asciidoc/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/asciidoc/persistence/jpa/CausewayModuleValAsciidocPersistenceJpa.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.valuetypes.asciidoc.persistence.jpa;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
diff --git a/valuetypes/markdown/persistence-jpa/pom.xml
b/valuetypes/markdown/persistence-jpa/pom.xml
index 536c9f7b59e..c4b6b562a3c 100644
--- a/valuetypes/markdown/persistence-jpa/pom.xml
+++ b/valuetypes/markdown/persistence-jpa/pom.xml
@@ -19,35 +19,42 @@
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.causeway.valuetypes</groupId>
- <artifactId>causeway-valuetypes-markdown</artifactId>
- <version>${revision}</version>
- </parent>
-
- <artifactId>causeway-valuetypes-markdown-persistence-jpa</artifactId>
- <name>Apache Causeway Val - Markdown (persistence JPA)</name>
-
- <properties>
-
<jar-plugin.automaticModuleName>org.apache.causeway.valuetypes.markdown.persistence.jpa</jar-plugin.automaticModuleName>
-
<git-plugin.propertiesDir>org/apache/causeway/valuetypes/markdown/persistence-jpa</git-plugin.propertiesDir>
- </properties>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.causeway.valuetypes</groupId>
-
<artifactId>causeway-valuetypes-markdown-applib</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.causeway.core</groupId>
- <artifactId>causeway-core-metamodel</artifactId>
- </dependency>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.causeway.valuetypes</groupId>
+ <artifactId>causeway-valuetypes-markdown</artifactId>
+ <version>${revision}</version>
+ </parent>
+
+ <artifactId>causeway-valuetypes-markdown-persistence-jpa</artifactId>
+ <name>Apache Causeway Val - Markdown (persistence JPA)</name>
+
+ <properties>
+ <jar-plugin.automaticModuleName>
+
org.apache.causeway.valuetypes.markdown.persistence.jpa</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>
+
org/apache/causeway/valuetypes/markdown/persistence-jpa</git-plugin.propertiesDir>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.causeway.valuetypes</groupId>
+ <artifactId>causeway-valuetypes-markdown-applib</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.causeway.core</groupId>
+ <artifactId>causeway-core-metamodel</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.causeway.persistence</groupId>
+ <artifactId>causeway-persistence-jpa-applib</artifactId>
+ </dependency>
</dependencies>
diff --git a/valuetypes/markdown/persistence-jpa/src/main/java/module-info.java
b/valuetypes/markdown/persistence-jpa/src/main/java/module-info.java
index 9045265c672..76c1fd0081c 100644
--- a/valuetypes/markdown/persistence-jpa/src/main/java/module-info.java
+++ b/valuetypes/markdown/persistence-jpa/src/main/java/module-info.java
@@ -24,5 +24,6 @@
requires org.apache.causeway.core.config;
requires org.apache.causeway.valuetypes.markdown.applib;
requires spring.boot.autoconfigure;
+ requires spring.boot.persistence;
requires spring.context;
}
\ No newline at end of file
diff --git
a/valuetypes/markdown/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/markdown/persistence/jpa/CausewayModuleValMarkdownPersistenceJpa.java
b/valuetypes/markdown/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/markdown/persistence/jpa/CausewayModuleValMarkdownPersistenceJpa.java
index dd255a67fd1..993d23ad458 100644
---
a/valuetypes/markdown/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/markdown/persistence/jpa/CausewayModuleValMarkdownPersistenceJpa.java
+++
b/valuetypes/markdown/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/markdown/persistence/jpa/CausewayModuleValMarkdownPersistenceJpa.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.valuetypes.markdown.persistence.jpa;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
diff --git a/valuetypes/vega/persistence-jpa/pom.xml
b/valuetypes/vega/persistence-jpa/pom.xml
index 5dfe2e930bd..6825e5804c7 100644
--- a/valuetypes/vega/persistence-jpa/pom.xml
+++ b/valuetypes/vega/persistence-jpa/pom.xml
@@ -49,6 +49,11 @@
<artifactId>causeway-core-metamodel</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.causeway.persistence</groupId>
+ <artifactId>causeway-persistence-jpa-applib</artifactId>
+ </dependency>
+
</dependencies>
</project>
diff --git a/valuetypes/vega/persistence-jpa/src/main/java/module-info.java
b/valuetypes/vega/persistence-jpa/src/main/java/module-info.java
index fe533513d6a..57a72947aad 100644
--- a/valuetypes/vega/persistence-jpa/src/main/java/module-info.java
+++ b/valuetypes/vega/persistence-jpa/src/main/java/module-info.java
@@ -24,5 +24,6 @@
requires org.apache.causeway.core.config;
requires org.apache.causeway.valuetypes.vega.applib;
requires spring.boot.autoconfigure;
+ requires spring.boot.persistence;
requires spring.context;
}
\ No newline at end of file
diff --git
a/valuetypes/vega/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/vega/persistence/jpa/CausewayModuleValVegaPersistenceJpa.java
b/valuetypes/vega/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/vega/persistence/jpa/CausewayModuleValVegaPersistenceJpa.java
index 352b7d6b4f2..86187bc5370 100644
---
a/valuetypes/vega/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/vega/persistence/jpa/CausewayModuleValVegaPersistenceJpa.java
+++
b/valuetypes/vega/persistence-jpa/src/main/java/org/apache/causeway/valuetypes/vega/persistence/jpa/CausewayModuleValVegaPersistenceJpa.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.valuetypes.vega.persistence.jpa;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
diff --git a/viewers/restfulobjects/test/pom.xml
b/viewers/restfulobjects/test/pom.xml
index a2ffa1f159f..43d42523026 100644
--- a/viewers/restfulobjects/test/pom.xml
+++ b/viewers/restfulobjects/test/pom.xml
@@ -114,11 +114,13 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
+ <version>4.0.0-M3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
+ <version>4.0.0-M3</version>
<scope>test</scope>
</dependency>
diff --git
a/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/domain/UniversityModule.java
b/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/domain/UniversityModule.java
index e8e46a5747e..ef6a8f984df 100644
---
a/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/domain/UniversityModule.java
+++
b/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/domain/UniversityModule.java
@@ -18,7 +18,7 @@
*/
package org.apache.causeway.viewer.restfulobjects.test.domain;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
