[sling-ide-tooling] branch master updated: improve warning in case "manifest" is not explicitly configured

[kwin]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 0ba56dd  improve warning in case "manifest" is not explicitly 
configured
     new b99e336  Merge branch 'master' of 
g...@github.com:apache/sling-ide-tooling.git
0ba56dd is described below

commit 0ba56dda8aa54ee78c26ca96527c8044b82f6e43
Author: Konrad Windszus <k...@apache.org>
AuthorDate: Thu Mar 15 17:05:54 2018 +0100

    improve warning in case "manifest" is not explicitly configured
---
 .../eclipse/m2e/internal/MavenBundlePluginProjectConfigurator.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git 
a/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/MavenBundlePluginProjectConfigurator.java
 
b/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/MavenBundlePluginProjectConfigurator.java
index 1a0f1b3..317c50c 100644
--- 
a/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/MavenBundlePluginProjectConfigurator.java
+++ 
b/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/MavenBundlePluginProjectConfigurator.java
@@ -66,10 +66,12 @@ public class MavenBundlePluginProjectConfigurator extends 
AbstractBundleProjectC
             if (comparableVersion.compareTo(new ComparableVersion("3.2.0")) >= 
0) {
                 // but only if explicitly configured, see 
http://felix.apache.org/documentation/faqs/apache-felix-bundle-plugin-faq.html#use-scr-metadata-generated-by-bnd-in-unit-tests
                 // therefore check configuration
+                boolean foundManifestGoal = false;
                 for (PluginExecution pluginExecution : 
bundlePlugin.getExecutions()) {
                     if (!pluginExecution.getGoals().contains("manifest")) {
                         continue;
                     }
+                    foundManifestGoal = true;
                     Xpp3Dom configuration = 
(Xpp3Dom)pluginExecution.getConfiguration();
                     Xpp3Dom supportIncrementalBuildConfiguration = 
configuration.getChild("supportIncrementalBuild");
                     // https://issues.apache.org/jira/browse/FELIX-3324
@@ -83,6 +85,9 @@ public class MavenBundlePluginProjectConfigurator extends 
AbstractBundleProjectC
                         return true;
                     }
                 }
+                if (!foundManifestGoal) {
+                    logger.warn("Although using maven-bundle-plugin in a 
version >= 3.2.0, the explicit goal 'manifest' is not configured.");
+                }
             } else {
                 logger.warn("maven-bundle-plugin in a version < 3.2.0 does not 
natively support incremental builds.");
             }

-- 
To stop receiving notification emails like this one, please contact
k...@apache.org.