You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@sling.apache.org by cz...@apache.org on 2022/08/06 14:44:04 UTC

[sling-org-apache-sling-resourcemerger] 01/01: Merge pull request #7 from apache/issues/SLING-11506

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

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git

commit 186043d052c4a25553cde99d3b55e630bc6bc062
Merge: f821f84 ede5177
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sat Aug 6 16:43:59 2022 +0200

    Merge pull request #7 from apache/issues/SLING-11506
    
    SLING-11506 : Streamline and document resource (super) type merging

 .../sling/resourcemerger/impl/MergedResource.java  | 70 ++++++++++++++--------
 .../impl/picker/SearchPathBasedResourcePicker.java |  2 +-
 ...urceProviderForResourceTypeBasedPickerTest.java |  3 +-
 ...sourceProviderForSearchPathBasedPickerTest.java | 11 ++--
 .../resourcemerger/impl/MergedResourceTest.java    | 38 +++++++++++-
 5 files changed, 92 insertions(+), 32 deletions(-)