(causeway) 03/03: Merge remote-tracking branch 'origin/master' into spring6

[ah...@apache.org]

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 1cd743354eaaf3f286ab22d04244d316b416913e
Merge: 9755076661 1e49d3b033
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Dec 8 15:35:48 2023 +0100

    Merge remote-tracking branch 'origin/master' into spring6

 .../core/config/CausewayConfiguration.java         |   37 +-
 ...ion_getMaxTitleLengthInParentedTables_Test.java |    2 +-
 ...n_getMaxTitleLengthInStandaloneTables_Test.java |    2 +-
 .../_testing/MetaModelContext_forTesting.java      |   14 +-
 .../ViewModelSemanticCheckingFacetFactoryTest.java |    2 +-
 ...romptStyleFacetFromPropertyAnnotation_Test.java |    2 +-
 ...anticsProvider_configureDecimalFormat_Test.java |    2 +-
 .../message/MessageServiceDefault.java             |   14 +-
 ...eptionRecognizerForDataAccessExceptionTest.java |   14 +-
 ...oaderFromGithub_tryLoadLayoutResource_Test.java |    2 +-
 ...VersionAnnotationFacetFactoryTest_validate.java |    2 +-
 .../MetaModelRegressionTest.verify.approved.xml    | 1141 ++++++++++++++++----
 .../integtest/Layout_Counter_IntegTest.java        |   25 +
 .../integtest/Layout_SimpleObject_IntegTest.java   |    6 +-
 ...AuthenticatorOrAuthorizorTest_authenticate.java |    2 +-
 ...ticatorOrAuthorizorTest_isVisibleInAnyRole.java |    2 +-
 .../viewer/src/main/java/module-info.java          |    1 +
 .../viewer/resources/VersionReprRenderer.java      |   16 +-
 18 files changed, 1028 insertions(+), 258 deletions(-)

diff --cc core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/message/MessageServiceDefault.java
index 4ccc1f5a6a,3cffc7a1ea..ae8e744528
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/message/MessageServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/message/MessageServiceDefault.java
@@@ -20,11 -20,13 +20,13 @@@ package org.apache.causeway.core.runtim
  
  import java.util.Optional;
  
 -import javax.annotation.Priority;
 -import javax.inject.Inject;
 -import javax.inject.Named;
 -import javax.inject.Provider;
 +import jakarta.annotation.Priority;
 +import jakarta.inject.Inject;
 +import jakarta.inject.Named;
 +import jakarta.inject.Provider;
  
+ import org.apache.causeway.applib.events.metamodel.MetamodelListener;
+ 
  import org.springframework.beans.factory.annotation.Autowired;
  import org.springframework.beans.factory.annotation.Qualifier;
  import org.springframework.stereotype.Service;
diff --cc regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
index 13acd565d2,27b2a698a0..f24046c075
--- a/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
+++ b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
@@@ -23,11 -23,13 +23,13 @@@ import java.util.List
  import java.util.Optional;
  import java.util.stream.Collectors;
  
 -import javax.inject.Inject;
 -import javax.inject.Singleton;
 +import jakarta.inject.Inject;
 +import jakarta.inject.Singleton;
  
+ import org.assertj.core.api.Assumptions;
  import org.junit.jupiter.api.BeforeAll;
  import org.junit.jupiter.api.BeforeEach;
+ import org.junit.jupiter.api.Disabled;
  import org.junit.jupiter.api.Test;
  import org.springframework.boot.SpringBootConfiguration;
  import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
diff --cc regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
index bb6ca8e2d6,20ad8a235a..978fe408be
--- a/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
+++ b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
@@@ -22,9 -22,12 +22,12 @@@ package org.apache.causeway.regressiont
  import java.util.List;
  import java.util.stream.Collectors;
  
 -import javax.inject.Inject;
 +import jakarta.inject.Inject;
  
+ import org.assertj.core.api.Assumptions;
  import org.junit.jupiter.api.BeforeAll;
+ import org.junit.jupiter.api.BeforeEach;
+ import org.junit.jupiter.api.Disabled;
  import org.junit.jupiter.api.Test;
  import org.springframework.boot.SpringBootConfiguration;
  import org.springframework.boot.autoconfigure.EnableAutoConfiguration;