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:33 UTC
[isis] branch spring6 updated (649409a9c0 -> a2b18c7815)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git
from 649409a9c0 ISIS-3275: fixes surefire on RO and Wkt
add cb32642c44 ISIS-3278: convert JDO artifacts to Java Modules (except datanucleus)
new cb50134c85 Merge remote-tracking branch 'origin/master' into spring6
new a2b18c7815 ISIS-3275: [Incubating] Migrate from Spring 5.x to Spring 6.x
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
core/metamodel/src/main/java/module-info.java | 24 ++++++++++++++++++++
.../commons}/src/main/java/module-info.java | 14 +++++++-----
.../jdo}/applib/src/main/java/module-info.java | 15 ++++++-------
.../integration}/src/main/java/module-info.java | 19 ++++++++--------
.../metamodel/JdoPrimaryKeyPropertyPredicate.java | 1 -
.../jdo/metamodel}/src/main/java/module-info.java | 26 ++++++++++------------
.../jdo/metamodel/JdoProgrammingModel.java | 3 ++-
.../metamodel/facets/prop/column/_ColumnUtil.java | 1 -
persistence/jdo/provider/pom.xml | 5 +++++
.../jdo/provider}/src/main/java/module-info.java | 22 +++++++++---------
persistence/jdo/spring/pom.xml | 6 +++++
.../jdo/spring}/src/main/java/module-info.java | 23 ++++++++++---------
.../LocalPersistenceManagerFactoryTests.java | 18 +++++++++------
.../spring/test/integration => }/test.properties | 0
14 files changed, 108 insertions(+), 69 deletions(-)
copy {core/runtime => persistence/commons}/src/main/java/module-info.java (78%)
copy {valuetypes/asciidoc => persistence/jdo}/applib/src/main/java/module-info.java (71%)
copy {valuetypes/vega/ui/wicket => persistence/jdo/integration}/src/main/java/module-info.java (66%)
copy {core/runtime => persistence/jdo/metamodel}/src/main/java/module-info.java (64%)
copy {core/transaction => persistence/jdo/provider}/src/main/java/module-info.java (55%)
copy {core/interaction => persistence/jdo/spring}/src/main/java/module-info.java (67%)
rename persistence/jdo/spring/src/test/resources/{org/apache/causeway/persistence/jdo/spring/test/integration => }/test.properties (100%)
[isis] 01/02: Merge remote-tracking branch 'origin/master' into spring6
Posted by ah...@apache.org.
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 cb50134c854f50e1e0902eb0562671c115fc1da3
Merge: 649409a9c0 cb32642c44
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Nov 15 11:44:13 2022 +0100
Merge remote-tracking branch 'origin/master' into spring6
core/metamodel/src/main/java/module-info.java | 24 ++++++++++++
persistence/commons/src/main/java/module-info.java | 41 ++++++++++++++++++++
.../jdo/applib/src/main/java/module-info.java | 31 +++++++++++++++
.../jdo/integration/src/main/java/module-info.java | 33 ++++++++++++++++
.../metamodel/JdoPrimaryKeyPropertyPredicate.java | 1 -
.../jdo/metamodel/src/main/java/module-info.java | 37 ++++++++++++++++++
.../jdo/metamodel/JdoProgrammingModel.java | 3 +-
.../metamodel/facets/prop/column/_ColumnUtil.java | 1 -
persistence/jdo/provider/pom.xml | 5 +++
.../jdo/provider/src/main/java/module-info.java | 37 ++++++++++++++++++
persistence/jdo/spring/pom.xml | 6 +++
.../jdo/spring/src/main/java/module-info.java | 44 ++++++++++++++++++++++
.../LocalPersistenceManagerFactoryTests.java | 18 +++++----
.../spring/test/integration => }/test.properties | 0
14 files changed, 271 insertions(+), 10 deletions(-)
[isis] 02/02: ISIS-3275: [Incubating] Migrate from Spring 5.x to Spring 6.x
Posted by ah...@apache.org.
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;