You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/11/15 10:54:35 UTC
[isis] 02/02: ISIS-3275: [Incubating] Migrate from Spring 5.x to Spring 6.x
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git
commit a2b18c781501a5f4d01bad724e0be0fc75993b45
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Nov 15 11:54:25 2022 +0100
ISIS-3275: [Incubating] Migrate from Spring 5.x to Spring 6.x
---
persistence/commons/src/main/java/module-info.java | 4 ++--
persistence/jdo/applib/src/main/java/module-info.java | 4 ++--
persistence/jdo/spring/src/main/java/module-info.java | 8 +++-----
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/persistence/commons/src/main/java/module-info.java b/persistence/commons/src/main/java/module-info.java
index dc127a51db..08578c8f1d 100644
--- a/persistence/commons/src/main/java/module-info.java
+++ b/persistence/commons/src/main/java/module-info.java
@@ -20,9 +20,9 @@ module org.apache.causeway.persistence.commons {
exports org.apache.causeway.persistence.jpa.integration.changetracking;
exports org.apache.causeway.persistence.commons;
- requires java.annotation;
+ requires jakarta.annotation;
requires java.desktop;
- requires java.inject;
+ requires jakarta.inject;
requires java.sql;
requires java.xml;
requires lombok;
diff --git a/persistence/jdo/applib/src/main/java/module-info.java b/persistence/jdo/applib/src/main/java/module-info.java
index af42690c6d..8cc75c002d 100644
--- a/persistence/jdo/applib/src/main/java/module-info.java
+++ b/persistence/jdo/applib/src/main/java/module-info.java
@@ -21,8 +21,8 @@ module org.apache.causeway.persistence.jdo.applib {
exports org.apache.causeway.persistence.jdo.applib.types;
exports org.apache.causeway.persistence.jdo.applib;
- requires java.inject;
- requires java.validation;
+ requires jakarta.inject;
+ requires jakarta.validation;
requires transitive javax.jdo;
requires org.apache.causeway.applib;
requires org.datanucleus.store.rdbms;
diff --git a/persistence/jdo/spring/src/main/java/module-info.java b/persistence/jdo/spring/src/main/java/module-info.java
index faf5e92711..a02e858709 100644
--- a/persistence/jdo/spring/src/main/java/module-info.java
+++ b/persistence/jdo/spring/src/main/java/module-info.java
@@ -23,13 +23,11 @@ module org.apache.causeway.persistence.jdo.spring {
exports org.apache.causeway.persistence.jdo.spring.integration;
requires glassfish.corba.omgapi;
- requires java.naming;
- requires java.persistence;
+ requires jakarta.persistence;
requires java.sql;
- requires java.transaction;
- requires java.transaction.xa;
+ requires jakarta.transaction;
requires javax.jdo;
- requires javax.servlet.api;
+ requires jakarta.servlet;
requires lombok;
requires org.apache.causeway.applib;
requires org.apache.causeway.core.config;