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

stefanseifert · stefanseifert · commit 55bed7186444 · 2019-10-01T20:59:56.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.2" date="2019-10-01">
+      <action type="add" dev="sseifert" issue="WTOOL-54">
+        conga-aem-maven-plugin: Add two more bundles to "Bundle Status Whitelist Bundle Names" property.
+      </action>
+    </release>
+
     <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.
diff --git a/conga-aem-plugin/pom.xml b/conga-aem-plugin/pom.xml
@@ -31,7 +31,7 @@
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-  <version>1.9.0</version>
+  <version>1.9.2</version>
   <packaging>jar</packaging>
 
   <name>CONGA AEM Plugin</name>
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.15-SNAPSHOT</version>
+            <version>1.9.1-SNAPSHOT</version>
           </dependency>
 
         </dependencies>
diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>io.wcm.devops.conga.plugins.aem.root</artifactId>
-  <version>1.9.0</version>
+  <version>1.9.2</version>
   <packaging>pom</packaging>
 
   <name>CONGA AEM Plugin</name>
diff --git a/tooling/conga-aem-crypto-cli/pom.xml b/tooling/conga-aem-crypto-cli/pom.xml
@@ -32,7 +32,7 @@
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>conga-aem-crypto-cli</artifactId>
   <packaging>jar</packaging>
-  <version>1.9.0</version>
+  <version>1.9.2</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.9.0</version>
+      <version>1.9.2</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
@@ -32,7 +32,7 @@
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>conga-aem-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>1.9.0</version>
+  <version>1.9.2</version>
 
   <name>CONGA AEM Maven Plugin</name>
   <description>wcm.io DevOps CONGA - CONfiguration GenerAtor Maven Plugin for AEM</description>
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
@@ -126,7 +126,9 @@ abstract class AbstractContentPackageMojo extends AbstractMojo {
   @Parameter(property = "vault.bundleStatusWhitelistBundleNames",
       defaultValue = "^com\\.day\\.crx\\.crxde-support$,"
           + "^com\\.adobe\\.granite\\.crx-explorer$,"
-          + "^com\\.adobe\\.granite\\.crxde-lite$")
+          + "^com\\.adobe\\.granite\\.crxde-lite$,"
+          + "^org\\.apache\\.sling\\.jcr\\.webdav$,"
+          + "^org\\.apache\\.sling\\.jcr\\.davex$")
   private String[] bundleStatusWhitelistBundleNames;
 
   /**
