You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by da...@apache.org on 2018/04/27 09:44:07 UTC
[sling-slingfeature-maven-plugin] 08/14: Split feature util into io
and assembly parts
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 <cz...@apache.org>
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<String> features = FeatureUtil.parseFeatureRefFile(file);
+ final List<String> 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.