Merge branch 'develop' into master

stefanseifert · stefanseifert · commit 0980890d59a9 · 2021-12-13T14:59:05.000+01:00
diff --git a/changes.xml b/changes.xml
@@ -23,7 +23,25 @@
     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.15.0" date="2021-09-20">
+    <release version="2.16.0" date="2021-12-13">
+      <action type="add" dev="sseifert">
+        conga-aem-maven-plugin: Add support for IMS/Auth 2 authentication for AEMaaCS (via oauth2AccessToken).
+      </action>
+      <action type="add" dev="sseifert" issue="WTOOL-71">
+        conga-aem-maven-plugin: New configuration parameter packageManagerOutputLogLevel to allow to change log level for package manager output (which may get huge for big packages) from INFO to DEBUG.
+      </action>
+      <action type="add" dev="sseifert">
+        conga-aem-maven-plugin: Flag replicate allows to replicate a package to publish instance after uploading it to author instance.
+      </action>
+      <action type="add" dev="sseifert">
+        conga-aem-maven-plugin: Add jcl-over-slf4j bridge to be able to capture HTTP client debug messages with Maven debug logging.
+      </action>
+      <action type="update" dev="sseifert">
+        Content Package Validator: Update to filevault-package-maven-plugin 1.2.2.
+      </action>
+    </release>
+
+    <release version="2.15.0" date="2021-09-20">
       <action type="add" dev="sseifert">
         Content Package Validator: Load default node types for validation from biz.netcentric.aem:aem-nodetypes and io.wcm.tooling.nodetypes:io.wcm.tooling.nodetypes.wcmio.
       </action>
@@ -33,6 +51,9 @@
       <action type="update" dev="sseifert">
         conga-aem-maven-plugin:cloudmanager-all-package: Ensure dependencies of sub packages are managed as well.
       </action>
+      <action type="update" dev="sseifert"><![CDATA[
+        <i>PLEASE NOTE:</i> The release number was accidentially updated to 2.x - but the release is 100% backward compatible to the 1.x releases.
+      ]]></action>
     </release>
 
     <release version="1.14.6" date="2021-06-27">
diff --git a/conga-aem-plugin/pom.xml b/conga-aem-plugin/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm.devops.conga.plugins</groupId>
     <artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
-    <version>2.15.0</version>
+    <version>2.16.0</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-  <version>2.15.0</version>
+  <version>2.16.0</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.14.7-SNAPSHOT</version>
+            <version>2.15.1-SNAPSHOT</version>
           </dependency>
 
         </dependencies>
diff --git a/parent/pom.xml b/parent/pom.xml
@@ -31,7 +31,7 @@
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
-  <version>2.15.0</version>
+  <version>2.16.0</version>
   <packaging>pom</packaging>
 
   <name>CONGA AEM Plugin</name>
@@ -75,7 +75,7 @@
       <dependency>
         <groupId>io.wcm.tooling.commons</groupId>
         <artifactId>io.wcm.tooling.commons.crx-packmgr-helper</artifactId>
-        <version>1.7.4</version>
+        <version>2.0.0</version>
       </dependency>
 
       <dependency>
@@ -87,7 +87,7 @@
       <dependency>
         <groupId>org.apache.jackrabbit</groupId>
         <artifactId>filevault-package-maven-plugin</artifactId>
-        <version>1.1.8</version>
+        <version>1.2.2</version>
       </dependency>
   
       <dependency>
diff --git a/pom.xml b/pom.xml
@@ -23,13 +23,13 @@
   <parent>
     <groupId>io.wcm.devops.conga.plugins</groupId>
     <artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
-    <version>2.15.0</version>
+    <version>2.16.0</version>
     <relativePath>parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>io.wcm.devops.conga.plugins.aem.root</artifactId>
-  <version>2.15.0</version>
+  <version>2.16.0</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.conga.plugins</groupId>
     <artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
-    <version>2.15.0</version>
+    <version>2.16.0</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>conga-aem-crypto-cli</artifactId>
   <packaging>jar</packaging>
-  <version>2.15.0</version>
+  <version>2.16.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>2.15.0</version>
+      <version>2.16.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.conga.plugins</groupId>
     <artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
-    <version>2.15.0</version>
+    <version>2.16.0</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>conga-aem-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>2.15.0</version>
+  <version>2.16.0</version>
 
   <name>CONGA AEM Maven Plugin</name>
   <description>wcm.io DevOps CONGA - CONfiguration GenerAtor Maven Plugin for AEM</description>
