This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a change to branch issues/SLING-12739
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-integration-tests.git
from 2602160 SLING-12739 integration tests, require changes from same
branch name in launchpad-test-services and sling-servlets-resolver
add bc2410d SLING-12866 - Restrict force pushes, auto-delete branches on
merge
add 17c0bf9 SLING-12970 fix RedirectOnLoginErrorTest for custom login
script (#32)
add 6bae3a0 SLING-13010 Remove Provisioning ITs (#33)
add 7544b9b SLING-12539 Switch to Java 11 (#26)
add 6991c41 SLING-12600 ensure most app scripts are uploaded to unique
folder with unique resource type (#34)
add a676bc5 Bump org.apache.jackrabbit:jackrabbit-core from 2.16.3 to
2.22.2 (#31)
new 85858a1 Merge branch 'master' into issues/SLING-12739
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:
.asf.yaml | 4 ++
pom.xml | 21 +++----
.../webapp/integrationtest/ForwardTest.java | 5 +-
.../webapp/integrationtest/GetWithSuffixTest.java | 6 +-
.../webapp/integrationtest/IncludeTest.java | 5 +-
.../webapp/integrationtest/JspForwardTest.java | 5 +-
.../NodeTypeBasedRenderingTest.java | 3 +-
.../integrationtest/NodetypeRenderingTest.java | 5 +-
.../integrationtest/RequestAttributeTest.java | 17 +++---
.../login/RedirectOnLoginErrorTest.java | 38 ++++++++++++-
.../provisioning/EmbeddedModelTest.java | 66 ----------------------
.../UniqueResourceType.java} | 21 +++++--
12 files changed, 99 insertions(+), 97 deletions(-)
delete mode 100644
src/main/java/org/apache/sling/launchpad/webapp/integrationtest/provisioning/EmbeddedModelTest.java
copy
src/main/java/org/apache/sling/launchpad/webapp/integrationtest/{servlets/resolution/PrioritiesTest.java
=> util/UniqueResourceType.java} (65%)