[sling-org-apache-sling-feature-analyser] branch master updated: Update to latest feature model

[pauls]

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

pauls pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-analyser.git


The following commit(s) were added to refs/heads/master by this push:
     new 156758a  Update to latest feature model
156758a is described below

commit 156758af35f9b3e3d36e60960b93fdae71697637
Author: Karl Pauls <karlpa...@gmail.com>
AuthorDate: Mon Jan 20 23:42:44 2020 +0100

    Update to latest feature model
---
 pom.xml                                                     | 4 ++--
 src/main/java/org/apache/sling/feature/scanner/Scanner.java | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 30bc776..768c2a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.feature</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -178,7 +178,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.feature.io</artifactId>
-            <version>1.1.0</version>
+            <version>1.2.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/src/main/java/org/apache/sling/feature/scanner/Scanner.java 
b/src/main/java/org/apache/sling/feature/scanner/Scanner.java
index 4f21a7c..7373240 100644
--- a/src/main/java/org/apache/sling/feature/scanner/Scanner.java
+++ b/src/main/java/org/apache/sling/feature/scanner/Scanner.java
@@ -24,6 +24,8 @@ import java.util.Map;
 import java.util.ServiceLoader;
 import java.util.TreeMap;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.sling.feature.Artifact;
 import org.apache.sling.feature.ArtifactId;
@@ -133,7 +135,9 @@ public class Scanner {
     }
 
     private BundleDescriptor doScan(final Artifact bundle, final int 
startLevel) throws IOException {
-        final String key = 
bundle.getId().toMvnId().concat(":").concat(String.valueOf(startLevel));
+        final String key = bundle.getId().toMvnId().concat(":")
+            .concat(String.valueOf(startLevel)).concat(":")
+            
.concat(Stream.of(bundle.getFeatureOrigins()).map(ArtifactId::toMvnId).collect(Collectors.joining(",")));
         BundleDescriptor desc = (BundleDescriptor) this.cache.get(key);
         if (desc == null) {
             final URL file = artifactProvider.provide(bundle.getId());