@@ -56,7 +56,7 @@
     <dependency>
       <groupId>io.wcm.devops.conga.plugins</groupId>
       <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-      <version>2.15.0</version>
+      <version>2.16.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -106,6 +106,13 @@
       <artifactId>io.wcm.tooling.commons.crx-packmgr-helper</artifactId>
       <scope>compile</scope>
     </dependency>
+    <!-- Add logging bridge to capture debug logging from Apache HTTP client 4 -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.32</version>
+      <scope>compile</scope>
+    </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>
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
@@ -32,7 +32,6 @@
 
 import com.google.common.collect.ImmutableList;
 
-import io.wcm.tooling.commons.packmgr.Logger;
 import io.wcm.tooling.commons.packmgr.PackageManagerProperties;
 import io.wcm.tooling.commons.packmgr.install.VendorInstallerFactory;
 
@@ -57,15 +56,22 @@ abstract class AbstractContentPackageMojo extends AbstractMojo {
   /**
    * The user name to authenticate as against the remote CRX system (package manager).
    */
-  @Parameter(property = "vault.userId", required = true, defaultValue = "admin")
+  @Parameter(property = "vault.userId", defaultValue = "admin")
   private String userId;
 
   /**
    * The password to authenticate against the remote CRX system (package manager).
    */
-  @Parameter(property = "vault.password", required = true, defaultValue = "admin")
+  @Parameter(property = "vault.password", defaultValue = "admin")
   private String password;
 
+  /**
+   * OAuth 2 access token to authenticate against the remote CRX system (package manager).
+   * If this is configured, username and password are ignored.
+   */
+  @Parameter(property = "vault.oauth2AccessToken")
+  private String oauth2AccessToken;
+
   /**
    * The user name to authenticate as against the remote CRX system (Felix console).
    * Defaults to the value from <code>userId</code>.
@@ -78,7 +84,15 @@ abstract class AbstractContentPackageMojo extends AbstractMojo {
    * Defaults to the value from <code>password</code>.
    */
   @Parameter(property = "console.password")
+
   private String consolePassword;
+  /**
+   * OAuth 2 access token to authenticate against the remote CRX system (Felix console).
+   * If this is configured, username and password are ignored.
+   * Defaults to value from <code>authenticationBearerToken</code>.
+   */
+  @Parameter(property = "console.consoleOauth2AccessToken")
+  private String consoleOauth2AccessToken;
 
   /**
    * Set this to "true" to skip installing packages to CRX although configured in the POM.
@@ -162,6 +176,13 @@ abstract class AbstractContentPackageMojo extends AbstractMojo {
   @Parameter(property = "vault.httpSocketTimeoutSec", defaultValue = "60")
   private int httpSocketTimeout;
 
+  /**
+   * Log level to be used to log responses from package manager (which may get huge for large packages).
+   * Possible values are INFO (default) or DEBUG.
+   */
+  @Parameter(property = "vault.packageManagerOutputLogLevel", defaultValue = "INFO")
+  private String packageManagerOutputLogLevel;
+
   @Parameter(property = "session", defaultValue = "${session}", readonly = true)
   private MavenSession session;
 
@@ -178,8 +199,10 @@ protected PackageManagerProperties getPackageManagerProperties() throws MojoExec
     props.setPackageManagerUrl(buildPackageManagerUrl());
     props.setUserId(this.userId);
     props.setPassword(this.password);
+    props.setOAuth2AccessToken(this.oauth2AccessToken);
     props.setConsoleUserId(this.consoleUserId);
     props.setConsolePassword(this.consolePassword);
+    props.setConsoleOAuth2AccessToken(this.consoleOauth2AccessToken);
     props.setRetryCount(this.retryCount);
     props.setRetryDelaySec(this.retryDelay);
     props.setBundleStatusUrl(buildBundleStatusUrl());
@@ -190,6 +213,7 @@ protected PackageManagerProperties getPackageManagerProperties() throws MojoExec
     props.setHttpConnectTimeoutSec(this.httpConnectTimeoutSec);
     props.setHttpSocketTimeoutSec(this.httpSocketTimeout);
     props.setProxies(ProxySupport.getMavenProxies(session, decrypter));
+    props.setPackageManagerOutputLogLevel(this.packageManagerOutputLogLevel);
 
     return props;
   }
