From commits-return-66701-archive-asf-public=cust-asf.ponee.io@sling.apache.org Fri Apr 27 11:44:02 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 2E3A7180679 for ; Fri, 27 Apr 2018 11:44:02 +0200 (CEST) Received: (qmail 49001 invoked by uid 500); 27 Apr 2018 09:44:00 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 48928 invoked by uid 99); 27 Apr 2018 09:44:00 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Apr 2018 09:44:00 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 5D110807DE; Fri, 27 Apr 2018 09:43:59 +0000 (UTC) Date: Fri, 27 Apr 2018 09:44:07 +0000 To: "commits@sling.apache.org" Subject: [sling-slingfeature-maven-plugin] 08/14: Split feature util into io and assembly parts MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: davidb@apache.org In-Reply-To: <152482223900.25705.16154181190322356994@gitbox.apache.org> References: <152482223900.25705.16154181190322356994@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: sling-slingfeature-maven-plugin X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 4a121475db1d281b9e6a376e5ecd08cabcfa2cbc X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180427094359.5D110807DE@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. davidb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git commit 4a121475db1d281b9e6a376e5ecd08cabcfa2cbc Author: Carsten Ziegeler AuthorDate: Tue Apr 17 16:56:40 2018 +0200 Split feature util into io and assembly parts --- .../apache/sling/feature/maven/Preprocessor.java | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/apache/sling/feature/maven/Preprocessor.java b/src/main/java/org/apache/sling/feature/maven/Preprocessor.java index 65191a2..6c1a3ef 100644 --- a/src/main/java/org/apache/sling/feature/maven/Preprocessor.java +++ b/src/main/java/org/apache/sling/feature/maven/Preprocessor.java @@ -16,6 +16,15 @@ */ package org.apache.sling.feature.maven; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.io.Reader; +import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + import org.apache.maven.model.Dependency; import org.apache.maven.project.MavenProject; import org.apache.sling.feature.Artifact; @@ -23,7 +32,6 @@ import org.apache.sling.feature.ArtifactId; import org.apache.sling.feature.Extension; import org.apache.sling.feature.ExtensionType; import org.apache.sling.feature.Feature; -import org.apache.sling.feature.support.FeatureUtil; import org.apache.sling.feature.support.json.FeatureJSONReader; import org.apache.sling.feature.support.json.FeatureJSONReader.SubstituteVariables; import org.apache.sling.feature.support.process.BuilderContext; @@ -31,15 +39,6 @@ import org.apache.sling.feature.support.process.FeatureBuilder; import org.apache.sling.feature.support.process.FeatureProvider; import org.codehaus.plexus.logging.Logger; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.io.Reader; -import java.io.StringReader; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - /** * The processor processes all feature projects. */ @@ -236,7 +235,7 @@ public class Preprocessor { for(final File file : files) { try { - final List features = FeatureUtil.parseFeatureRefFile(file); + final List features = org.apache.sling.feature.support.io.FeatureUtil.parseFeatureRefFile(file); if ( features.isEmpty() ) { env.logger.debug("Empty feature ref file at " + file); } else { -- To stop receiving notification emails like this one, please contact davidb@apache.org.