Merge branch 'develop' into master

Author: stefanseifert

.github/workflows/maven-build.yml

@@ -0,0 +1,55 @@
+# Build validation
+
+name: Build
+
+on:
+  push:
+    branches-ignore:
+      - master
+      - experimental/**
+  pull_request:
+    branches-ignore:
+      - master
+      - experimental/**
+  workflow_dispatch:
+
+jobs:
+  build:
+
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ ubuntu-latest ]
+        java: [8, 11]
+
+    steps:
+      # Check out Git repository
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      # Set up environment with Java and Maven
+      - name: Setup JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+
+      # Set up dependency cache
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+
+      # Build & install (required for 2nd build: example)
+      - name: Build and verify
+        run: mvn -s ./.maven-settings.xml -Pcontinuous-integration -B -U clean install
+
+      # Build & verify example
+      - name: Build and verify example
+        run: mvn -s ./.maven-settings.xml -Pcontinuous-integration -B -U clean verify -f example
+
+      # Run code coverage check
+      - name: Run code coverage check
+        run: bash <(curl -s https://codecov.io/bash)

.github/workflows/maven-deploy.yml

@@ -0,0 +1,55 @@
+# Deploy snapshots to Sonatpe OSS repository and deploy site to GitHub Pages
+
+name: Deploy
+
+on:
+  push:
+    branches:
+      - develop
+  workflow_dispatch:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      # Check out Git repository
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      # Configure GIT
+      - name: Configure GIT
+        run: |
+          git config --global user.email "${{ secrets.GH_SITE_DEPLOY_EMAIL }}"
+          git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
+
+      # Set up environment with Java and Maven
+      - name: Setup JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+
+      # Set up dependency cache
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+
+      # Build, deploy to ossrh, generate and stage site
+      - name: Build, verify, deploy, generate site
+        env:
+          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+        run: mvn -s ./.maven-settings.xml -Pcontinuous-integration -B -U clean deploy site
+
+      # Deploy site to Github Pages
+      - name: Stage and deploy site
+        run: >
+          mvn -s ./.maven-settings.xml -Pcontinuous-integration -B site:stage scm-publish:publish-scm
+          -Dscmpublish.checkinComment="Maven site: ${{ github.repository }}"
+          -Dusername=${{ secrets.GH_SITE_DEPLOY_USERNAME }}
+          -Dpassword=${{ secrets.GH_SITE_DEPLOY_PAT }}

.travis.maven-settings.xml .maven-settings.xml.travis.maven-settings.xml renamed to .maven-settings.xml

@@ -37,22 +37,11 @@
             <enabled>true</enabled>
             <updatePolicy>never</updatePolicy>
           </releases>
+          <!-- workaround for https://github.com/mojohaus/build-helper-maven-plugin/issues/108
           <snapshots>
             <enabled>false</enabled>
           </snapshots>
-        </repository>
-
-        <repository>
-          <id>adobe-public-releases</id>
-          <name>Adobe Public Repository</name>
-          <url>https://repo.adobe.com/nexus/content/groups/public/</url>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
+          -->
         </repository>
 
         <repository>
@@ -111,19 +100,6 @@
           </snapshots>
         </pluginRepository>
 
-        <pluginRepository>
-          <id>adobe-public-releases</id>
-          <name>Adobe Public Repository</name>
-          <url>https://repo.adobe.com/nexus/content/groups/public/</url>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </pluginRepository>
-
         <pluginRepository>
           <id>wcm-io-apache-intermediate-release</id>
           <url>https://wcm.io/maven/repositories/apache-intermediate-release</url>
@@ -173,4 +149,12 @@
     <activeProfile>default</activeProfile>
   </activeProfiles>
 
+  <servers>
+    <server>
+      <id>ossrh</id>
+      <username>${env.SONATYPE_USERNAME}</username>
+      <password>${env.SONATYPE_PASSWORD}</password>
+    </server>
+  </servers>
+
 </settings>

.travis.yml

@@ -1,20 +1,20 @@
 <img src="https://wcm.io/images/favicon-16@2x.png"/> CONGA Plugin for AEM
 ======
-[![Build Status](https://travis-ci.com/wcm-io-devops/conga-aem-plugin.png?branch=develop)](https://travis-ci.com/wcm-io-devops/conga-aem-plugin)
+[![Build](https://github.com/wcm-io-devops/conga-aem-plugin/workflows/Build/badge.svg?branch=develop)](https://github.com/wcm-io-devops/conga-aem-plugin/actions?query=workflow%3ABuild+branch%3Adevelop)
 [![Code Coverage](https://codecov.io/gh/wcm-io-devops/conga-aem-plugin/branch/develop/graph/badge.svg)](https://codecov.io/gh/wcm-io-devops/conga-aem-plugin)
 
 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.com/conga-aem-plugin<br/>
+Continuous Integration: https://github.com/wcm-io-devops/conga-aem-plugin/actions<br/>
 Commercial support: https://wcm.io/commercial-support.html
 
 
 ## Build from sources
 
 If you want to build from sources make sure you have configured all [Maven Repositories](https://devops.wcm.io/maven.html) in your settings.xml.
 
-See [Travis Maven settings.xml](https://github.com/conga-aem-plugin/blob/master/.travis.maven-settings.xml) for an example with a full configuration.
+See [Maven Settings](https://github.com/wcm-io-devops/conga-aem-plugin/blob/develop/.maven-settings.xml) for an example with a full configuration.
 
 Then you can build using
 

Jenkinsfile

@@ -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.14.2" date="2021-03-15">
+      <action type="fix" dev="dtschentscher">
+        Fix parsing content package properties with numeric values.
+      </action>
+    </release>
+
     <release version="1.14.0" date="2020-12-21">
       <action type="add" dev="sseifert">
         conga-aem-maven-plugin:cloudmanager-all-package: Add "singlePackage" flag to alternatively build single "all" content package for all environments and nodes.

README.md

@@ -23,15 +23,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>io.wcm.devops</groupId>
-    <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-    <version>1.2.4</version>
-    <relativePath />
+    <groupId>io.wcm.devops.conga.plugins</groupId>
+    <artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
+    <version>1.14.2</version>
+    <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-  <version>1.14.0</version>
+  <version>1.14.2</version>
   <packaging>jar</packaging>
 
   <name>CONGA AEM Plugin</name>
@@ -45,7 +45,7 @@
   </scm>
 
   <properties>
-    <site.url.module.prefix>conga/plugins/aem/conga-aem-plugin</site.url.module.prefix>
+    <site.url.module.prefix>conga-aem-plugin</site.url.module.prefix>
   </properties>
 
   <dependencies>
@@ -101,13 +101,11 @@
     <dependency>
       <groupId>io.wcm.tooling.commons</groupId>
       <artifactId>io.wcm.tooling.commons.content-package-builder</artifactId>
-      <version>1.5.4</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>io.wcm.tooling.commons</groupId>
       <artifactId>io.wcm.tooling.commons.crx-packmgr-helper</artifactId>
-      <version>1.7.4</version>
       <scope>compile</scope>
     </dependency>
 
@@ -223,12 +221,25 @@
       </plugin>
 
     </plugins>
+    <pluginManagement>
+      <plugins>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <configuration>
+            <topSiteURL>${site.deploy.url}</topSiteURL>
+          </configuration>
+        </plugin>
+
+      </plugins>
+    </pluginManagement>
   </build>
 
   <distributionManagement>
     <site>
       <id>${site.deploy.id}</id>
-      <url>${site.deploy.url}${site.url.module.prefix}</url>
+      <url>${site.deploy.url}/${site.url.module.prefix}</url>
     </site>
   </distributionManagement>
 

changes.xml

@@ -28,6 +28,7 @@
 import java.security.GeneralSecurityException;
 import java.security.Key;
 import java.util.Map;
+import java.util.Objects;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.BooleanUtils;
@@ -72,7 +73,7 @@ public Object apply(Object context, Options options, HelperContext pluginContext
     boolean cryptoSkip = false;
     Map<String, Object> aemPluginConfig = pluginContext.getGenericPluginConfig().get(PLUGIN_NAME);
     if (aemPluginConfig != null) {
-      cryptoAesKeyUrl = (String)aemPluginConfig.get(PARAMETER_CRYPTO_AES_KEY_URL);
+      cryptoAesKeyUrl = Objects.toString(aemPluginConfig.get(PARAMETER_CRYPTO_AES_KEY_URL), null);
       Object cryptoSkipObject = aemPluginConfig.get(PARAMETER_CRYPTO_SKIP);
       if (cryptoSkipObject != null) {
         if (cryptoSkipObject instanceof Boolean) {