diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index 0467505..a21905f 100644 --- 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 index 4c60739..00935fc 100644 --- a/.maven-settings.xml +++ b/.maven-settings.xml @@ -42,19 +42,6 @@ - - wcm-io-apache-intermediate-release - https://wcm.io/maven/repositories/apache-intermediate-release - default - - true - never - - - false - - - oss-snapshots https://oss.sonatype.org/content/repositories/snapshots @@ -98,19 +85,6 @@ - - wcm-io-apache-intermediate-release - https://wcm.io/maven/repositories/apache-intermediate-release - default - - true - never - - - false - - - oss-snapshots https://oss.sonatype.org/content/repositories/snapshots diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index ffdc10e..598fb34 100644 --- 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 index 2ad92d2..07645e9 100644 --- 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"> + + + Role aem-cms: Do not show warning for uncovered node /etc/replication. + + + - 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. diff --git a/conga-aem-definitions/pom.xml b/conga-aem-definitions/pom.xml index a34054c..eafcfe4 100644 --- a/conga-aem-definitions/pom.xml +++ b/conga-aem-definitions/pom.xml @@ -25,13 +25,13 @@ io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.parent - 1.11.2 + 1.11.4 ../parent/pom.xml io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem - 1.11.2 + 1.11.4 config-definition CONGA AEM Definitions @@ -51,7 +51,7 @@ io.wcm.devops.conga conga-maven-plugin - 1.13.2 + 1.14.4 true @@ -64,7 +64,7 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem - 1.12.0 + 2.16.0 diff --git a/conga-aem-definitions/src/main/roles/aem-cms.yaml b/conga-aem-definitions/src/main/roles/aem-cms.yaml index 8a2c907..bef9ec7 100644 --- 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 index bb4a21b..2465b58 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -32,7 +32,7 @@ io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.example config - 1.11.2 + 1.11.4 CONGA AEM Definitions Example Example environment definition. @@ -43,7 +43,7 @@ io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem - 1.11.2 + 1.11.4 @@ -55,7 +55,7 @@ io.wcm.devops.conga conga-maven-plugin - 1.13.2 + 1.14.4 true @@ -68,7 +68,7 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem - 1.12.0 + 2.16.0 diff --git a/parent/pom.xml b/parent/pom.xml index 76c6580..1695e0a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -25,13 +25,13 @@ io.wcm.devops io.wcm.devops.parent_toplevel - 1.2.8 + 1.2.10 io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.parent - 1.11.2 + 1.11.4 pom CONGA AEM Definitions diff --git a/pom.xml b/pom.xml index 94fb169..2e2bb27 100644 --- a/pom.xml +++ b/pom.xml @@ -23,13 +23,13 @@ io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.parent - 1.11.2 + 1.11.4 parent/pom.xml io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.root - 1.11.2 + 1.11.4 pom CONGA AEM Definitions