From eb37956ccfd326c31d21170a4a7d2dac95c73dc2 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Wed, 18 Oct 2023 13:53:05 +0200 Subject: [PATCH 01/16] [gitflow-maven-plugin] Update for next development version 2.19.9-SNAPSHOT --- conga-aem-plugin/pom.xml | 4 ++-- parent/pom.xml | 2 +- pom.xml | 4 ++-- tooling/conga-aem-crypto-cli/pom.xml | 6 +++--- tooling/conga-aem-maven-plugin/pom.xml | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/conga-aem-plugin/pom.xml b/conga-aem-plugin/pom.xml index f2ff129..155580d 100644 --- a/conga-aem-plugin/pom.xml +++ b/conga-aem-plugin/pom.xml @@ -25,13 +25,13 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem.parent - 2.19.8 + 2.19.9-SNAPSHOT ../parent/pom.xml io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem - 2.19.8 + 2.19.9-SNAPSHOT jar CONGA AEM Plugin diff --git a/parent/pom.xml b/parent/pom.xml index f099d9a..7977882 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -31,7 +31,7 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem.parent - 2.19.8 + 2.19.9-SNAPSHOT pom CONGA AEM Plugin diff --git a/pom.xml b/pom.xml index e756848..09cc3c5 100644 --- a/pom.xml +++ b/pom.xml @@ -23,13 +23,13 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem.parent - 2.19.8 + 2.19.9-SNAPSHOT parent/pom.xml io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem.root - 2.19.8 + 2.19.9-SNAPSHOT pom CONGA AEM Plugin diff --git a/tooling/conga-aem-crypto-cli/pom.xml b/tooling/conga-aem-crypto-cli/pom.xml index 3c6d0aa..3f22462 100644 --- a/tooling/conga-aem-crypto-cli/pom.xml +++ b/tooling/conga-aem-crypto-cli/pom.xml @@ -25,14 +25,14 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem.parent - 2.19.8 + 2.19.9-SNAPSHOT ../../parent/pom.xml io.wcm.devops.conga.plugins conga-aem-crypto-cli jar - 2.19.8 + 2.19.9-SNAPSHOT CONGA AEM Crypto Command Line Interface Command line tool to generate Crypto keys for AEM. @@ -42,7 +42,7 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem - 2.19.8 + 2.19.9-SNAPSHOT compile diff --git a/tooling/conga-aem-maven-plugin/pom.xml b/tooling/conga-aem-maven-plugin/pom.xml index 814153a..a22b382 100644 --- a/tooling/conga-aem-maven-plugin/pom.xml +++ b/tooling/conga-aem-maven-plugin/pom.xml @@ -25,14 +25,14 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem.parent - 2.19.8 + 2.19.9-SNAPSHOT ../../parent/pom.xml io.wcm.devops.conga.plugins conga-aem-maven-plugin maven-plugin - 2.19.8 + 2.19.9-SNAPSHOT CONGA AEM Maven Plugin wcm.io DevOps CONGA - CONfiguration GenerAtor Maven Plugin for AEM @@ -62,7 +62,7 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem - 2.19.8 + 2.19.9-SNAPSHOT compile From 5b61cea2a4088648dd2279a11b4e9200a7f743f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 09:42:33 +0000 Subject: [PATCH 02/16] Bump maven-plugin-plugin.version from 3.9.0 to 3.10.1 Bumps `maven-plugin-plugin.version` from 3.9.0 to 3.10.1. Updates `org.apache.maven.plugin-tools:maven-plugin-annotations` from 3.9.0 to 3.10.1 - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.9.0...maven-plugin-tools-3.10.1) Updates `org.apache.maven.plugins:maven-plugin-plugin` from 3.9.0 to 3.10.1 - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.9.0...maven-plugin-tools-3.10.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.maven.plugins:maven-plugin-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- tooling/conga-aem-maven-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling/conga-aem-maven-plugin/pom.xml b/tooling/conga-aem-maven-plugin/pom.xml index a22b382..b607f29 100644 --- a/tooling/conga-aem-maven-plugin/pom.xml +++ b/tooling/conga-aem-maven-plugin/pom.xml @@ -41,7 +41,7 @@ tooling/conga-aem-maven-plugin - 3.9.0 + 3.10.1 invoker.mavenOpts From e208063ad2221cbe36019b752c8ac29127ee455a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 10:02:50 +0000 Subject: [PATCH 03/16] Bump commons-io:commons-io from 2.14.0 to 2.15.0 Bumps commons-io:commons-io from 2.14.0 to 2.15.0. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 7977882..b12e263 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -123,7 +123,7 @@ commons-io commons-io - 2.14.0 + 2.15.0 From 5d8dce8ae724cd5c61a60063edc50126f60d66a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Oct 2023 09:09:20 +0000 Subject: [PATCH 04/16] Bump commons-cli:commons-cli from 1.5.0 to 1.6.0 Bumps commons-cli:commons-cli from 1.5.0 to 1.6.0. --- updated-dependencies: - dependency-name: commons-cli:commons-cli dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index b12e263..203c329 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -113,7 +113,7 @@ commons-cli commons-cli - 1.5.0 + 1.6.0 org.apache.commons From 2dd30b983de7cdbee87650eb3481b0de0c19c312 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 09:36:57 +0000 Subject: [PATCH 05/16] Bump maven-plugin-plugin.version from 3.10.1 to 3.10.2 Bumps `maven-plugin-plugin.version` from 3.10.1 to 3.10.2. Updates `org.apache.maven.plugin-tools:maven-plugin-annotations` from 3.10.1 to 3.10.2 - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.10.1...maven-plugin-tools-3.10.2) Updates `org.apache.maven.plugins:maven-plugin-plugin` from 3.10.1 to 3.10.2 - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.10.1...maven-plugin-tools-3.10.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven.plugins:maven-plugin-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- tooling/conga-aem-maven-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling/conga-aem-maven-plugin/pom.xml b/tooling/conga-aem-maven-plugin/pom.xml index b607f29..c4a1cf7 100644 --- a/tooling/conga-aem-maven-plugin/pom.xml +++ b/tooling/conga-aem-maven-plugin/pom.xml @@ -41,7 +41,7 @@ tooling/conga-aem-maven-plugin - 3.10.1 + 3.10.2 invoker.mavenOpts From b78bbf7a44a529e48e58d71ab0ec600d0bfe371f Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Mon, 13 Nov 2023 13:16:02 +0100 Subject: [PATCH 06/16] update dependencies in ITs to latest versions --- .../bundles/core/pom.xml | 1 - .../it/wcmio-archetype-aem65/parent/pom.xml | 50 ++++---- .../config-definition/pom.xml | 70 ----------- .../src/main/environments/cloud.yaml | 2 +- .../roles/wcmio-archetype-cloud-aem-cms.yaml | 20 --- .../it/wcmio-archetype-cloud/parent/pom.xml | 114 ++++-------------- 6 files changed, 48 insertions(+), 209 deletions(-) diff --git a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/bundles/core/pom.xml b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/bundles/core/pom.xml index 660d3f0..ef6f12a 100644 --- a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/bundles/core/pom.xml +++ b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/bundles/core/pom.xml @@ -182,7 +182,6 @@ com.adobe.aem uber-jar - apis provided diff --git a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/parent/pom.xml b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/parent/pom.xml index 3f705d4..212a765 100644 --- a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/parent/pom.xml +++ b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/parent/pom.xml @@ -5,7 +5,7 @@ io.wcm.maven io.wcm.maven.aem-global-parent - 2.0.16 + 2.1.10 @@ -29,8 +29,8 @@ enabled - 2.21.0 - 5.3.2 + 2.23.4 + 6.3.0 2021-01-01T00:00:00Z @@ -84,12 +84,12 @@ org.apache.sling org.apache.sling.models.api - 1.4.0 + 1.5.0 org.apache.sling org.apache.sling.models.impl - 1.5.0 + 1.6.4 @@ -118,17 +118,17 @@ io.wcm io.wcm.caconfig.extensions - 1.9.0 + 1.9.4 io.wcm io.wcm.caconfig.editor - 1.13.0 + 1.15.6 io.wcm io.wcm.sling.commons - 1.5.0 + 1.6.4 io.wcm @@ -138,17 +138,17 @@ io.wcm io.wcm.wcm.commons - 1.9.0 + 1.10.0 io.wcm io.wcm.wcm.parsys - 1.6.8 + 1.7.0 io.wcm io.wcm.wcm.ui.granite - 1.9.8 + 1.9.14 io.wcm @@ -158,44 +158,44 @@ io.wcm io.wcm.handler.commons - 1.4.4 + 1.5.0 io.wcm io.wcm.handler.url - 1.9.0 + 1.10.2 io.wcm io.wcm.handler.media - 1.14.12 + 1.15.8 io.wcm io.wcm.handler.link - 1.9.2 + 1.10.2 io.wcm io.wcm.handler.richtext - 1.6.0 + 1.6.4 io.wcm io.wcm.wcm.core.components - 1.12.0-2.20.0 + 1.14.0-2.23.2 io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem - 1.13.0 + 2.0.2 io.wcm io.wcm.testing.aem-mock.junit5 - 5.1.0 + 5.4.0 org.apache.sling @@ -210,7 +210,7 @@ org.apache.sling org.apache.sling.testing.caconfig-mock-plugin - 1.4.0 + 1.5.2 io.wcm @@ -220,7 +220,7 @@ io.wcm io.wcm.testing.wcm-io-mock.sling - 1.1.0 + 1.2.0 io.wcm @@ -237,7 +237,7 @@ io.wcm.maven io.wcm.maven.aem-dependencies - 6.5.0.0005 + 6.5.18.0000 pom import @@ -278,19 +278,19 @@ org.junit junit-bom - 5.9.1 + 5.10.1 pom import org.mockito mockito-core - 4.8.0 + 5.7.0 org.mockito mockito-junit-jupiter - 4.8.0 + 5.7.0 diff --git a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/config-definition/pom.xml b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/config-definition/pom.xml index c741521..d5b8b0e 100644 --- a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/config-definition/pom.xml +++ b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/config-definition/pom.xml @@ -78,13 +78,6 @@ io.wcm.caconfig.editor compile - - io.wcm - io.wcm.caconfig.editor - content - zip - compile - io.wcm io.wcm.sling.commons @@ -100,23 +93,9 @@ io.wcm.wcm.commons compile - - io.wcm - io.wcm.wcm.commons - content - zip - compile - - - io.wcm - io.wcm.wcm.parsys - compile - io.wcm io.wcm.wcm.parsys - content - zip compile @@ -124,25 +103,11 @@ io.wcm.wcm.ui.granite compile - - io.wcm - io.wcm.wcm.ui.granite - content - zip - compile - io.wcm io.wcm.wcm.ui.clientlibs compile - - io.wcm - io.wcm.wcm.ui.clientlibs - content - zip - compile - io.wcm io.wcm.handler.commons @@ -153,35 +118,14 @@ io.wcm.handler.url compile - - io.wcm - io.wcm.handler.url - content - zip - compile - io.wcm io.wcm.handler.media compile - - io.wcm - io.wcm.handler.media - content - zip - compile - - - io.wcm - io.wcm.handler.link - compile - io.wcm io.wcm.handler.link - content - zip compile @@ -189,25 +133,11 @@ io.wcm.handler.richtext compile - - io.wcm - io.wcm.handler.richtext - content - zip - compile - io.wcm io.wcm.wcm.core.components compile - - io.wcm - io.wcm.wcm.core.components - content - zip - compile - diff --git a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/config-definition/src/main/environments/cloud.yaml b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/config-definition/src/main/environments/cloud.yaml index 5f46aa3..e4d4d2c 100644 --- a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/config-definition/src/main/environments/cloud.yaml +++ b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/config-definition/src/main/environments/cloud.yaml @@ -45,7 +45,7 @@ config: httpd: headers: # Set default expiration time for text/html responses (also affects dispatcher caching/invalidation) - htmlExpirationTimeMin: 0 + htmlExpirationTimeSec: 0 # Replication configuration not required for AEM cloud service replication: diff --git a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/config-definition/src/main/roles/wcmio-archetype-cloud-aem-cms.yaml b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/config-definition/src/main/roles/wcmio-archetype-cloud-aem-cms.yaml index 775eaf9..ee6a2fd 100644 --- a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/config-definition/src/main/roles/wcmio-archetype-cloud-aem-cms.yaml +++ b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/config-definition/src/main/roles/wcmio-archetype-cloud-aem-cms.yaml @@ -65,50 +65,30 @@ files: dir: bundles - url: mvn:io.wcm/io.wcm.caconfig.editor dir: bundles -- url: mvn:io.wcm/io.wcm.caconfig.editor//zip/content - dir: packages - url: mvn:io.wcm/io.wcm.sling.commons dir: bundles - url: mvn:io.wcm/io.wcm.sling.models dir: bundles - url: mvn:io.wcm/io.wcm.wcm.commons dir: bundles -- url: mvn:io.wcm/io.wcm.wcm.commons//zip/content - dir: packages - url: mvn:io.wcm/io.wcm.wcm.parsys dir: bundles -- url: mvn:io.wcm/io.wcm.wcm.parsys//zip/content - dir: packages - url: mvn:io.wcm/io.wcm.wcm.ui.granite dir: bundles -- url: mvn:io.wcm/io.wcm.wcm.ui.granite//zip/content - dir: packages - url: mvn:io.wcm/io.wcm.wcm.ui.clientlibs dir: bundles -- url: mvn:io.wcm/io.wcm.wcm.ui.clientlibs//zip/content - dir: packages - url: mvn:io.wcm/io.wcm.handler.commons dir: bundles - url: mvn:io.wcm/io.wcm.handler.url dir: bundles -- url: mvn:io.wcm/io.wcm.handler.url//zip/content - dir: packages - url: mvn:io.wcm/io.wcm.handler.media dir: bundles -- url: mvn:io.wcm/io.wcm.handler.media//zip/content - dir: packages - url: mvn:io.wcm/io.wcm.handler.link dir: bundles -- url: mvn:io.wcm/io.wcm.handler.link//zip/content - dir: packages - url: mvn:io.wcm/io.wcm.handler.richtext dir: bundles -- url: mvn:io.wcm/io.wcm.handler.richtext//zip/content - dir: packages - url: mvn:io.wcm/io.wcm.wcm.core.components dir: bundles -- url: mvn:io.wcm/io.wcm.wcm.core.components//zip/content - dir: packages # Application bundles andpackages - url: mvn:io.wcm.devops.conga.plugins.aem.it/io.wcm.devops.conga.plugins.aem.it.aemcloud.core diff --git a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/parent/pom.xml b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/parent/pom.xml index 9c70d2c..f4164f7 100644 --- a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/parent/pom.xml +++ b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/parent/pom.xml @@ -5,7 +5,7 @@ io.wcm.maven io.wcm.maven.aem-global-parent - 2.0.16 + 2.1.10 @@ -29,7 +29,7 @@ enabled - 5.3.2 + 6.3.0 2021-01-01T00:00:00Z @@ -83,24 +83,17 @@ io.wcm io.wcm.caconfig.extensions - 1.9.0 + 1.9.4 io.wcm io.wcm.caconfig.editor - 1.13.0 - - - io.wcm - io.wcm.caconfig.editor - 1.13.0 - content - zip + 1.15.6 io.wcm io.wcm.sling.commons - 1.5.0 + 1.6.4 io.wcm @@ -110,127 +103,64 @@ io.wcm io.wcm.wcm.commons - 1.9.0 - - - io.wcm - io.wcm.wcm.commons - 1.9.0 - content - zip + 1.10.0 io.wcm io.wcm.wcm.parsys - 1.6.8 - - - io.wcm - io.wcm.wcm.parsys - 1.6.8 - content - zip + 1.7.0 io.wcm io.wcm.wcm.ui.granite - 1.9.8 - - - io.wcm - io.wcm.wcm.ui.granite - 1.9.8 - content - zip - - - io.wcm - io.wcm.wcm.ui.clientlibs - 1.2.2 + 1.9.14 io.wcm io.wcm.wcm.ui.clientlibs 1.2.2 - content - zip io.wcm io.wcm.handler.commons - 1.4.4 - - - io.wcm - io.wcm.handler.url - 1.9.0 + 1.5.0 io.wcm io.wcm.handler.url - 1.9.0 - content - zip - - - io.wcm - io.wcm.handler.media - 1.14.12 + 1.10.2 io.wcm io.wcm.handler.media - 1.14.12 - content - zip + 1.15.8 io.wcm io.wcm.handler.link - 1.9.2 - - - io.wcm - io.wcm.handler.link - 1.9.2 - content - zip + 1.10.2 io.wcm io.wcm.handler.richtext - 1.6.0 - - - io.wcm - io.wcm.handler.richtext - 1.6.0 - content - zip + 1.6.4 io.wcm io.wcm.wcm.core.components - 1.12.0-2.20.0 - - - io.wcm - io.wcm.wcm.core.components - 1.12.0-2.20.0 - content - zip + 1.14.0-2.23.2 io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem - 1.13.0 + 2.0.2 io.wcm io.wcm.testing.aem-mock.junit5 - 5.1.0 + 5.4.0 org.apache.sling @@ -240,7 +170,7 @@ org.apache.sling org.apache.sling.testing.caconfig-mock-plugin - 1.4.0 + 1.5.2 io.wcm @@ -250,7 +180,7 @@ io.wcm io.wcm.testing.wcm-io-mock.sling - 1.1.0 + 1.2.0 io.wcm @@ -267,7 +197,7 @@ io.wcm.maven io.wcm.maven.aem-cloud-dependencies - 2022.10.9145.20221006T013555Z-220800.0000 + 2023.11.14227.20231108T162349Z-231000.0000 pom import @@ -295,19 +225,19 @@ org.junit junit-bom - 5.9.1 + 5.10.1 pom import org.mockito mockito-core - 4.8.0 + 5.7.0 org.mockito mockito-junit-jupiter - 4.8.0 + 5.7.0 From 1b23556d8a55d52f6d02dee425c7c4410a3da599 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Mon, 13 Nov 2023 14:25:34 +0100 Subject: [PATCH 07/16] Update ITs to test run mode order for configurations (as expected by AEM Analyser Plugin) (#79) --- parent/pom.xml | 2 +- .../config-definition/pom.xml | 4 ---- ...archetype-cloud-aem-cms-config.provisioning.hbs | 14 ++++++++++++++ .../src/it/wcmio-archetype-cloud/parent/pom.xml | 2 +- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 203c329..f7572d4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -68,7 +68,7 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.sling - 1.3.0 + 1.3.3-SNAPSHOT diff --git a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/config-definition/pom.xml b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/config-definition/pom.xml index d5b8b0e..d7881c6 100644 --- a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/config-definition/pom.xml +++ b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/config-definition/pom.xml @@ -202,10 +202,6 @@ project-analyse - - - bundle-content - ${project.build.directory}/cloud.all.zip diff --git a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/config-definition/src/main/templates/wcmio-archetype-cloud-aem-cms/wcmio-archetype-cloud-aem-cms-config.provisioning.hbs b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/config-definition/src/main/templates/wcmio-archetype-cloud-aem-cms/wcmio-archetype-cloud-aem-cms-config.provisioning.hbs index 492d2c0..5f15036 100644 --- a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/config-definition/src/main/templates/wcmio-archetype-cloud-aem-cms/wcmio-archetype-cloud-aem-cms-config.provisioning.hbs +++ b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/config-definition/src/main/templates/wcmio-archetype-cloud-aem-cms/wcmio-archetype-cloud-aem-cms-config.provisioning.hbs @@ -93,6 +93,20 @@ instance.type="publish" +# Example configurations with combination of run modes and environments +[configurations runModes=publish,stage] + io.wcm.caconfig.editor.impl.EditorConfig + enabled=B"false" + +[configurations runModes=publish,prod] + io.wcm.caconfig.editor.impl.EditorConfig + enabled=B"false" + +[configurations runModes=publish,dev] + io.wcm.caconfig.editor.impl.EditorConfig + enabled=B"false" + + [:repoinit] # Create root folder below /apps for application create path /apps/wcmio-archetype-cloud(sling:Folder) diff --git a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/parent/pom.xml b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/parent/pom.xml index f4164f7..20f9eb8 100644 --- a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/parent/pom.xml +++ b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/parent/pom.xml @@ -5,7 +5,7 @@ io.wcm.maven io.wcm.maven.aem-global-parent - 2.1.10 + 2.1.11-SNAPSHOT From 5118269568b50170b95eae150ce79996b1672dcf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 10:01:43 +0000 Subject: [PATCH 08/16] Bump org.apache.commons:commons-compress from 1.24.0 to 1.25.0 Bumps org.apache.commons:commons-compress from 1.24.0 to 1.25.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-compress dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index f7572d4..d920215 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -108,7 +108,7 @@ org.apache.commons commons-compress - 1.24.0 + 1.25.0 commons-cli From c2cb8e65c183f2caf41bf15069589c48759d957a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Nov 2023 09:54:07 +0000 Subject: [PATCH 09/16] Bump org.apache.jackrabbit:filevault-package-maven-plugin Bumps [org.apache.jackrabbit:filevault-package-maven-plugin](https://github.com/apache/jackrabbit-filevault-package-maven-plugin) from 1.3.4 to 1.3.6. - [Changelog](https://github.com/apache/jackrabbit-filevault-package-maven-plugin/blob/master/RELEASE-NOTES.md) - [Commits](https://github.com/apache/jackrabbit-filevault-package-maven-plugin/compare/filevault-package-maven-plugin-1.3.4...filevault-package-maven-plugin-1.3.6) --- updated-dependencies: - dependency-name: org.apache.jackrabbit:filevault-package-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index d920215..bdad909 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -91,7 +91,7 @@ org.apache.jackrabbit filevault-package-maven-plugin - 1.3.4 + 1.3.6 From 1eda2f600bf9f2255724a8f204d31ee187114e4c Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Mon, 20 Nov 2023 13:53:47 +0100 Subject: [PATCH 10/16] update dependencies --- parent/pom.xml | 2 +- .../src/it/wcmio-archetype-aem65/parent/pom.xml | 2 +- .../src/it/wcmio-archetype-cloud/parent/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index bdad909..e1eb095 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -68,7 +68,7 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.sling - 1.3.3-SNAPSHOT + 1.3.4 diff --git a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/parent/pom.xml b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/parent/pom.xml index 212a765..03e411c 100644 --- a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/parent/pom.xml +++ b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/parent/pom.xml @@ -5,7 +5,7 @@ io.wcm.maven io.wcm.maven.aem-global-parent - 2.1.10 + 2.1.12 diff --git a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/parent/pom.xml b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/parent/pom.xml index 20f9eb8..ec443de 100644 --- a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/parent/pom.xml +++ b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/parent/pom.xml @@ -5,7 +5,7 @@ io.wcm.maven io.wcm.maven.aem-global-parent - 2.1.11-SNAPSHOT + 2.1.12 From 9a6d1bdeba39dcfab30be22394b7209bd968172e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Nov 2023 09:50:12 +0000 Subject: [PATCH 11/16] Bump org.apache.commons:commons-lang3 from 3.13.0 to 3.14.0 Bumps org.apache.commons:commons-lang3 from 3.13.0 to 3.14.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-lang3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index e1eb095..7616159 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -118,7 +118,7 @@ org.apache.commons commons-lang3 - 3.13.0 + 3.14.0 commons-io From c500203ad73abf07fd8fcd12b1ee7d2663978cb1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 09:25:55 +0000 Subject: [PATCH 12/16] Bump commons-io:commons-io from 2.15.0 to 2.15.1 Bumps commons-io:commons-io from 2.15.0 to 2.15.1. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 7616159..e9331d1 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -123,7 +123,7 @@ commons-io commons-io - 2.15.0 + 2.15.1 From b5273cb31fb0ea309fd36c94ecf091ab94b4ac55 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 10:02:56 +0000 Subject: [PATCH 13/16] Bump oak.version from 1.58.0 to 1.60.0 Bumps `oak.version` from 1.58.0 to 1.60.0. Updates `org.apache.jackrabbit:oak-security-spi` from 1.58.0 to 1.60.0 Updates `org.apache.jackrabbit:oak-commons` from 1.58.0 to 1.60.0 --- updated-dependencies: - dependency-name: org.apache.jackrabbit:oak-security-spi dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.jackrabbit:oak-commons dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index e9331d1..828a012 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -48,7 +48,7 @@ 3.3.9 - 1.58.0 + 1.60.0 From b88b6c7505bd75d5dee8de7f5a1df3e07cc38447 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Wed, 13 Dec 2023 13:24:27 +0100 Subject: [PATCH 14/16] Update to latest io.wcm.tooling.commons.content-package-builder to fix potential problem with element ordering content packages generated from JSON files --- changes.xml | 6 ++++++ parent/pom.xml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes.xml b/changes.xml index 11e9ec1..63f1958 100644 --- a/changes.xml +++ b/changes.xml @@ -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"> + + + Update to latest io.wcm.tooling.commons.content-package-builder to fix potential problem with element ordering content packages generated from JSON files. + + + Increase SnakeYAML codepoint limit to 64MB (from default 3MB). diff --git a/parent/pom.xml b/parent/pom.xml index 828a012..3b30da1 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -80,7 +80,7 @@ io.wcm.tooling.commons io.wcm.tooling.commons.content-package-builder - 1.7.0 + 1.7.2 io.wcm.tooling.commons From d54af97d9938db3f5f1ed5dbc607322e837550c7 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Mon, 18 Dec 2023 11:32:16 +0100 Subject: [PATCH 15/16] prepare release --- changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes.xml b/changes.xml index 63f1958..a9d3c19 100644 --- a/changes.xml +++ b/changes.xml @@ -23,7 +23,7 @@ xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd"> - + Update to latest io.wcm.tooling.commons.content-package-builder to fix potential problem with element ordering content packages generated from JSON files. From e21d8be303ee843be79f825ed265efcb372577fa Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Mon, 18 Dec 2023 11:32:37 +0100 Subject: [PATCH 16/16] [gitflow-maven-plugin] Update versions for release 2.19.10 --- conga-aem-plugin/pom.xml | 4 ++-- parent/pom.xml | 2 +- pom.xml | 4 ++-- tooling/conga-aem-crypto-cli/pom.xml | 6 +++--- tooling/conga-aem-maven-plugin/pom.xml | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/conga-aem-plugin/pom.xml b/conga-aem-plugin/pom.xml index 155580d..908a863 100644 --- a/conga-aem-plugin/pom.xml +++ b/conga-aem-plugin/pom.xml @@ -25,13 +25,13 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem.parent - 2.19.9-SNAPSHOT + 2.19.10 ../parent/pom.xml io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem - 2.19.9-SNAPSHOT + 2.19.10 jar CONGA AEM Plugin diff --git a/parent/pom.xml b/parent/pom.xml index 3b30da1..36929e3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -31,7 +31,7 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem.parent - 2.19.9-SNAPSHOT + 2.19.10 pom CONGA AEM Plugin diff --git a/pom.xml b/pom.xml index 09cc3c5..b391f8b 100644 --- a/pom.xml +++ b/pom.xml @@ -23,13 +23,13 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem.parent - 2.19.9-SNAPSHOT + 2.19.10 parent/pom.xml io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem.root - 2.19.9-SNAPSHOT + 2.19.10 pom CONGA AEM Plugin diff --git a/tooling/conga-aem-crypto-cli/pom.xml b/tooling/conga-aem-crypto-cli/pom.xml index 3f22462..e486006 100644 --- a/tooling/conga-aem-crypto-cli/pom.xml +++ b/tooling/conga-aem-crypto-cli/pom.xml @@ -25,14 +25,14 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem.parent - 2.19.9-SNAPSHOT + 2.19.10 ../../parent/pom.xml io.wcm.devops.conga.plugins conga-aem-crypto-cli jar - 2.19.9-SNAPSHOT + 2.19.10 CONGA AEM Crypto Command Line Interface Command line tool to generate Crypto keys for AEM. @@ -42,7 +42,7 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem - 2.19.9-SNAPSHOT + 2.19.10 compile diff --git a/tooling/conga-aem-maven-plugin/pom.xml b/tooling/conga-aem-maven-plugin/pom.xml index c4a1cf7..6b806c9 100644 --- a/tooling/conga-aem-maven-plugin/pom.xml +++ b/tooling/conga-aem-maven-plugin/pom.xml @@ -25,14 +25,14 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem.parent - 2.19.9-SNAPSHOT + 2.19.10 ../../parent/pom.xml io.wcm.devops.conga.plugins conga-aem-maven-plugin maven-plugin - 2.19.9-SNAPSHOT + 2.19.10 CONGA AEM Maven Plugin wcm.io DevOps CONGA - CONfiguration GenerAtor Maven Plugin for AEM @@ -62,7 +62,7 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem - 2.19.9-SNAPSHOT + 2.19.10 compile