Merge branch 'develop'

wcm-io-devops · Dec 18, 2021 · 2cf81f1 · 2cf81f1
2 parents 1260a4d + f134478
commit 2cf81f1
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 41 deletions.
diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        java: [8, 11]
+        java: [8, 11, 17]
 
     steps:
       # Check out Git repository

diff --git a/.maven-settings.xml b/.maven-settings.xml
@@ -42,19 +42,6 @@
           </snapshots>
         </repository>
 
-        <repository>
-          <id>wcm-io-apache-intermediate-release</id>
-          <url>https://wcm.io/maven/repositories/apache-intermediate-release</url>
-          <layout>default</layout>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-
         <repository>
           <id>oss-snapshots</id>
           <url>https://oss.sonatype.org/content/repositories/snapshots</url>
@@ -98,19 +85,6 @@
           </snapshots>
         </pluginRepository>
 
-        <pluginRepository>
-          <id>wcm-io-apache-intermediate-release</id>
-          <url>https://wcm.io/maven/repositories/apache-intermediate-release</url>
-          <layout>default</layout>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </pluginRepository>
-
         <pluginRepository>
           <id>oss-snapshots</id>
           <url>https://oss.sonatype.org/content/repositories/snapshots</url>

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/changes.xml b/changes.xml
@@ -23,9 +23,15 @@
     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.11.4" date="2021-12-18">
+      <action type="update" dev="sseifert">
+        Role aem-cms: Do not show warning for uncovered node /etc/replication.
+      </action>
+    </release>
+
     <release version="1.11.2" date="2021-11-08">
       <action type="fix" dev="mrozati" issue="WDCONGA-31">
-        Role: aem-dispatcher-cloud: Remove symlinks to "default.farm" and "default.vhost" because we are using custom copies instead.
+        Role aem-dispatcher-cloud: Remove symlinks to "default.farm" and "default.vhost" because we are using custom copies instead.
       </action>
     </release>
 

diff --git a/conga-aem-definitions/pom.xml b/conga-aem-definitions/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm.devops.conga.definitions</groupId>
     <artifactId>io.wcm.devops.conga.definitions.aem.parent</artifactId>
-    <version>1.11.2</version>
+    <version>1.11.4</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.devops.conga.definitions</groupId>
   <artifactId>io.wcm.devops.conga.definitions.aem</artifactId>
-  <version>1.11.2</version>
+  <version>1.11.4</version>
   <packaging>config-definition</packaging>
 
   <name>CONGA AEM Definitions</name>
@@ -51,7 +51,7 @@
       <plugin>
         <groupId>io.wcm.devops.conga</groupId>
         <artifactId>conga-maven-plugin</artifactId>
-        <version>1.13.2</version>
+        <version>1.14.4</version>
         <extensions>true</extensions>
         <dependencies>
 
@@ -64,7 +64,7 @@
           <dependency>
             <groupId>io.wcm.devops.conga.plugins</groupId>
             <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-            <version>1.12.0</version>
+            <version>2.16.0</version>
           </dependency>
 
         </dependencies>

diff --git a/conga-aem-definitions/src/main/roles/aem-cms.yaml b/conga-aem-definitions/src/main/roles/aem-cms.yaml
@@ -54,6 +54,7 @@ files:
       jackrabbit-filter:
         options:
           validRoots: /etc/replication
+          severityForUncoveredAncestorNodes: debug
   postProcessors:
   - aem-contentpackage
   postProcessorOptions:
@@ -80,6 +81,7 @@ files:
       jackrabbit-filter:
         options:
           validRoots: /etc/replication
+          severityForUncoveredAncestorNodes: debug
   postProcessors:
   - aem-contentpackage
   postProcessorOptions:

diff --git a/example/pom.xml b/example/pom.xml
@@ -32,7 +32,7 @@
   <groupId>io.wcm.devops.conga.definitions</groupId>
   <artifactId>io.wcm.devops.conga.definitions.aem.example</artifactId>
   <packaging>config</packaging>
-  <version>1.11.2</version>
+  <version>1.11.4</version>
 
   <name>CONGA AEM Definitions Example</name>
   <description>Example environment definition.</description>
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.wcm.devops.conga.definitions</groupId>
       <artifactId>io.wcm.devops.conga.definitions.aem</artifactId>
-      <version>1.11.2</version>
+      <version>1.11.4</version>
     </dependency>
 
   </dependencies>
@@ -55,7 +55,7 @@
       <plugin>
         <groupId>io.wcm.devops.conga</groupId>
         <artifactId>conga-maven-plugin</artifactId>
-        <version>1.13.2</version>
+        <version>1.14.4</version>
         <extensions>true</extensions>
         <dependencies>
 
@@ -68,7 +68,7 @@
           <dependency>
             <groupId>io.wcm.devops.conga.plugins</groupId>
             <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-            <version>1.12.0</version>
+            <version>2.16.0</version>
           </dependency>
 
           <!-- Test with ansible encryption -->

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm.devops</groupId>
     <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-    <version>1.2.8</version>
+    <version>1.2.10</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm.devops.conga.definitions</groupId>
   <artifactId>io.wcm.devops.conga.definitions.aem.parent</artifactId>
-  <version>1.11.2</version>
+  <version>1.11.4</version>
   <packaging>pom</packaging>
 
   <name>CONGA AEM Definitions</name>

diff --git a/pom.xml b/pom.xml
@@ -23,13 +23,13 @@
   <parent>
     <groupId>io.wcm.devops.conga.definitions</groupId>
     <artifactId>io.wcm.devops.conga.definitions.aem.parent</artifactId>
-    <version>1.11.2</version>
+    <version>1.11.4</version>
     <relativePath>parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.devops.conga.definitions</groupId>
   <artifactId>io.wcm.devops.conga.definitions.aem.root</artifactId>
-  <version>1.11.2</version>
+  <version>1.11.4</version>
   <packaging>pom</packaging>
 
   <name>CONGA AEM Definitions</name>