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:25:46 UTC
[sling-org-apache-sling-jcr-contentloader] branch SLING-8243
updated (462ce17 -> 5a63920)
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.
omit 462ce17 fixed issue with child node being removed
omit 46d1a2a Merge branch 'master' into SLING-8243
omit a8756d0 handle null in json
omit 3cad2a5 null pointer fix
omit ac981e4 refactoring
omit 3668145 setting working version
omit 98bb74a Added propertyMerge option
omit 4092432 clean up
omit 2f844ab re-enabled access control implementations
omit 7bac8da added node merge option
omit 201635d Updating badges for org-apache-sling-jcr-contentloader
omit 8a4ac19 SLING-7245 - Validate pull requests using Jenkins
omit 396a2da Updating badges for org-apache-sling-jcr-contentloader
omit 56f8d4e SLING-7245 - Validate pull requests using Jenkins
This update removed existing revisions from the reference, leaving the
reference pointing at a previous point in the repository history.
* -- * -- N refs/heads/SLING-8243 (5a63920)
\
O -- O -- O (462ce17)
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:
Jenkinsfile | 20 -
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, 626 insertions(+), 891 deletions(-)
delete mode 100644 Jenkinsfile