You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2020/02/07 17:45:23 UTC
[sling-org-apache-sling-feature-cpconverter] branch master updated:
SLING-9059 - commiting missing adjustment (only test got adjusted in
original issue. Background is a revert of the api default behavior while
cli should by default drop content.
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git
The following commit(s) were added to refs/heads/master by this push:
new e1e43f2 SLING-9059 - commiting missing adjustment (only test got adjusted in original issue. Background is a revert of the api default behavior while cli should by default drop content.
new 5c2992d Merge pull request #26 from DominikSuess/issue/SLING-9059
e1e43f2 is described below
commit e1e43f2a675539095da581e0e2f1e2d697789f2e
Author: Dominik Suess <su...@adobe.com>
AuthorDate: Fri Feb 7 18:34:55 2020 +0100
SLING-9059 - commiting missing adjustment (only test got adjusted in original issue. Background is a revert of the api default behavior while cli should by default drop content.
---
.../cpconverter/cli/ContentPackage2FeatureModelConverterLauncher.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/cli/ContentPackage2FeatureModelConverterLauncher.java b/src/main/java/org/apache/sling/feature/cpconverter/cli/ContentPackage2FeatureModelConverterLauncher.java
index 1626520..9076be1 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/cli/ContentPackage2FeatureModelConverterLauncher.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/cli/ContentPackage2FeatureModelConverterLauncher.java
@@ -135,7 +135,8 @@ public final class ContentPackage2FeatureModelConverterLauncher implements Runna
.setEntryHandlersManager(new DefaultEntryHandlersManager())
.setAclManager(new DefaultAclManager())
.setEmitter(DefaultPackagesEventsEmitter.open(featureModelsOutputDirectory))
- .setFailOnMixedPackages(failOnMixedPackages);
+ .setFailOnMixedPackages(failOnMixedPackages)
+ .setDropContent(true);
if (filteringPatterns != null && filteringPatterns.length > 0) {
RegexBasedResourceFilter filter = new RegexBasedResourceFilter();