@@ -198,10 +222,10 @@ private String buildPackageManagerUrl() throws MojoExecutionException {
     String serviceUrl = this.serviceURL;
     switch (VendorInstallerFactory.identify(serviceUrl)) {
       case CRX:
-        serviceUrl = VendorInstallerFactory.getBaseUrl(serviceUrl, getLoggerWrapper()) + CRX_URL;
+        serviceUrl = VendorInstallerFactory.getBaseUrl(serviceUrl) + CRX_URL;
         break;
       case COMPOSUM:
-        serviceUrl = VendorInstallerFactory.getBaseUrl(serviceUrl, getLoggerWrapper()) + COMPOSUM_URL;
+        serviceUrl = VendorInstallerFactory.getBaseUrl(serviceUrl) + COMPOSUM_URL;
         break;
       default:
         throw new MojoExecutionException("Unsupporte service URL: " + serviceUrl);
@@ -217,61 +241,8 @@ private String buildBundleStatusUrl() throws MojoExecutionException {
       return this.bundleStatusURL;
     }
     // if not set use hostname from serviceURL and add default path to bundle status
-    String baseUrl = VendorInstallerFactory.getBaseUrl(buildPackageManagerUrl(), getLoggerWrapper());
+    String baseUrl = VendorInstallerFactory.getBaseUrl(buildPackageManagerUrl());
     return baseUrl + "/system/console/bundles/.json";
   }
 
-  protected Logger getLoggerWrapper() {
-    return new Logger() {
-      @Override
-      public void warn(CharSequence message, Throwable t) {
-        getLog().warn(message, t);
-      }
-      @Override
-      public void warn(CharSequence message) {
-        getLog().warn(message);
-      }
-      @Override
-      public boolean isWarnEnabled() {
-        return getLog().isWarnEnabled();
-      }
-      @Override
-      public boolean isInfoEnabled() {
-        return getLog().isInfoEnabled();
-      }
-      @Override
-      public boolean isErrorEnabled() {
-        return getLog().isErrorEnabled();
-      }
-      @Override
-      public boolean isDebugEnabled() {
-        return getLog().isDebugEnabled();
-      }
-      @Override
-      public void info(CharSequence message, Throwable t) {
-        getLog().info(message, t);
-      }
-      @Override
-      public void info(CharSequence message) {
-        getLog().info(message);
-      }
-      @Override
-      public void error(CharSequence message, Throwable t) {
-        getLog().error(message, t);
-      }
-      @Override
-      public void error(CharSequence message) {
-        getLog().error(message);
-      }
-      @Override
-      public void debug(CharSequence message, Throwable t) {
-        getLog().debug(message, t);
-      }
-      @Override
-      public void debug(CharSequence message) {
-        getLog().debug(message);
-      }
-    };
-  }
-
 }
diff --git a/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/InstallPackagesMojo.java b/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/InstallPackagesMojo.java
@@ -76,6 +76,12 @@ public final class InstallPackagesMojo extends AbstractContentPackageMojo {
   @Parameter(property = "vault.delayAfterInstallSec")
   private Integer delayAfterInstallSec;
 
+  /**
+   * Replicate package(s) to publish instance after upload.
+   */
+  @Parameter(property = "vault.replicatePackage")
+  private boolean replicate;
+
   @Override
   public void execute() throws MojoExecutionException, MojoFailureException {
     if (isSkip()) {
@@ -88,18 +94,22 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 
     getLog().info("Get AEM content packages from " + getCanonicalPath(nodeDirectory));
 
+    // collect files to install
     ModelParser modelParser = new ModelParser();
     List<PackageFile> items = modelParser.getContentPackagesForNode(nodeDirectory).stream()
         .map(this::toPackageFile)
         .collect(Collectors.toList());
 
+    // ensure any file exist
     if (items.isEmpty()) {
       getLog().warn("No file found for installing.");
+      return;
     }
-    else {
-      PackageInstaller installer = new PackageInstaller(getPackageManagerProperties(), getLoggerWrapper());
-      installer.installFiles(items);
-    }
+
+    // install files
+    PackageInstaller installer = new PackageInstaller(getPackageManagerProperties());
+    installer.setReplicate(this.replicate);
+    installer.installFiles(items);
   }
 
   private PackageFile toPackageFile(ModelContentPackageFile item) {
