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

stefanseifert · stefanseifert · commit b509e19f7afd · 2019-08-20T19:07:02.000+02:00
diff --git a/.travis.maven-settings.xml b/.travis.maven-settings.xml
@@ -31,7 +31,7 @@
 
         <repository>
           <id>central</id>
-          <url>http://repo1.maven.org/maven2/</url>
+          <url>https://repo1.maven.org/maven2/</url>
           <layout>default</layout>
           <releases>
             <enabled>true</enabled>
@@ -57,7 +57,7 @@
 
         <repository>
           <id>wcm-io-apache-intermediate-release</id>
-          <url>http://wcm.io/maven/repositories/apache-intermediate-release</url>
+          <url>https://wcm.io/maven/repositories/apache-intermediate-release</url>
           <layout>default</layout>
           <releases>
             <enabled>true</enabled>
@@ -83,7 +83,7 @@
 
         <repository>
           <id>apache-snapshots</id>
-          <url>http://repository.apache.org/snapshots</url>
+          <url>https://repository.apache.org/snapshots</url>
           <layout>default</layout>
           <releases>
             <enabled>false</enabled>
@@ -100,7 +100,7 @@
 
         <pluginRepository>
           <id>central</id>
-          <url>http://repo1.maven.org/maven2/</url>
+          <url>https://repo1.maven.org/maven2/</url>
           <layout>default</layout>
           <releases>
             <enabled>true</enabled>
@@ -126,7 +126,7 @@
 
         <pluginRepository>
           <id>wcm-io-apache-intermediate-release</id>
-          <url>http://wcm.io/maven/repositories/apache-intermediate-release</url>
+          <url>https://wcm.io/maven/repositories/apache-intermediate-release</url>
           <layout>default</layout>
           <releases>
             <enabled>true</enabled>
@@ -152,7 +152,7 @@
 
         <pluginRepository>
           <id>apache-snapshots</id>
-          <url>http://repository.apache.org/snapshots</url>
+          <url>https://repository.apache.org/snapshots</url>
           <layout>default</layout>
           <releases>
             <enabled>false</enabled>
diff --git a/.travis.yml b/.travis.yml
@@ -20,7 +20,7 @@
 language: java
 
 jdk:
-- oraclejdk8
+- openjdk8
 - openjdk11
 
 # Make sure travis can use container-based infrastructure
