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/causeway.git
commit c4d0d598a0435c182cff0e6b1e76877c68702c2f Merge: df31fd211c 554dc6ff02 Author: andi-huber <[email protected]> AuthorDate: Sun Feb 19 20:50:04 2023 +0100 Merge remote-tracking branch 'origin/master' into spring6 .../_testing/MetaModelContext_forTesting.java | 3 +- .../title/parser/TitleFacetFromValueFacet.java | 10 ++ .../specloader/SpecificationLoaderDefault.java | 2 +- .../valuesemantics/EnumValueSemanticsAbstract.java | 117 +++++++++++---------- .../valuetypes/ValueSemanticsResolverDefault.java | 12 +-- .../java/demoapp/dom/_infra/samples/DemoEnum.java | 6 +- 6 files changed, 83 insertions(+), 67 deletions(-) diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/EnumValueSemanticsAbstract.java index c6e42afcaf,af1aa30057..a4e53b9abe --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/EnumValueSemanticsAbstract.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/EnumValueSemanticsAbstract.java @@@ -22,9 -24,9 +24,9 @@@ import java.util.concurrent.atomic.Atom import java.util.function.UnaryOperator; import java.util.stream.Stream; - import org.apache.causeway.applib.annotation.Introspection.IntrospectionPolicy; -import javax.inject.Provider; ++import jakarta.inject.Provider; + import org.apache.causeway.applib.exceptions.recoverable.TextEntryParseException; - import org.apache.causeway.applib.services.i18n.TranslatableString; import org.apache.causeway.applib.services.i18n.TranslationContext; import org.apache.causeway.applib.services.i18n.TranslationService; import org.apache.causeway.applib.util.Enums; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuetypes/ValueSemanticsResolverDefault.java index c0ed5f503a,6e5e3b9275..ddc8b2d8ef --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuetypes/ValueSemanticsResolverDefault.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuetypes/ValueSemanticsResolverDefault.java @@@ -22,8 -22,9 +22,9 @@@ import java.util.List import java.util.Map; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Named; ++import jakarta.inject.Provider; import org.springframework.stereotype.Service; import org.springframework.util.ClassUtils;
