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

Posted to commits@sling.apache.org by si...@apache.org on 2019/07/12 11:33:47 UTC

[sling-org-apache-sling-feature-cpconverter] 01/01: Merge branch 'master' into SLING-8569

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

simonetripodi pushed a commit to branch SLING-8569
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git

commit 3b55351b80edf6c17aadbd2ad48b063e1d55afa8
Merge: 1cc6f81 cb03166
Author: Simo Tripodi <st...@adobe.com>
AuthorDate: Fri Jul 12 13:33:22 2019 +0200

    Merge branch 'master' into SLING-8569

 .../sling/feature/cpconverter/acl/AclManager.java  |   2 +-
 .../feature/cpconverter/acl/DefaultAclManager.java |   9 +-
 .../sling/feature/cpconverter/acl/SystemUser.java  |   5 +-
 .../features/DefaultFeaturesManager.java           |   7 +-
 .../cpconverter/features/FeaturesManager.java      |   2 +
 .../cpconverter/handlers/BundleEntryHandler.java   |  23 +++--
 .../handlers/RepPolicyEntryHandler.java            |  96 +++++++++++++++++----
 .../vltpkg/RecollectorVaultPackageScanner.java     |  15 +++-
 .../cpconverter/vltpkg/VaultPackageAssembler.java  |  12 +--
 ...sling.feature.cpconverter.handlers.EntryHandler |   1 -
 .../handlers/BundleEntryHandlerTest.java           |  16 ++--
 .../handlers/RepPolicyEntryHandlerTest.java        |  75 +++++++++++++---
 .../apps/asd/install.author/9/test-framework.jar   | Bin 0 -> 13288 bytes
 .../jcr_root/apps/asd/install/9/test-framework.jar | Bin 0 -> 13288 bytes
 14 files changed, 209 insertions(+), 54 deletions(-)