diff --git a/README.md b/README.md
@@ -1,17 +1,17 @@
-<img src="http://wcm.io/images/favicon-16@2x.png"/> CONGA Plugin for AEM
+<img src="https://wcm.io/images/favicon-16@2x.png"/> CONGA Plugin for AEM
 ======
 [![Build Status](https://travis-ci.org/wcm-io-devops/conga-aem-plugin.png?branch=develop)](https://travis-ci.org/wcm-io-devops/conga-aem-plugin)
 [![Code Coverage](https://codecov.io/gh/wcm-io-devops/conga-aem-plugin/branch/develop/graph/badge.svg)](https://codecov.io/gh/wcm-io-devops/conga-aem-plugin)
 
-Documentation: http://devops.wcm.io/conga/plugins/aem/<br/>
+Documentation: https://devops.wcm.io/conga/plugins/aem/<br/>
 Issues: https://wcm-io.atlassian.net/projects/WDCONGA<br/>
 Wiki: https://wcm-io.atlassian.net/wiki/<br/>
 Continuous Integration: https://travis-ci.org/conga-aem-plugin
 
 
 ## Build from sources
 
-If you want to build from sources make sure you have configured all [Maven Repositories](http://devops.wcm.io/maven.html) in your settings.xml.
+If you want to build from sources make sure you have configured all [Maven Repositories](https://devops.wcm.io/maven.html) in your settings.xml.
 
 See [Travis Maven settings.xml](https://github.com/conga-aem-plugin/blob/master/.travis.maven-settings.xml) for an example with a full configuration.
 
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="2019-08-20">
+      <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/conga-aem-plugin/pom.xml b/conga-aem-plugin/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm.devops</groupId>
     <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-    <version>1.1.4</version>
+    <version>1.1.6</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-  <version>1.8.14</version>
+  <version>1.9.0</version>
   <packaging>jar</packaging>
 
   <name>CONGA AEM Plugin</name>
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>io.wcm.tooling.commons</groupId>
       <artifactId>io.wcm.tooling.commons.crx-packmgr-helper</artifactId>
-      <version>1.5.10</version>
+      <version>1.6.0</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/example/pom.xml b/example/pom.xml
@@ -65,7 +65,7 @@
           <dependency>
             <groupId>io.wcm.devops.conga.plugins</groupId>
             <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-            <version>1.8.11-SNAPSHOT</version>
+            <version>1.8.15-SNAPSHOT</version>
           </dependency>
 
         </dependencies>
diff --git a/pom.xml b/pom.xml
@@ -23,13 +23,13 @@
   <parent>
     <groupId>io.wcm.devops</groupId>
     <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-    <version>1.1.4</version>
+    <version>1.1.6</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>io.wcm.devops.conga.plugins.aem.root</artifactId>
-  <version>1.8.14</version>
+  <version>1.9.0</version>
   <packaging>pom</packaging>
 
   <name>CONGA AEM Plugin</name>
diff --git a/src/site/markdown/crypto-cli.md.vm b/src/site/markdown/crypto-cli.md.vm
@@ -12,7 +12,7 @@ _**Please note:** You need to install the [Java Cryptography Extension (JCE) Unl
 Download it from Maven Central:
 
 |---|---|---|
-| [CONGA AEM Crypto CLI tool](http://repo1.maven.org/maven2/io/wcm/devops/conga/plugins/conga-aem-crypto-cli/${project.properties['releasedVersion.version']}/conga-aem-crypto-cli-${project.properties['releasedVersion.version']}-dist.zip) | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.wcm.devops.conga.plugins/conga-aem-crypto-cli/badge.svg)](http://repo1.maven.org/maven2/io/wcm/devops/conga/plugins/conga-aem-crypto-cli/${project.properties['releasedVersion.version']}/conga-aem-crypto-cli-${project.properties['releasedVersion.version']}-dist.zip) |
+| [CONGA AEM Crypto CLI tool](https://repo1.maven.org/maven2/io/wcm/devops/conga/plugins/conga-aem-crypto-cli/${project.properties['releasedVersion.version']}/conga-aem-crypto-cli-${project.properties['releasedVersion.version']}-dist.zip) | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.wcm.devops.conga.plugins/conga-aem-crypto-cli/badge.svg)](https://repo1.maven.org/maven2/io/wcm/devops/conga/plugins/conga-aem-crypto-cli/${project.properties['releasedVersion.version']}/conga-aem-crypto-cli-${project.properties['releasedVersion.version']}-dist.zip) |
 
 
 ### Generate AEM crypto keys
diff --git a/src/site/markdown/extensions.md b/src/site/markdown/extensions.md
@@ -76,5 +76,5 @@ With the post-processor plugin `aem-contentpackage-properties` is applied automa
 The model YAML file can be exported during CONGA generation and provides the necessary runtime information for deployment tools like Ansible.
 
 
-[conga-extensibility]: http://devops.wcm.io/conga/extensibility.html
+[conga-extensibility]: https://devops.wcm.io/conga/extensibility.html
 [sling-provisioning]: https://sling.apache.org/documentation/development/slingstart.html
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
@@ -31,7 +31,7 @@ Additionally the CONGA AEM Maven plugin is provided which allows to deploy a bun
 
 ### Further Resources
 
-* [wcm.io CONGA training material with exercises](http://training.wcm.io/conga/)
+* [wcm.io CONGA training material with exercises](https://training.wcm.io/conga/)
 * [adaptTo() 2015 Talk: CONGA - Configuration generation for Sling and AEM](https://adapt.to/2015/en/schedule/conga---configuration-generation-for-sling-and-aem.html)
 * [adaptTo() 2017 Talk: Automate AEM Deployment with Ansible and wcm.io CONGA](https://adapt.to/2017/en/schedule/automate-aem-deployment-with-ansible-and-wcm-io-conga.html)
 
@@ -43,7 +43,7 @@ Additionally the CONGA AEM Maven plugin is provided which allows to deploy a bun
 [plugindocs]: conga-aem-maven-plugin/plugin-info.html
 [changelog]: changes-report.html
 [aem]: http://www.adobe.com/solutions/web-experience-management.html
-[conga]: http://devops.wcm.io/conga/
-[conga-sling]: http://devops.wcm.io/conga/plugins/sling/
+[conga]: https://devops.wcm.io/conga/
+[conga-sling]: https://devops.wcm.io/conga/plugins/sling/
 [handlebars-helpers]: handlebars-helpers.html
 [crypto-cli]: crypto-cli.html
diff --git a/src/site/markdown/usage.md b/src/site/markdown/usage.md
@@ -41,5 +41,5 @@ This looks for a file `target/configuration/env1/node1/model.yaml`, identifies a
 The plugin uses the same resilience logic for package uploading as the [wcm.io Content Package Maven Plugin][wcmio-content-package-maven-plugin].
 
 
-[conga-usage]: http://devops.wcm.io/conga/usage.html
-[wcmio-content-package-maven-plugin]: http://wcm.io/tooling/maven/plugins/wcmio-content-package-maven-plugin/
+[conga-usage]: https://devops.wcm.io/conga/usage.html
+[wcmio-content-package-maven-plugin]: https://wcm.io/tooling/maven/plugins/wcmio-content-package-maven-plugin/
diff --git a/src/site/site.xml b/src/site/site.xml
@@ -20,12 +20,12 @@
   -->
 
 <project name="CONGA AEM Plugin"
-  xmlns="http://maven.apache.org/DECORATION/1.3.0"
+  xmlns="http://maven.apache.org/DECORATION/1.8.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
 
   <bannerRight>
-    <name><![CDATA[<img src="http://devops.wcm.io/conga/images/conga.png" style="height:120px"/>]]></name>
+    <name><![CDATA[<img src="https://devops.wcm.io/conga/images/conga.png" style="height:120px"/>]]></name>
   </bannerRight>
 
 </project>
diff --git a/tooling/conga-aem-crypto-cli/pom.xml b/tooling/conga-aem-crypto-cli/pom.xml
@@ -25,14 +25,14 @@
   <parent>
     <groupId>io.wcm.devops</groupId>
     <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-    <version>1.1.4</version>
+    <version>1.1.6</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>conga-aem-crypto-cli</artifactId>
   <packaging>jar</packaging>
-  <version>1.8.14</version>
+  <version>1.9.0</version>
 
   <name>CONGA AEM Crypto Command Line Interface</name>
   <description>Command line tool to generate Crypto keys for AEM.</description>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>io.wcm.devops.conga.plugins</groupId>
       <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-      <version>1.8.14</version>
+      <version>1.9.0</version>
       <scope>compile</scope>
       <exclusions>
         <!-- Exclude all deps - only crypto util classes are used -->
diff --git a/tooling/conga-aem-maven-plugin/pom.xml b/tooling/conga-aem-maven-plugin/pom.xml
@@ -25,14 +25,14 @@
   <parent>
     <groupId>io.wcm.devops</groupId>
     <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-    <version>1.1.4</version>
+    <version>1.1.6</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>conga-aem-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>1.8.14</version>
+  <version>1.9.0</version>
 
   <name>CONGA AEM Maven Plugin</name>
   <description>wcm.io DevOps CONGA - CONfiguration GenerAtor Maven Plugin for AEM</description>
@@ -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.6.0</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);
