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 ea39424abca82e63e3786673df9e1948ae4dfa82 Merge: 3d477576f9 442b269fe7 Author: Andi Huber <[email protected]> AuthorDate: Sun Nov 27 06:55:13 2022 +0100 Merge remote-tracking branch 'origin/master' into spring6 .../attachments/Apache-Causeway.importorder | 15 +++-- .../attachments/Apache-Causeway-importorder.xml | 16 ++--- .../ROOT/pages/2022/2.0.0-RC1/mignotes.adoc | 22 +++++++ .../applib/services/factory/FactoryService.java | 52 ++++++++------- commons/src/main/java/module-info.java | 1 + .../commons/internal/reflection/_ClassCache.java | 65 ++++++++++++++++--- .../progmodel/ProgrammingModelConstants.java | 20 +++--- .../facets/HasPostConstructMethodCache.java | 58 ----------------- .../DomainObjectAnnotationFacetFactory.java | 20 +----- .../facets/object/viewmodel/ViewModelFacet.java | 7 ++ .../object/viewmodel/ViewModelFacetAbstract.java | 30 ++++----- .../object/viewmodel/ViewModelFacetFactory.java | 23 ++----- .../ViewModelFacetForDomainObjectAnnotation.java | 12 ++-- .../ViewModelFacetForSerializableInterface.java | 11 ++-- .../ViewModelFacetForViewModelInterface.java | 11 ++-- .../ViewModelFacetForXmlRootElementAnnotation.java | 11 ++-- .../core/metamodel/methods/MethodByClassMap.java | 30 --------- .../dflt/ProgrammingModelFacetsJava11.java | 7 +- .../metamodel/facets/MethodFinderUtilsTest.java | 39 +++-------- ...oicesFacetFromBoundedAnnotationFactoryTest.java | 3 +- .../DomainObjectAnnotationFacetFactoryTest.java | 3 +- .../RecreatableObjectFacetFactoryTest.java | 3 +- .../factory/FactoryServiceDefault.java | 75 ++++++++++++---------- .../testdomain/factory/ViewModelFactoryTest.java | 30 ++++++++- 24 files changed, 256 insertions(+), 308 deletions(-) diff --cc commons/src/main/java/module-info.java index de57015e03,51d62347e4..549197845b --- a/commons/src/main/java/module-info.java +++ b/commons/src/main/java/module-info.java @@@ -70,11 -71,10 +70,12 @@@ module org.apache.causeway.commons requires transitive spring.beans; requires transitive spring.context; requires transitive spring.core; - requires java.inject; - requires java.annotation; + + requires transitive jakarta.xml.bind; + requires transitive jakarta.inject; ++ requires jakarta.annotation; // JAXB JUnit test - opens org.apache.causeway.commons.internal.resources to java.xml.bind; + opens org.apache.causeway.commons.internal.resources to jakarta.xml.bind; } diff --cc commons/src/main/java/org/apache/causeway/commons/internal/reflection/_ClassCache.java index 5227b1731e,375311e2bc..17d877dd32 --- a/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_ClassCache.java +++ b/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_ClassCache.java @@@ -27,6 -28,9 +28,9 @@@ import java.util.Optional import java.util.function.Predicate; import java.util.stream.Stream; -import javax.annotation.PostConstruct; -import javax.inject.Inject; ++import jakarta.annotation.PostConstruct; ++import jakarta.inject.Inject; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.lang.Nullable; import org.springframework.util.ReflectionUtils; diff --cc regressiontests/stable-factory/src/test/java/org/apache/causeway/testdomain/factory/ViewModelFactoryTest.java index caf80bd1c5,81dc49a1de..fcb8625d10 --- a/regressiontests/stable-factory/src/test/java/org/apache/causeway/testdomain/factory/ViewModelFactoryTest.java +++ b/regressiontests/stable-factory/src/test/java/org/apache/causeway/testdomain/factory/ViewModelFactoryTest.java @@@ -18,7 -18,8 +18,8 @@@ */ package org.apache.causeway.testdomain.factory; -import javax.annotation.PostConstruct; -import javax.inject.Inject; ++import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest;
