You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by an...@apache.org on 2020/02/28 22:55:27 UTC
[sling-slingfeature-maven-plugin] 01/01: Created an example branch
to showcase the issue with Include-Artifact and Aggregate to import an
external FM snippet
This is an automated email from the ASF dual-hosted git repository.
andysch pushed a commit to branch feature/include-artifact-issues
in repository https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git
commit 0b812c5ff6de62adfed5b81804239fb7bdc81923
Author: Andreas Schaefer <sc...@iMac.local>
AuthorDate: Fri Feb 28 14:55:05 2020 -0800
Created an example branch to showcase the issue with Include-Artifact and Aggregate to import an external FM snippet
---
.../pom.xml | 15 +++++++++++++++
.../src/main/fm/feature-test-repoinit.json | 1 +
.../verify.bsh | 6 ++++--
.../sling/feature/maven/mojos/IncludeArtifactMojo.java | 2 +-
4 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/it/include-artifact-including-source-features-folder/pom.xml b/src/it/include-artifact-including-source-features-folder/pom.xml
index 9f70b74..87b7373 100644
--- a/src/it/include-artifact-including-source-features-folder/pom.xml
+++ b/src/it/include-artifact-including-source-features-folder/pom.xml
@@ -80,6 +80,21 @@
</configuration>
</execution>
<execution>
+ <id>aggregate</id>
+ <phase>package</phase>
+ <goals>
+ <goal>aggregate-features</goal>
+ </goals>
+ <configuration>
+ <aggregates>
+ <aggregate>
+ <!-- Cannot have a classifier here -->
+ <filesInclude>feature-test-repoinit.json</filesInclude>
+ </aggregate>
+ </aggregates>
+ </configuration>
+ </execution>
+ <execution>
<id>attach</id>
<phase>package</phase>
<goals>
diff --git a/src/it/include-artifact-including-source-features-folder/src/main/fm/feature-test-repoinit.json b/src/it/include-artifact-including-source-features-folder/src/main/fm/feature-test-repoinit.json
index 67137dc..16310b3 100644
--- a/src/it/include-artifact-including-source-features-folder/src/main/fm/feature-test-repoinit.json
+++ b/src/it/include-artifact-including-source-features-folder/src/main/fm/feature-test-repoinit.json
@@ -1,4 +1,5 @@
{
+ "id":"org.apache.sling:slingfeature-maven-plugin-test-include-artifact-including-source-features-folder:slingosgifeature:test-repoinit:1.0.0-SNAPSHOT",
"repoinit:TEXT|true":[
"create path (rep:AuthorizableFolder) /home/users/system"
]
diff --git a/src/it/include-artifact-including-source-features-folder/verify.bsh b/src/it/include-artifact-including-source-features-folder/verify.bsh
index 14d8c1b..2bfbdc2 100644
--- a/src/it/include-artifact-including-source-features-folder/verify.bsh
+++ b/src/it/include-artifact-including-source-features-folder/verify.bsh
@@ -36,7 +36,8 @@ import org.codehaus.plexus.util.*;
String classifier = "test";
String extension = "slingosgifeature";
File fmDescriptorFile = new File(
- localMavenRepositoryInstallationFolder, artifact + "-" + version + "-" + classifier + "." + extension
+// localMavenRepositoryInstallationFolder, artifact + "-" + version + "-" + classifier + "." + extension
+ localMavenRepositoryInstallationFolder, artifact + "-" + version + "." + extension
);
if(!fmDescriptorFile.exists()) {
System.out.println("FM Descriptor file does not exist: " + fmDescriptorFile);
@@ -50,7 +51,8 @@ import org.codehaus.plexus.util.*;
String dependentArtifact = "janino";
String dependentVersion = "2.7.5";
String[] values = {
- "\"id\":\"" + group + ":" + artifact + ":slingosgifeature:" + classifier + ":" + version + "\"",
+// "\"id\":\"" + group + ":" + artifact + ":slingosgifeature:" + classifier + ":" + version + "\"",
+ "\"id\":\"" + group + ":" + artifact + ":slingosgifeature:" + version + "\"",
"\"bundles\":[",
group + ":" + artifact + ":" + version + "\"",
"\"repoinit:TEXT|true\":[",
diff --git a/src/main/java/org/apache/sling/feature/maven/mojos/IncludeArtifactMojo.java b/src/main/java/org/apache/sling/feature/maven/mojos/IncludeArtifactMojo.java
index 438ff21..e597c8d 100644
--- a/src/main/java/org/apache/sling/feature/maven/mojos/IncludeArtifactMojo.java
+++ b/src/main/java/org/apache/sling/feature/maven/mojos/IncludeArtifactMojo.java
@@ -160,7 +160,7 @@ public class IncludeArtifactMojo extends AbstractIncludingFeatureMojo {
}
final Map<String, Feature> selection = this.getSelectedFeatures(featureSelectionConfig);
- includeFeatures(selection, found);
+// includeFeatures(selection, found);
// Write the Feature into its file and install it
if (file != null) {