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 755e7c99bbc3c58b961d7bec2dca7d8cb6bc6e08 Merge: bff66a253b 4ed4a347e1 Author: Andi Huber <[email protected]> AuthorDate: Thu Dec 8 04:05:01 2022 +0100 Merge remote-tracking branch 'origin/master' into spring6 .../services/metamodel/MetaModelServiceMenu.java | 121 +++++++++++---------- .../applib/services/metamodel/_CsvExport2.java | 115 ++++++++++++++++++++ .../causeway/commons/internal/base/_Text.java | 20 +++- .../src/main/java/demoapp/dom/menubars.layout.xml | 3 +- .../domainmodel/MetaModelRegressionTest.java | 6 +- .../tooling/javamodel/test/AnalyzerTest.java | 18 +-- .../tooling/javamodel/test/ProjectSamples.java | 59 ++++------ 7 files changed, 229 insertions(+), 113 deletions(-) diff --cc api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/MetaModelServiceMenu.java index 1329a51213,3ec270f50e..689d481ab7 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/MetaModelServiceMenu.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/MetaModelServiceMenu.java @@@ -42,17 -45,12 +42,14 @@@ import org.apache.causeway.applib.annot import org.apache.causeway.applib.services.jaxb.JaxbService; import org.apache.causeway.applib.value.Blob; import org.apache.causeway.applib.value.Clob; - import org.apache.causeway.applib.value.NamedWithMimeType; import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType; import org.apache.causeway.commons.internal.collections._Sets; - import org.apache.causeway.commons.internal.resources._Json; import org.apache.causeway.commons.internal.resources._Xml; import org.apache.causeway.commons.internal.resources._Xml.WriteOptions; - import org.apache.causeway.commons.internal.resources._Yaml; import org.apache.causeway.schema.metamodel.v2.MetamodelDto; +import jakarta.inject.Inject; +import jakarta.inject.Named; import lombok.val; /** diff --cc regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java index cfb0d01703,9c697490e6..b134227494 --- a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java +++ b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java @@@ -18,9 -18,10 +18,10 @@@ */ package org.apache.causeway.testdomain.domainmodel; + import java.nio.charset.StandardCharsets; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.approvaltests.Approvals; import org.approvaltests.core.Options;
