[causeway] 01/01: Merge remote-tracking branch 'origin/master' into spring6

[ahuber]

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 18feb54668bdf28cdb53558f54c96fe43bfb6ea1
Merge: 3e45087db4 09637c38cf
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Mon May 8 19:06:47 2023 +0200

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

 .../causeway/commons/internal/base/_Refs.java      | 118 -------------
 .../commons/internal/base/_StringCutter.java       | 184 +++++++++++++++++++++
 .../commons/internal/exceptions/_Exceptions.java   |   8 +-
 .../commons/resource/ResourceCoordinates.java      |   8 +-
 .../commons/internal/base/StringCutterTest.java    |  44 +++++
 .../actions/action/invocation/IdentifierUtil.java  |  12 +-
 .../testdomain/value/ValueSemanticsTester.java     |   9 +-
 .../model/valuetypes/ValueTypeExample.java         |  10 +-
 .../model4adoc/include/IncludeStatements.java      |  40 +++--
 .../viewer/resources/ResourceAbstract.java         |  13 +-
 10 files changed, 282 insertions(+), 164 deletions(-)

diff --cc 
regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/valuetypes/ValueTypeExample.java
index 3a9c073168,52d81fc471..064c510e30
--- 
a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/valuetypes/ValueTypeExample.java
+++ 
b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/valuetypes/ValueTypeExample.java
@@@ -35,9 -35,10 +35,10 @@@ import java.util.Optional
  import java.util.UUID;
  import java.util.stream.Stream;
  
 -import javax.inject.Named;
 +import jakarta.inject.Named;
  
  import org.springframework.beans.factory.annotation.Autowired;
+ import org.springframework.context.annotation.Scope;
  
  import org.apache.causeway.applib.annotation.Action;
  import org.apache.causeway.applib.annotation.Collection;