Merge branch 'develop'

stefanseifert · stefanseifert · commit a1abddfd1a46 · 2020-05-19T18:01:37.000+02:00
diff --git a/README.md b/README.md
@@ -6,7 +6,8 @@
 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
+Continuous Integration: https://travis-ci.org/conga-aem-plugin<br/>
+Commercial support: https://wcm.io/commercial-support.html
 
 
 ## Build from sources
diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,12 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="1.11.4" date="2020-05-19">
+      <action type="update" dev="sseifert">
+        conga-aem-maven-plugin: Allow to provide separate credentials for package manager and Felix console.
+      </action>
+    </release>
+
     <release version="1.11.2" date="2020-04-28">
       <action type="update" dev="sseifert">
         conga-aem-maven-plugin: Allow to defined custom package properties for 'cloudmanager-all-package' goal.
@@ -62,7 +68,7 @@
         conga-aem-crypto-cli: Add command line options to encrypt and decrypt values using AEM crypto support.
       </action>
       <action type="fix" dev="sseifert">
-        conga-aem-crypto-cli: Allow to generate AEM crypto keys without specifying and Ansible vault password.
+        conga-aem-crypto-cli: Allow to generate AEM crypto keys without specifying an Ansible vault password.
       </action>
       <action type="fix" dev="sseifert">
         conga-aem-maven-plugin: Retry HTTP action in case of JSON parse failure (system may respond temporarily with non-JSON response).
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.2.2</version>
+    <version>1.2.4</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-  <version>1.11.2</version>
+  <version>1.11.4</version>
   <packaging>jar</packaging>
 
   <name>CONGA AEM Plugin</name>
@@ -107,7 +107,7 @@
     <dependency>
       <groupId>io.wcm.tooling.commons</groupId>
       <artifactId>io.wcm.tooling.commons.crx-packmgr-helper</artifactId>
-      <version>1.6.4</version>
+      <version>1.7.0</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/example/pom.xml b/example/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>io.wcm.maven</groupId>
     <artifactId>io.wcm.maven.global-parent</artifactId>
-    <version>32</version>
+    <version>33</version>
     <relativePath/>
   </parent>
 
@@ -65,7 +65,7 @@
           <dependency>
             <groupId>io.wcm.devops.conga.plugins</groupId>
             <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-            <version>1.11.1-SNAPSHOT</version>
+            <version>1.11.3-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.2.2</version>
+    <version>1.2.4</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>io.wcm.devops.conga.plugins.aem.root</artifactId>
-  <version>1.11.2</version>
+  <version>1.11.4</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
@@ -25,14 +25,14 @@
   <parent>
     <groupId>io.wcm.devops</groupId>
     <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.4</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>conga-aem-crypto-cli</artifactId>
   <packaging>jar</packaging>
-  <version>1.11.2</version>
+  <version>1.11.4</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.11.2</version>
+      <version>1.11.4</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.2.2</version>
+    <version>1.2.4</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>conga-aem-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>1.11.2</version>
+  <version>1.11.4</version>
 
   <name>CONGA AEM Maven Plugin</name>
   <description>wcm.io DevOps CONGA - CONfiguration GenerAtor Maven Plugin for AEM</description>
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>io.wcm.devops.conga.plugins</groupId>
       <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-      <version>1.11.2</version>
+      <version>1.11.4</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -106,7 +106,7 @@
     <dependency>
       <groupId>io.wcm.tooling.commons</groupId>
       <artifactId>io.wcm.tooling.commons.crx-packmgr-helper</artifactId>
-      <version>1.6.4</version>
+      <version>1.7.0</version>
       <scope>compile</scope>
     </dependency>
 
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
@@ -55,17 +55,31 @@ abstract class AbstractContentPackageMojo extends AbstractMojo {
   private String serviceURL;
 
   /**
-   * The user name to authenticate as against the remote CRX system.
+   * The user name to authenticate as against the remote CRX system (package manager).
    */
   @Parameter(property = "vault.userId", required = true, defaultValue = "admin")
   private String userId;
 
   /**
-   * The password to authenticate against the remote CRX system.
+   * The password to authenticate against the remote CRX system (package manager).
    */
   @Parameter(property = "vault.password", required = true, defaultValue = "admin")
   private String password;
 
+  /**
+   * The user name to authenticate as against the remote CRX system (Felix console).
+   * Defaults to the value from <code>userId</code>.
+   */
+  @Parameter(property = "console.userId")
+  private String consoleUserId;
+
+  /**
+   * The password to authenticate against the remote CRX system (Felix console).
+   * Defaults to the value from <code>password</code>.
+   */
+  @Parameter(property = "console.password")
+  private String consolePassword;
+
   /**
    * Set this to "true" to skip installing packages to CRX although configured in the POM.
    */
@@ -164,6 +178,8 @@ protected PackageManagerProperties getPackageManagerProperties() throws MojoExec
     props.setPackageManagerUrl(buildPackageManagerUrl());
     props.setUserId(this.userId);
     props.setPassword(this.password);
+    props.setConsoleUserId(this.consoleUserId);
+    props.setConsolePassword(this.consolePassword);
     props.setRetryCount(this.retryCount);
     props.setRetryDelaySec(this.retryDelay);
     props.setBundleStatusUrl(buildBundleStatusUrl());
