You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/10/31 08:57:50 UTC

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

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 e338327ceb336fa7c55fae1efe308918d77dae58
Merge: b76b1bf1bf 0bc973a3cf
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Oct 31 09:57:45 2023 +0100

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

 .../metamodel/_testing/MetaModelContext_forTesting.java     |  5 ++---
 .../metamodel/services/grid/GridLoaderServiceDefault.java   | 13 +++++++------
 .../grid/GridLoaderServiceDefault_resourceNameTest.java     |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridLoaderServiceDefault.java
index eba94a1352,7660397053..24848219d6
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridLoaderServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridLoaderServiceDefault.java
@@@ -23,11 -23,12 +23,12 @@@ import java.util.List
  import java.util.Map;
  import java.util.Objects;
  import java.util.Optional;
+ import java.util.stream.Collectors;
  import java.util.stream.Stream;
  
 -import javax.annotation.Priority;
 -import javax.inject.Inject;
 -import javax.inject.Named;
 +import jakarta.annotation.Priority;
 +import jakarta.inject.Inject;
 +import jakarta.inject.Named;
  
  import org.springframework.beans.factory.annotation.Qualifier;
  import org.springframework.lang.Nullable;