[sling-whiteboard] branch master updated: [cp2fm] always specify classifier in order to avoid any possible clash

[simonetripodi]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 63b67ca  [cp2fm] always specify classifier in order to avoid any 
possible clash
63b67ca is described below

commit 63b67ca745f466ec1228db05ccf80b22b70ae237
Author: Simo Tripodi <strip...@adobe.com>
AuthorDate: Thu Feb 28 11:55:05 2019 +0100

    [cp2fm] always specify classifier in order to avoid any possible clash
---
 .../org/apache/sling/cp2fm/ContentPackage2FeatureModelConverter.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/ContentPackage2FeatureModelConverter.java
 
b/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/ContentPackage2FeatureModelConverter.java
index c71abdd..b5808ce 100644
--- 
a/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/ContentPackage2FeatureModelConverter.java
+++ 
b/content-package-2-feature-model/src/main/java/org/apache/sling/cp2fm/ContentPackage2FeatureModelConverter.java
@@ -30,6 +30,8 @@ import org.apache.sling.feature.io.json.FeatureJSONWriter;
 
 public final class ContentPackage2FeatureModelConverter {
 
+    private static final String FEATURE_CLASSIFIER = "feature";
+
     private static final String JSON_FILE_EXTENSION = ".json";
 
     private final PackageManager packageManager = new PackageManagerImpl();
@@ -73,7 +75,7 @@ public final class ContentPackage2FeatureModelConverter {
             targetFeature = new Feature(new ArtifactId(packageId.getGroup(), 
                                                        packageId.getName(),
                                                        
packageId.getVersionString(),
-                                                       null,
+                                                       FEATURE_CLASSIFIER,
                                                        null));
 
             File targetFile = new File(outputDirectory, packageId.getName() + 
JSON_FILE_EXTENSION);