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

stefanseifert · stefanseifert · commit 7057472a3dcb · 2020-01-30T10:00:03.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -16,14 +16,19 @@ npm-debug.log
 .settings
 .externalToolBuilders
 .pmd
+.eclipse-pmd
 .checkstyle
 .idea
 .vagrant
 *.iml
 .DS_Store
+*.retry
 .rubygems
 .sass-cache
 .rubygems-gem-maven-plugin
 *.sublime-*
 *nbactions*.xml
 .temp/
+.vlt
+.vlt-sync*
+.brackets.json
diff --git a/.travis.yml b/.travis.yml
@@ -26,6 +26,13 @@ jdk:
 # Make sure travis can use container-based infrastructure
 sudo: false
 
+# Switch back to Maven 3.6.1 due to https://github.com/mojohaus/build-helper-maven-plugin/issues/81
+before_install:
+- wget https://archive.apache.org/dist/maven/maven-3/3.6.1/binaries/apache-maven-3.6.1-bin.zip
+- unzip -qq apache-maven-3.6.1-bin.zip
+- export M2_HOME=$PWD/apache-maven-3.6.1
+- export PATH=$M2_HOME/bin:$PATH
+
 install: "mvn -s ./.travis.maven-settings.xml clean"
 
 script:
diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,21 @@
     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.10.0" date="2020-01-30">
+      <action type="add" dev="sseifert">
+        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.
+      </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).
+      </action>
+      <action type="fix" dev="mrozati" issue="WTOOL-56">
+        Add support for XML namespace "granite" when building content packages.
+      </action>
+    </release>
+
     <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.
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.6</version>
+    <version>1.2.0</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-  <version>1.9.2</version>
+  <version>1.10.0</version>
   <packaging>jar</packaging>
 
   <name>CONGA AEM Plugin</name>
@@ -67,13 +67,13 @@
     <dependency>
       <groupId>io.wcm.tooling.commons</groupId>
       <artifactId>io.wcm.tooling.commons.content-package-builder</artifactId>
-      <version>1.4.2</version>
+      <version>1.4.4</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>io.wcm.tooling.commons</groupId>
       <artifactId>io.wcm.tooling.commons.crx-packmgr-helper</artifactId>
-      <version>1.6.0</version>
+      <version>1.6.2</version>
       <scope>compile</scope>
     </dependency>
 
