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:27:06 UTC

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

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 5a63920  Added propertyMerge option
     add e1509c5  SLING-8243 support added for merging at a property and a node level.

No new revisions were added by this update.

Summary of changes:
 .../contentloader/package-info.java => Jenkinsfile |   6 +-
 README.md                                          |   4 +-
 .../sling/jcr/contentloader/ContentCreator.java    |   8 +
 .../sling/jcr/contentloader/ImportOptions.java     |  14 +-
 .../internal/DefaultContentCreator.java            | 171 ++++--
 .../internal/DefaultContentImporter.java           |   5 +-
 .../jcr/contentloader/internal/PathEntry.java      |  27 +-
 .../contentloader/internal/readers/JsonReader.java |  12 +-
 .../jcr/contentloader/internal/CreateNodeTest.java |   3 +-
 .../internal/DefaultContentCreatorTest.java        |  47 +-
 .../internal/ImportOptionsFactory.java             |  70 +--
 .../jcr/contentloader/internal/JsonReaderTest.java | 585 +++++++++++++--------
 .../internal/readers/OrderedJsonReaderTest.java    |   1 +
 .../internal/readers/XmlReaderTest.java            |  78 +--
 .../it/SLING7268InitialContentIT.java              | 204 +++----
 .../it/SLING8118InitialContentIT.java              | 268 +++++-----
 16 files changed, 873 insertions(+), 630 deletions(-)
 copy src/main/java/org/apache/sling/jcr/contentloader/package-info.java => Jenkinsfile (89%)