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/16 07:38:35 UTC
[isis] branch spring6 updated (4e75946980 -> d96a832c60)
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 4e75946980 Merge remote-tracking branch 'origin/master' into spring6
add 5d2e8f3c47 ISIS-3279: convert JPA artifacts to Java Modules (JPMS)
new 9c8fb2f7da Merge remote-tracking branch 'origin/master' into spring6
new d96a832c60 ISIS-3275: migrate JPA module-info entries to jakarta
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:
.../jpa/applib}/src/main/java/module-info.java | 19 +++++++---------
.../eclipselink}/src/main/java/module-info.java | 22 ++++++++++++-------
.../integration}/src/main/java/module-info.java | 25 ++++++++++++++--------
.../jpa/metamodel}/src/main/java/module-info.java | 18 +++++++---------
4 files changed, 46 insertions(+), 38 deletions(-)
copy {core/interaction => persistence/jpa/applib}/src/main/java/module-info.java (71%)
copy {core/interaction => persistence/jpa/eclipselink}/src/main/java/module-info.java (68%)
copy persistence/{commons => jpa/integration}/src/main/java/module-info.java (55%)
copy {core/transaction => persistence/jpa/metamodel}/src/main/java/module-info.java (69%)
[isis] 02/02: ISIS-3275: migrate JPA module-info entries to jakarta
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 d96a832c602d626c18c255376bfc9e3bc4f9d7e3
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Nov 16 08:38:29 2022 +0100
ISIS-3275: migrate JPA module-info entries to jakarta
---
persistence/jpa/applib/src/main/java/module-info.java | 4 ++--
persistence/jpa/eclipselink/src/main/java/module-info.java | 10 +++++-----
persistence/jpa/integration/src/main/java/module-info.java | 4 ++--
persistence/jpa/metamodel/src/main/java/module-info.java | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/persistence/jpa/applib/src/main/java/module-info.java b/persistence/jpa/applib/src/main/java/module-info.java
index 32ea064dbb..12e99f6d71 100644
--- a/persistence/jpa/applib/src/main/java/module-info.java
+++ b/persistence/jpa/applib/src/main/java/module-info.java
@@ -23,8 +23,8 @@ module org.apache.causeway.persistence.jpa.applib {
exports org.apache.causeway.persistence.jpa.applib.types;
requires jakarta.activation;
- requires java.inject;
- requires java.persistence;
+ requires jakarta.inject;
+ requires jakarta.persistence;
requires lombok;
requires org.apache.causeway.applib;
requires org.apache.causeway.commons;
diff --git a/persistence/jpa/eclipselink/src/main/java/module-info.java b/persistence/jpa/eclipselink/src/main/java/module-info.java
index fd7354ef62..854d39c908 100644
--- a/persistence/jpa/eclipselink/src/main/java/module-info.java
+++ b/persistence/jpa/eclipselink/src/main/java/module-info.java
@@ -21,11 +21,9 @@ module org.apache.causeway.persistence.jpa.eclipselink {
exports org.apache.causeway.persistence.jpa.eclipselink;
exports org.apache.causeway.persistence.jpa.eclipselink.config;
- requires jakarta.el.api;
- requires jakarta.enterprise.cdi.api;
- requires java.annotation;
- requires java.inject;
- requires java.persistence;
+ requires jakarta.annotation;
+ requires jakarta.inject;
+ requires jakarta.persistence;
requires java.sql;
requires lombok;
requires org.apache.causeway.applib;
@@ -42,4 +40,6 @@ module org.apache.causeway.persistence.jpa.eclipselink {
requires spring.jdbc;
requires spring.orm;
requires spring.tx;
+ requires jakarta.cdi;
+ requires jakarta.el;
}
\ No newline at end of file
diff --git a/persistence/jpa/integration/src/main/java/module-info.java b/persistence/jpa/integration/src/main/java/module-info.java
index f1dd3b1c07..f7eba76d7d 100644
--- a/persistence/jpa/integration/src/main/java/module-info.java
+++ b/persistence/jpa/integration/src/main/java/module-info.java
@@ -27,8 +27,8 @@ module org.apache.causeway.persistence.jpa.integration {
exports org.apache.causeway.persistence.jpa.integration;
requires java.desktop;
- requires java.inject;
- requires java.persistence;
+ requires jakarta.inject;
+ requires jakarta.persistence;
requires lombok;
requires org.apache.causeway.applib;
requires org.apache.causeway.commons;
diff --git a/persistence/jpa/metamodel/src/main/java/module-info.java b/persistence/jpa/metamodel/src/main/java/module-info.java
index ad5d858e20..efe4080186 100644
--- a/persistence/jpa/metamodel/src/main/java/module-info.java
+++ b/persistence/jpa/metamodel/src/main/java/module-info.java
@@ -22,8 +22,8 @@ module org.apache.causeway.persistence.jpa.metamodel {
exports org.apache.causeway.persistence.jpa.metamodel.object.table;
exports org.apache.causeway.persistence.jpa.metamodel.facets.prop.column;
- requires java.inject;
- requires java.persistence;
+ requires jakarta.inject;
+ requires jakarta.persistence;
requires lombok;
requires org.apache.causeway.applib;
requires org.apache.causeway.commons;
[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 9c8fb2f7da75c35cea0537287911d87694d61ae6
Merge: 4e75946980 5d2e8f3c47
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Nov 16 08:33:37 2022 +0100
Merge remote-tracking branch 'origin/master' into spring6
.../jpa/applib/src/main/java/module-info.java | 36 ++++++++++++++++
.../jpa/eclipselink/src/main/java/module-info.java | 45 ++++++++++++++++++++
.../jpa/integration/src/main/java/module-info.java | 48 ++++++++++++++++++++++
.../jpa/metamodel/src/main/java/module-info.java | 35 ++++++++++++++++
4 files changed, 164 insertions(+)