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 bff66a253ba7f9f96af2c768750d3e12507235ea Merge: 8a140409ad b0d74e2d7f Author: Andi Huber <[email protected]> AuthorDate: Mon Dec 5 13:50:48 2022 +0100 Merge remote-tracking branch 'origin/master' into spring6 .../services/metamodel/MetaModelServiceMenu.java | 130 ++++++++++----------- .../domainmodel/MetaModelRegressionTest.java | 15 +-- 2 files changed, 68 insertions(+), 77 deletions(-) diff --cc api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/MetaModelServiceMenu.java index c2d90f27c2,89e7d26dab..1329a51213 --- 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 @@@ -41,12 -45,15 +42,17 @@@ 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 4526d07d23,24b356d071..cfb0d01703 --- 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,10 -18,9 +18,9 @@@ */ 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;
