[sling-slingfeature-maven-plugin] branch master updated: SLING-7961 : Adjust feature file reading to latest state

[cziegeler]

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-slingfeature-maven-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new 95b7e7a  SLING-7961 : Adjust feature file reading to latest state
95b7e7a is described below

commit 95b7e7a4f58f6033eea9bc98e28a3789f733c1aa
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Sun Sep 30 08:32:14 2018 +0200

    SLING-7961 : Adjust feature file reading to latest state
---
 src/main/java/org/apache/sling/feature/maven/Preprocessor.java  | 6 +++---
 src/main/java/org/apache/sling/feature/maven/ProjectHelper.java | 4 ++--
 2 files changed, 5 insertions(+), 5 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 b446632..65e0d07 100644
--- a/src/main/java/org/apache/sling/feature/maven/Preprocessor.java
+++ b/src/main/java/org/apache/sling/feature/maven/Preprocessor.java
@@ -24,10 +24,10 @@ import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.stream.Collectors;
 
 import org.apache.maven.model.Dependency;
@@ -138,7 +138,7 @@ public class Preprocessor {
         }
 
         // assemble features
-        final Map<String, Feature> assembledFeatures = new LinkedHashMap<>();
+        final Map<String, Feature> assembledFeatures = new TreeMap<>();
         for(final Map.Entry<String, Feature> entry : (config.isTestConfig() ? 
info.testFeatures : info.features).entrySet()) {
             final Feature assembledFeature = 
FeatureBuilder.assemble(entry.getValue(), new 
BuilderContext(this.createFeatureProvider(env,
                 info,
@@ -236,7 +236,7 @@ public class Preprocessor {
         // feature files first:
         final File dir = new File(project.getBasedir(), 
config.getFeaturesDir());
         if ( dir.exists() ) {
-            final Map<String, Feature> featureMap = new LinkedHashMap<>();
+            final Map<String, Feature> featureMap = new TreeMap<>();
             final List<File> files = new ArrayList<>();
             scan(files, dir);
 
diff --git a/src/main/java/org/apache/sling/feature/maven/ProjectHelper.java 
b/src/main/java/org/apache/sling/feature/maven/ProjectHelper.java
index 51a699a..14495c4 100644
--- a/src/main/java/org/apache/sling/feature/maven/ProjectHelper.java
+++ b/src/main/java/org/apache/sling/feature/maven/ProjectHelper.java
@@ -21,9 +21,9 @@ import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.DefaultArtifact;
@@ -83,7 +83,7 @@ public abstract class ProjectHelper {
         if ( result == null ) {
             final Integer size = (Integer)project.getContextValue(key);
             if ( size != null ) {
-                result = new LinkedHashMap<>();
+                result = new TreeMap<>();
                 for(int i=0; i<size;i++) {
                     final String text = (String)project.getContextValue(key + 
"_" + String.valueOf(i));
                     if ( text == null ) {