This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch feature/SLING-12284-parent-60 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
omit 165dd47 SLING-12284 apply spotless code formatting omit f27d5a4 SLING-12284 Update to Parent 60, Java 11 Minimum Version add 4ff35ad SLING-12265 - Improve node type registration in JCR_OAK (#37) add a761628 SLING-12284 Update to Parent 60, Java 11 Minimum Version add b45fd9a SLING-12284 apply spotless code formatting 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 (165dd47) \ N -- N -- N refs/heads/feature/SLING-12284-parent-60 (b45fd9a) 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: .../mock/sling/NodeTypeDefinitionScanner.java | 76 +++++++++------------- .../mock/sling/NodeTypeDefinitionScannerTest.java | 29 +++++++++ core/src/test/resources/META-INF/MANIFEST.MF | 2 + .../resources/SLING-INF/nodetypes/syntax-error.cnd | 1 + 4 files changed, 62 insertions(+), 46 deletions(-) create mode 100644 core/src/test/resources/SLING-INF/nodetypes/syntax-error.cnd