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 8a140409ad07846a844e85ec50e5276501cdadc8
Merge: 9e20677ff5 523b2cc9d5
Author: Andi Huber <[email protected]>
AuthorDate: Mon Dec 5 13:04:32 2022 +0100

    ISIS-3275: [Incubating] Migrate from Spring Framework 5.x to 6.x

 .../progmodel/ProgrammingModelConstants.java       | 46 +++++++++++++--------
 ...reteTypeToBeIncludedWithMetamodelValidator.java | 12 ++++--
 .../actions/action/ActionOverloadingValidator.java | 10 +++--
 .../DomainObjectAnnotationFacetFactory.java        | 11 +++--
 .../logicaltype/LogicalTypeMalformedValidator.java | 13 +++---
 .../method/NavigableParentFacetViaMethod.java      | 15 +++----
 .../annotation/TitleFacetViaTitleAnnotation.java   |  8 ++--
 .../object/viewmodel/ViewModelFacetFactory.java    | 19 ++++-----
 .../ViewModelFacetForViewModelInterface.java       | 47 +++++++++-------------
 ...tionEnforcesMetamodelContributionValidator.java | 13 +++---
 .../_OrphanedSupportingMethodValidator.java        |  6 ++-
 .../specloader/SpecificationLoaderDefault.java     | 12 +++---
 .../DomainModelTest_usingBadDomain.java            | 15 ++++---
 ...elTest_usingBadDomain_noAnnotationEnforced.java |  2 +-
 .../interaction/DomainObjectTesterFactory.java     | 12 +++---
 15 files changed, 129 insertions(+), 112 deletions(-)

diff --cc 
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetFactory.java
index 31edd0c04e,2c0c066936..fed8cab0c0
--- 
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetFactory.java
+++ 
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/viewmodel/ViewModelFacetFactory.java
@@@ -18,10 -18,8 +18,8 @@@
   */
  package org.apache.causeway.core.metamodel.facets.object.viewmodel;
  
- import java.util.Map;
- 
 -import javax.inject.Inject;
 -import javax.xml.bind.annotation.XmlRootElement;
 +import jakarta.inject.Inject;
 +import jakarta.xml.bind.annotation.XmlRootElement;
  
  import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants;
  import org.apache.causeway.core.metamodel.context.MetaModelContext;

Reply via email to