conga-aem-maven-plugin: Add "Bundle Status Whitelist Bundle Names" property to define list of bundles ignored by bundle status check.

stefanseifert · stefanseifert · commit a46c0a3bf9a0 · 2019-08-20T12:11:39.000+02: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.9.0" date="not released">
+      <action type="add" dev="sseifert" issue="WTOOL-52">
+        conga-aem-maven-plugin: Add "Bundle Status Whitelist Bundle Names" property to define list of bundles ignored by bundle status check.
+      </action>
+    </release>
+
     <release version="1.8.14" date="2019-05-08">
       <action type="update" dev="sseifert">
         aem-contentpackage-properties plugin: Also support "jar" file extension for AEM content packages (but only when explicitly defined as post processor).
diff --git a/tooling/conga-aem-maven-plugin/pom.xml b/tooling/conga-aem-maven-plugin/pom.xml
@@ -91,15 +91,10 @@
       <version>3.2</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.yaml</groupId>
-      <artifactId>snakeyaml</artifactId>
-      <version>1.17</version>
-    </dependency>
     <dependency>
       <groupId>io.wcm.tooling.commons</groupId>
       <artifactId>io.wcm.tooling.commons.crx-packmgr-helper</artifactId>
-      <version>1.5.10</version>
+      <version>1.5.11-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/AbstractContentPackageMojo.java b/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/AbstractContentPackageMojo.java
@@ -119,6 +119,16 @@ abstract class AbstractContentPackageMojo extends AbstractMojo {
   @Parameter(property = "vault.bundleStatusBlacklistBundleNames", defaultValue = "^updater\\.aem.*$")
   private String[] bundleStatusBlacklistBundleNames;
 
+  /**
+   * Patterns for symbolic names of bundles that are ignored in bundle list.
+   * The state of these bundles has no effect on the bundle status check.
+   */
+  @Parameter(property = "vault.bundleStatusWhitelistBundleNames",
+      defaultValue = "^com\\.day\\.crx\\.crxde-support$,"
+          + "^com\\.adobe\\.granite\\.crx-explorer$,"
+          + "^com\\.adobe\\.granite\\.crxde-lite$")
+  private String[] bundleStatusWhitelistBundleNames;
+
   /**
    * If set to true also self-signed certificates are accepted.
    */
@@ -158,6 +168,7 @@ protected PackageManagerProperties getPackageManagerProperties() throws MojoExec
     props.setBundleStatusUrl(buildBundleStatusUrl());
     props.setBundleStatusWaitLimitSec(this.bundleStatusWaitLimit);
     props.setBundleStatusBlacklistBundleNames(ImmutableList.copyOf(this.bundleStatusBlacklistBundleNames));
+    props.setBundleStatusWhitelistBundleNames(ImmutableList.copyOf(this.bundleStatusWhitelistBundleNames));
     props.setRelaxedSSLCheck(this.relaxedSSLCheck);
     props.setHttpConnectTimeoutSec(this.httpConnectTimeoutSec);
     props.setHttpSocketTimeoutSec(this.httpSocketTimeout);
