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

Posted to commits@sling.apache.org by je...@apache.org on 2019/06/26 13:48:00 UTC

[sling-org-apache-sling-jcr-contentloader] branch SLING-8243 updated (e1509c5 -> fe8a639)

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

jeb pushed a change to branch SLING-8243
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-contentloader.git.


    from e1509c5  SLING-8243 support added for merging at a property and a node level.
     add 56f8d4e  SLING-7245 - Validate pull requests using Jenkins
     add 396a2da  Updating badges for org-apache-sling-jcr-contentloader
     add 5435d93  SLING-8515 Make Pax Exam testing compliant with Java 9 and higher
     add a583f2c  SLING-7923 Simplify integration tests
     add e64ec79  style
     add a68a251  SLING-7923 Simplify integration tests
     add fe8a639  Merge branch 'master' into SLING-8243

No new revisions were added by this update.

Summary of changes:
 pom.xml                                            |  10 +-
 .../contentloader/it/BasicInitialContentIT.java    |  70 +++++-----
 .../contentloader/it/ContentloaderTestSupport.java | 143 +++++++++------------
 .../jcr/contentloader/it/I18nInitialContentIT.java |  48 ++++---
 .../contentloader/it/OrderedInitialContentIT.java  |  49 +++----
 .../it/SLING7268InitialContentIT.java              |  58 +++++----
 .../it/SLING8118InitialContentIT.java              |  69 +++++-----
 7 files changed, 236 insertions(+), 211 deletions(-)