[jgitflow-maven-plugin] merging 'release/cq-maven-plugin-1.1.2' into 'master'

stefanseifert · stefanseifert · commit ab4a389c2091 · 2019-11-20T17:17:44.000+01:00
diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,12 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="1.1.2" date="2019-11-20">
+      <action type="update" dev="sseifert">
+        Detect bundle projects using bnd-maven-plugin.
+      </action>
+    </release>
+
     <release version="1.1.0" date="2019-08-20">
       <action type="add" dev="sseifert">
         Support installing content packages projects via cq:install.
diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
 
   <groupId>io.wcm.maven.plugins</groupId>
   <artifactId>cq-maven-plugin</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2</version>
   <packaging>maven-plugin</packaging>
 
   <name>CQ Maven Plugin</name>
diff --git a/src/main/java/io/wcm/maven/plugins/cq/InstallMojo.java b/src/main/java/io/wcm/maven/plugins/cq/InstallMojo.java
@@ -104,13 +104,12 @@ public class InstallMojo extends AbstractMojo {
 
   @Override
   public void execute() throws MojoExecutionException, MojoFailureException {
-    String packaging = project.getPackaging();
 
     // detect goal to deploy current project based on packaging
-    if (StringUtils.equals(packaging, "bundle")) {
+    if (isBundleProject()) {
       executeSlingPluginDirectly();
     }
-    else if (StringUtils.equals(packaging, "content-package")) {
+    else if (isContentPackageProject()) {
       getLog().info("Install content package to instance...");
       executeWithMavenInvoker("wcmio-content-package:install");
     }
@@ -120,6 +119,29 @@ else if (StringUtils.equals(packaging, "content-package")) {
     }
   }
 
+  private boolean isBundleProject() {
+    // check for "bundle" packaging as used by maven-bundle-plugin
+    String packaging = project.getPackaging();
+    if (StringUtils.equals(packaging, "bundle")) {
+      return true;
+    }
+
+    // check for active bnd-maven-plugin in current project
+    return project.getBuildPlugins().stream()
+        .filter(this::isBndMavenPlugin)
+        .findFirst().isPresent();
+  }
+
+  private boolean isBndMavenPlugin(Plugin plugin) {
+    return StringUtils.equals(plugin.getGroupId(), "biz.aQute.bnd")
+        && StringUtils.equals(plugin.getArtifactId(), "bnd-maven-plugin");
+  }
+
+  private boolean isContentPackageProject() {
+    String packaging = project.getPackaging();
+    return StringUtils.equals(packaging, "content-package");
+  }
+
   /**
    * Executes the sling-maven-plugin directly from the current project.
    * @throws MojoExecutionException