@@ -93,7 +93,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>
-      <version>1.18</version>
+      <version>1.19</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/handlebars/helper/AbstractFilter.java b/conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/handlebars/helper/AbstractFilter.java
@@ -51,6 +51,7 @@ protected final String getValue(Map<String, Object> map, String key) {
    * @param key Key
    * @return Value or null if not set
    */
+  @SuppressWarnings("PMD.PreserveStackTrace")
   protected final String getRegexValue(Map<String, Object> map, String key) {
     String value = getValue(map, key);
 
diff --git a/conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/handlebars/helper/AbstractFilterHelper.java b/conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/handlebars/helper/AbstractFilterHelper.java
@@ -33,6 +33,7 @@
 abstract class AbstractFilterHelper implements HelperPlugin<Object> {
 
   @Override
+  @SuppressWarnings("PMD.PreserveStackTrace")
   public final Object apply(Object context, Options options, HelperContext pluginContext) throws IOException {
     if (!(context instanceof Map)) {
       throw new IllegalArgumentException("Excpected map object for filter rule.");
diff --git a/conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/handlebars/helper/AemDispatcherFilterHelper.java b/conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/handlebars/helper/AemDispatcherFilterHelper.java
@@ -45,9 +45,9 @@ public String getName() {
   protected String generateFilter(Map<String, Object> filterMap, Options options) {
     DispatcherFilter filter = new DispatcherFilter(filterMap);
 
-    StringBuilder sb = new StringBuilder();
-    sb.append("{ ");
-    sb.append("/type \"").append(filter.getType()).append("\" ");
+    StringBuilder sb = new StringBuilder()
+        .append("{ ")
+        .append("/type \"").append(filter.getType()).append("\" ");
 
     if (StringUtils.isNotEmpty(filter.getMethod())) {
       sb.append("/method '").append(filter.getMethod()).append("' ");
diff --git a/conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/handlebars/helper/WebConsolePasswordHashHelper.java b/conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/handlebars/helper/WebConsolePasswordHashHelper.java
@@ -94,7 +94,6 @@ public Object apply(Object context, Options options, HelperContext pluginContext
    * @param hashAlgorithm The hash algorithm to use
    * @param encoding The encoding to use
    * @return The hashed password (hashed + encoded as Base64)
-   * @throws IOException
    */
   private String hashPassword(String password, final String hashAlgorithm, final String encoding) throws IOException {
     byte[] bytePassword;
@@ -104,25 +103,25 @@ private String hashPassword(String password, final String hashAlgorithm, final S
     try {
       bytePassword = password.getBytes(encoding);
     }
-    catch (UnsupportedEncodingException e) {
-      throw new IOException("Cannot hash the password: " + e);
+    catch (UnsupportedEncodingException ex) {
+      throw new IOException("Cannot hash the password.", ex);
     }
 
     // create password hash
     try {
       final MessageDigest md = MessageDigest.getInstance(hashAlgorithm);
       hashedPassword = md.digest(bytePassword);
     }
-    catch (NoSuchAlgorithmException e) {
-      throw new IOException("Cannot hash the password: " + e);
+    catch (NoSuchAlgorithmException ex) {
+      throw new IOException("Cannot hash the password.", ex);
     }
 
     // encode hashed password to utf8
     try {
       hashedPasswordBase64 = new String(Base64.getEncoder().encode(hashedPassword), encoding);
     }
-    catch (UnsupportedEncodingException e) {
-      throw new IOException("Invalid Encoding: " + e);
+    catch (UnsupportedEncodingException ex) {
+      throw new IOException("Invalid Encoding.", ex);
     }
 
     return String.format("{%s}%s", hashAlgorithm.toLowerCase(), hashedPasswordBase64);
diff --git a/conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/postprocessor/ContentPackageOsgiConfigPostProcessor.java b/conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/postprocessor/ContentPackageOsgiConfigPostProcessor.java
@@ -90,7 +90,7 @@ public List<FileContext> apply(FileContext fileContext, PostProcessorContext con
 
       // create AEM content package with configurations
       File zipFile = new File(file.getParentFile(), FilenameUtils.getBaseName(file.getName()) + ".zip");
-      logger.info("Generate " + zipFile.getCanonicalPath());
+      logger.info("Generate {}", zipFile.getCanonicalPath());
 
       String rootPath = ContentPackageUtil.getMandatoryProp(options, PROPERTY_PACKAGE_ROOT_PATH);
 
@@ -126,7 +126,6 @@ public List<FileContext> apply(FileContext fileContext, PostProcessorContext con
    * @param rootPath Root path
    * @param fileHeader File header
    * @param context Post processor context
-   * @throws IOException
    */
   private void generateOsgiConfigurations(Model model, ContentPackage contentPackage,
       String rootPath, FileHeaderContext fileHeader, PostProcessorContext context) throws IOException {
diff --git a/conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/postprocessor/ContentPackagePostProcessor.java b/conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/postprocessor/ContentPackagePostProcessor.java
@@ -83,7 +83,7 @@ public List<FileContext> apply(FileContext fileContext, PostProcessorContext con
 
       // create AEM content package with configurations
       File zipFile = new File(file.getParentFile(), FilenameUtils.getBaseName(file.getName()) + ".zip");
-      logger.info("Generate " + zipFile.getCanonicalPath());
+      logger.info("Generate {}", zipFile.getCanonicalPath());
 
       String rootPath = ContentPackageUtil.getMandatoryProp(options, PROPERTY_PACKAGE_ROOT_PATH);
 
diff --git a/conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/util/ContentPackageUtil.java b/conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/util/ContentPackageUtil.java
@@ -221,7 +221,7 @@ else if (value instanceof List) {
 
   /**
    * Get and validate AC handling value.
-   * @param options
+   * @param options Options
    * @return AC handling value or null if not set.
    */
   private static AcHandling getAcHandling(Map<String, Object> options) {
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>25</version>
+    <version>30</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.9.1-SNAPSHOT</version>
+            <version>1.9.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.1.6</version>
+    <version>1.2.0</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>io.wcm.devops.conga.plugins.aem.root</artifactId>
-  <version>1.9.2</version>
+  <version>1.10.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
@@ -1,4 +1,7 @@
-## CONGA AEM Crypto CLI tool
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+${symbol_pound}${symbol_pound} CONGA AEM Crypto CLI tool
 
 The CONGA AEM plugin also provides a command-line interface tool for generating new AEM crypto keys.
 
@@ -7,15 +10,15 @@ The generated keys are supported by AEM 6.3 and upwards.
 _**Please note:** You need to install the [Java Cryptography Extension (JCE) Unlimited Strength policy files][jce-policy] from Oracle, because Ansible uses 256 bit keys to handle encryption and decryption of the vault files. If you are using Java 8u162 or higher they are already active by default._
 
 
-### Download
+${symbol_pound}${symbol_pound}${symbol_pound} Download
 
 Download it from Maven Central:
 
 |---|---|---|
 | [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
+${symbol_pound}${symbol_pound}${symbol_pound} Generate AEM crypto keys
 
 Generate a set of crypto keys:
 
@@ -49,4 +52,24 @@ java -Dansible.vault.password=mypassword -jar conga-aem-crypto-cli-${project.pro
 ```
 
 
+${symbol_pound}${symbol_pound}${symbol_pound} Encrypt and decrypt values using AEM crypto support
+
+Encrypt string using AEM crypto support and a given key:
+
+
+```
+java -jar conga-aem-crypto-cli-${project.properties['releasedVersion.version']}.jar \
+     -cryptoAesKey <path to master file> -aemCryptoEncrypt <value>
+```
+
+Decrypt string using AEM crypto support and a given key:
+
+
+```
+java -jar conga-aem-crypto-cli-${project.properties['releasedVersion.version']}.jar \
+     -cryptoAesKey <path to master file> -aemCryptoDecrypt <encrypted value>
+```
+
+
+
 [jce-policy]: http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html
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.6</version>
+    <version>1.2.0</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>conga-aem-crypto-cli</artifactId>
   <packaging>jar</packaging>
-  <version>1.9.2</version>
+  <version>1.10.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.9.2</version>
+      <version>1.10.0</version>
       <scope>compile</scope>
       <exclusions>
         <!-- Exclude all deps - only crypto util classes are used -->
diff --git a/tooling/conga-aem-crypto-cli/src/main/java/io/wcm/devops/conga/plugins/aem/tooling/crypto/cli/AemCrypto.java b/tooling/conga-aem-crypto-cli/src/main/java/io/wcm/devops/conga/plugins/aem/tooling/crypto/cli/AemCrypto.java
diff --git a/tooling/conga-aem-crypto-cli/src/main/java/io/wcm/devops/conga/plugins/aem/tooling/crypto/cli/AemCryptoCli.java b/tooling/conga-aem-crypto-cli/src/main/java/io/wcm/devops/conga/plugins/aem/tooling/crypto/cli/AemCryptoCli.java
diff --git a/tooling/conga-aem-crypto-cli/src/main/java/io/wcm/devops/conga/plugins/aem/tooling/crypto/cli/CryptoKeys.java b/tooling/conga-aem-crypto-cli/src/main/java/io/wcm/devops/conga/plugins/aem/tooling/crypto/cli/CryptoKeys.java
diff --git a/tooling/conga-aem-crypto-cli/src/test/java/io/wcm/devops/conga/plugins/aem/tooling/crypto/cli/AemCryptoTest.java b/tooling/conga-aem-crypto-cli/src/test/java/io/wcm/devops/conga/plugins/aem/tooling/crypto/cli/AemCryptoTest.java
diff --git a/tooling/conga-aem-crypto-cli/src/test/java/io/wcm/devops/conga/plugins/aem/tooling/crypto/cli/CryptoKeysTest.java b/tooling/conga-aem-crypto-cli/src/test/java/io/wcm/devops/conga/plugins/aem/tooling/crypto/cli/CryptoKeysTest.java
diff --git a/tooling/conga-aem-maven-plugin/pom.xml b/tooling/conga-aem-maven-plugin/pom.xml
