This is an automated email from the ASF dual-hosted git repository. jsedding pushed a change to branch fix/SLING-12019-duplicate-ResourceResolverFactory-registration in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
discard f03a28e SLING-12019 - Avoid duplicate ResourceResolverFactory registrations add 1e5763a SLING-12021 upate to parent 52, support build with java 17 (#102) add c0b50ee Merge remote-tracking branch 'origin/master' into fix/SLING-12019-duplicate-ResourceResolverFactory-registration This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (f03a28e) \ N -- N -- N refs/heads/fix/SLING-12019-duplicate-ResourceResolverFactory-registration (c0b50ee) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: pom.xml | 22 +- .../impl/EtcMappingResourceResolverTest.java | 5 +- .../impl/MockedResourceResolverImplTest.java | 289 ++++++++++----------- .../resourceresolver/impl/ProviderHandlerTest.java | 7 +- .../impl/ResourceProviderEntryTest.java | 58 ++--- .../impl/ResourceResolverImplTest.java | 11 +- .../impl/helper/ResourceResolverControlTest.java | 37 +-- .../mapping/AbstractMappingMapEntriesTest.java | 8 +- .../impl/mapping/InMemoryResourceProvider.java | 2 +- .../impl/mapping/MapEntriesTest.java | 8 +- .../sling/resourceresolver/util/MockTestUtil.java | 8 +- 11 files changed, 224 insertions(+), 231 deletions(-)