conga-aem-maven-plugin: Allow to provide separate credentials for package manager and Felix console.

stefanseifert · stefanseifert · commit d95f56d06df9 · 2020-05-05T22:43:34.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 https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="1.11.4" date="not released">
+      <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.
diff --git a/conga-aem-plugin/pom.xml b/conga-aem-plugin/pom.xml
@@ -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.6.5-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/tooling/conga-aem-maven-plugin/pom.xml b/tooling/conga-aem-maven-plugin/pom.xml
@@ -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.6.5-SNAPSHOT</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", required = true)
+  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", required = true)
+  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());
