[causeway] branch spring6 updated (966c935509 -> a97a777cfa)

[ah...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a change to branch spring6
in repository https://gitbox.apache.org/repos/asf/causeway.git


    from 966c935509 CAUSEWAY-3275: post merge fix
     add 6260181536 CAUSEWAY-3304: DataSource: provides workarounds for module cannot access calling module's resources
     new a97a777cfa Merge remote-tracking branch 'origin/master' into spring6

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/causeway/commons/io/DataSource.java | 45 ++++++++++++++++------
 1 file changed, 34 insertions(+), 11 deletions(-)

[causeway] 01/01: 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 a97a777cfaddcfcb2a1d7e4010099a0d71058abb
Merge: 966c935509 6260181536
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Mar 3 07:44:53 2023 +0100

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

 .../org/apache/causeway/commons/io/DataSource.java | 45 ++++++++++++++++------
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --cc commons/src/main/java/org/apache/causeway/commons/io/DataSource.java
index cc668039b4,8ddc3c3c0d..27d4e16846
--- a/commons/src/main/java/org/apache/causeway/commons/io/DataSource.java
+++ b/commons/src/main/java/org/apache/causeway/commons/io/DataSource.java
@@@ -30,12 -30,13 +30,13 @@@ import java.util.function.Function
  
  import javax.imageio.ImageIO;
  
+ import org.springframework.core.io.Resource;
  import org.springframework.lang.Nullable;
 +import org.springframework.util.function.ThrowingConsumer;
 +import org.springframework.util.function.ThrowingFunction;
 +import org.springframework.util.function.ThrowingSupplier;
  
  import org.apache.causeway.commons.collections.Can;
 -import org.apache.causeway.commons.functional.ThrowingConsumer;
 -import org.apache.causeway.commons.functional.ThrowingFunction;
 -import org.apache.causeway.commons.functional.ThrowingSupplier;
  import org.apache.causeway.commons.functional.Try;
  import org.apache.causeway.commons.internal.base._Bytes;
  import org.apache.causeway.commons.internal.base._NullSafe;