commit 5903541c20967ce7f00083baea4aeccf329c83a6
author Konrad Windszus <konrad.windszus@netcentric.biz> Sat Jun 02 17:58:38 2018 +0200
committer Konrad Windszus <konrad.windszus@netcentric.biz> Sat Jun 02 17:58:38 2018 +0200
tree 24ed8aad06060c13aa01c2804438401f4ce360c0
parent 60d4d95b890723af8dd03b5fa64d4673a3b0246a
parent d8945786ad9917e28e8385b2d520c36a86f1537e

Merge branch 'master' of git@github.com:apache/sling-slingstart-maven-plugin.git

pom.xml

diff --git a/pom.xml b/pom.xml
index a93dafd..3427b07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,6 +124,7 @@
                 <configuration>
                     <excludes>
                         <exclude>src/site/markdown/**</exclude>
+                        <exclude>src/test/resources/**</exclude>
                     </excludes>
                 </configuration>
             </plugin>

src/main/java/org/apache/sling/maven/slingstart/FeatureModelConverter.java

diff --git a/src/main/java/org/apache/sling/maven/slingstart/FeatureModelConverter.java b/src/main/java/org/apache/sling/maven/slingstart/FeatureModelConverter.java
index 0e84fec..84b65f7 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/FeatureModelConverter.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/FeatureModelConverter.java
@@ -64,6 +64,9 @@
         try {
             ArtifactManager am = getArtifactManager(project, session);
             for (File f : files) {
+                if (!f.getName().endsWith(".json")) {
+                    continue;
+                }
                 File genFile = new File(targetDir, f.getName() + ".txt");
                 FeatureToProvisioning.convert(f, genFile, am);
             }

src/main/java/org/apache/sling/maven/slingstart/GenerateResourcesMojo.java

diff --git a/src/main/java/org/apache/sling/maven/slingstart/GenerateResourcesMojo.java b/src/main/java/org/apache/sling/maven/slingstart/GenerateResourcesMojo.java
index 81629c4..36494f2 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/GenerateResourcesMojo.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/GenerateResourcesMojo.java
@@ -79,6 +79,10 @@
             ArtifactManager am = getArtifactManager();
             List<File> files = Arrays.asList(featureFiles);
             for (File f : files) {
+                if (!f.getName().endsWith(".json")) {
+                    continue;
+                }
+
                 File genFile = new File(targetDir, f.getName() + ".txt");
                 FeatureToProvisioning.convert(f, genFile, am);
             }

src/test/resources/features1/simple.json

diff --git a/src/main/resources/features1/simple.json b/src/test/resources/features1/simple.json
similarity index 100%
rename from src/main/resources/features1/simple.json
rename to src/test/resources/features1/simple.json

src/test/resources/features2/src/main/features/boot_gav.json

diff --git a/src/main/resources/features2/src/main/features/boot_gav.json b/src/test/resources/features2/src/main/features/boot_gav.json
similarity index 100%
rename from src/main/resources/features2/src/main/features/boot_gav.json
rename to src/test/resources/features2/src/main/features/boot_gav.json

src/test/resources/features2/src/main/features/unrelated_file.txt

diff --git a/src/test/resources/features2/src/main/features/unrelated_file.txt b/src/test/resources/features2/src/main/features/unrelated_file.txt
new file mode 100644
index 0000000..848ca62
--- /dev/null
+++ b/src/test/resources/features2/src/main/features/unrelated_file.txt
@@ -0,0 +1 @@
+// Some other file
\ No newline at end of file