From 2f7827962b749c8e6528cedc8290586f412e8398 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Thu, 16 Jun 2022 19:29:57 +0200 Subject: [PATCH 1/4] [gitflow-maven-plugin] Update for next development version 2.18.1-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 0f6484d..7a55977 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.18.0 + 2.18.1-SNAPSHOT ../parent/pom.xml io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem - 2.18.0 + 2.18.1-SNAPSHOT jar CONGA AEM Plugin diff --git a/parent/pom.xml b/parent/pom.xml index e3108aa..05d9f10 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.18.0 + 2.18.1-SNAPSHOT pom CONGA AEM Plugin diff --git a/pom.xml b/pom.xml index d333733..8519c39 100644 --- a/pom.xml +++ b/pom.xml @@ -23,13 +23,13 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem.parent - 2.18.0 + 2.18.1-SNAPSHOT parent/pom.xml io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem.root - 2.18.0 + 2.18.1-SNAPSHOT pom CONGA AEM Plugin diff --git a/tooling/conga-aem-crypto-cli/pom.xml b/tooling/conga-aem-crypto-cli/pom.xml index 9698d64..70f3941 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.18.0 + 2.18.1-SNAPSHOT ../../parent/pom.xml io.wcm.devops.conga.plugins conga-aem-crypto-cli jar - 2.18.0 + 2.18.1-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.18.0 + 2.18.1-SNAPSHOT compile diff --git a/tooling/conga-aem-maven-plugin/pom.xml b/tooling/conga-aem-maven-plugin/pom.xml index 0f2e40f..cbd4f9b 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.18.0 + 2.18.1-SNAPSHOT ../../parent/pom.xml io.wcm.devops.conga.plugins conga-aem-maven-plugin maven-plugin - 2.18.0 + 2.18.1-SNAPSHOT CONGA AEM Maven Plugin wcm.io DevOps CONGA - CONfiguration GenerAtor Maven Plugin for AEM @@ -63,7 +63,7 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem - 2.18.0 + 2.18.1-SNAPSHOT compile From 64bcc650cae5249cc43a85e64fbc9aa26a1929f2 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Fri, 17 Jun 2022 10:18:18 +0200 Subject: [PATCH 2/4] conga-aem-maven-plugin: Add explicit handling for responses with invalid JSON payload for packager manager install status and bundle status calls. --- changes.xml | 6 ++++++ parent/pom.xml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes.xml b/changes.xml index 13fb035..6ba86f9 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"> + + + conga-aem-maven-plugin: Add explicit handling for responses with invalid JSON payload for packager manager install status and bundle status calls. + + + conga-aem-maven-plugin: Add parameter "runModeOptimization" to "cloudmanager-all-package" goal, set by default to OFF. diff --git a/parent/pom.xml b/parent/pom.xml index 05d9f10..b537e57 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -75,7 +75,7 @@ io.wcm.tooling.commons io.wcm.tooling.commons.crx-packmgr-helper - 2.1.0 + 2.1.1-SNAPSHOT From ea75478fbcbd9a33572a6b82174593ed6e0c1d43 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Mon, 20 Jun 2022 13:10:56 +0200 Subject: [PATCH 3/4] prepare release --- changes.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changes.xml b/changes.xml index 6ba86f9..28b9a90 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"> - + conga-aem-maven-plugin: Add explicit handling for responses with invalid JSON payload for packager manager install status and bundle status calls. diff --git a/parent/pom.xml b/parent/pom.xml index b537e57..ea9097d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -75,7 +75,7 @@ io.wcm.tooling.commons io.wcm.tooling.commons.crx-packmgr-helper - 2.1.1-SNAPSHOT + 2.1.2 From 854e5234cc516dc2d0b315ac63146768b28aaac5 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Mon, 20 Jun 2022 13:11:36 +0200 Subject: [PATCH 4/4] [gitflow-maven-plugin] Update versions for release 2.18.2 --- 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 7a55977..fbc8189 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.18.1-SNAPSHOT + 2.18.2 ../parent/pom.xml io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem - 2.18.1-SNAPSHOT + 2.18.2 jar CONGA AEM Plugin diff --git a/parent/pom.xml b/parent/pom.xml index ea9097d..3504f6e 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.18.1-SNAPSHOT + 2.18.2 pom CONGA AEM Plugin diff --git a/pom.xml b/pom.xml index 8519c39..463d669 100644 --- a/pom.xml +++ b/pom.xml @@ -23,13 +23,13 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem.parent - 2.18.1-SNAPSHOT + 2.18.2 parent/pom.xml io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem.root - 2.18.1-SNAPSHOT + 2.18.2 pom CONGA AEM Plugin diff --git a/tooling/conga-aem-crypto-cli/pom.xml b/tooling/conga-aem-crypto-cli/pom.xml index 70f3941..2b7ba52 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.18.1-SNAPSHOT + 2.18.2 ../../parent/pom.xml io.wcm.devops.conga.plugins conga-aem-crypto-cli jar - 2.18.1-SNAPSHOT + 2.18.2 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.18.1-SNAPSHOT + 2.18.2 compile diff --git a/tooling/conga-aem-maven-plugin/pom.xml b/tooling/conga-aem-maven-plugin/pom.xml index cbd4f9b..8ce4d2e 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.18.1-SNAPSHOT + 2.18.2 ../../parent/pom.xml io.wcm.devops.conga.plugins conga-aem-maven-plugin maven-plugin - 2.18.1-SNAPSHOT + 2.18.2 CONGA AEM Maven Plugin wcm.io DevOps CONGA - CONfiguration GenerAtor Maven Plugin for AEM @@ -63,7 +63,7 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem - 2.18.1-SNAPSHOT + 2.18.2 compile