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 7ada06b573e5453a387e519242062a06287b9aab Merge: d1b9b39f53 a09f71a7cf Author: Andi Huber <[email protected]> AuthorDate: Mon Dec 12 16:35:51 2022 +0100 Merge remote-tracking branch 'origin/master' into spring6 api/schema/pom.xml | 9 + api/schema/src/main/java/module-info.java | 1 + .../org/apache/causeway/schema/chg/chg-2.0.xsd | 11 +- .../org/apache/causeway/schema/cmd/cmd-2.0.xsd | 34 +- .../apache/causeway/schema/common/common-2.0.xsd | 69 ++- .../org/apache/causeway/schema/ixn/ixn-2.0.xsd | 40 +- .../causeway/schema/metamodel/metamodel-2.0.xsd | 478 +++++++++++++-------- 7 files changed, 445 insertions(+), 197 deletions(-) diff --cc api/schema/src/main/java/module-info.java index 3eba943ddc,e9f289daf6..7461bf5eea --- a/api/schema/src/main/java/module-info.java +++ b/api/schema/src/main/java/module-info.java @@@ -25,8 -25,9 +25,9 @@@ module org.apache.causeway.schema exports org.apache.causeway.schema.chg.v2; requires java.xml; - requires java.xml.bind; + requires jakarta.xml.bind; requires spring.context; + requires java.inject; opens org.apache.causeway.schema.metamodel.v2; opens org.apache.causeway.schema.common.v2;
