commit | 903cbd84840ff76f899f02f763dc502412a846c7 | [log] [tgz] |
---|---|---|
author | Andreas Schaefer <schaefa@iMac.local> | Mon Jul 29 08:48:15 2019 -0700 |
committer | Andreas Schaefer <schaefa@iMac.local> | Mon Jul 29 08:48:15 2019 -0700 |
tree | cbc544277e883b2f05723b4243d436a4957fda97 | |
parent | f4aae98c6cf6de25ad6b9145e5a1008f03475aab [diff] | |
parent | 5dcaacc604bfc1271ac05abe6c3710d53b4ab374 [diff] |
Merge branch 'master' into feature/SLING-7768 # Conflicts: # pom.xml # src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java # src/test/java/org/apache/sling/resourceresolver/impl/EtcMappingResourceResolverTest.java # src/test/java/org/apache/sling/resourceresolver/impl/SimpleValueMapImpl.java # src/test/java/org/apache/sling/resourceresolver/impl/mapping/AbstractMappingMapEntriesTest.java # src/test/java/org/apache/sling/resourceresolver/impl/mapping/EtcMappingMapEntriesTest.java # src/test/java/org/apache/sling/resourceresolver/impl/mapping/MapEntriesTest.java # src/test/java/org/apache/sling/resourceresolver/util/MockTestUtil.java
This module is part of the Apache Sling project.
This bundle provides the Resource Resolver and Resource Resolver Factory