From eeab6f4ca41041639579ab80144a27b5da911c64 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Fri, 30 Sep 2022 10:21:40 +0200 Subject: [PATCH 01/11] [gitflow-maven-plugin] Update for next development version 2.0.17-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5267df4..a77b0ed 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ io.wcm.maven io.wcm.maven.aem-global-parent - 2.0.16 + 2.0.17-SNAPSHOT pom io.wcm.maven.aem-global-parent From acf0fa44685e3f1255c2bae4a3058b1e91f824b1 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Fri, 14 Oct 2022 15:07:28 +0200 Subject: [PATCH 02/11] Update CONGA AEM plugin. --- changes.xml | 6 ++++++ pom.xml | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes.xml b/changes.xml index 5f900fc..27a3863 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 CONGA AEM plugin. + + + Update to wcmio-content-package-maven-plugin 2.1.6. diff --git a/pom.xml b/pom.xml index a77b0ed..5007038 100644 --- a/pom.xml +++ b/pom.xml @@ -490,7 +490,7 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem - 2.18.4 + 2.18.5-SNAPSHOT io.wcm.devops.conga.plugins @@ -502,7 +502,7 @@ io.wcm.devops.conga.plugins conga-aem-maven-plugin - 2.18.4 + 2.18.5-SNAPSHOT ${sling.url}/crx/packmgr/service ${sling.vault.user} From 1d5f8ca9a3b7d6b97d31968b992a5f363cc9adf1 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Mon, 17 Oct 2022 17:56:52 +0200 Subject: [PATCH 03/11] update dependency --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5007038..f9b10b3 100644 --- a/pom.xml +++ b/pom.xml @@ -490,7 +490,7 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem - 2.18.5-SNAPSHOT + 2.18.6 io.wcm.devops.conga.plugins @@ -502,7 +502,7 @@ io.wcm.devops.conga.plugins conga-aem-maven-plugin - 2.18.5-SNAPSHOT + 2.18.6 ${sling.url}/crx/packmgr/service ${sling.vault.user} From 664620d7dc1d75e8619324138cfec73ed1d8c3bb Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Wed, 9 Nov 2022 13:34:18 +0100 Subject: [PATCH 04/11] Update global-parent dependency to 48. --- changes.xml | 3 +++ pom.xml | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/changes.xml b/changes.xml index 27a3863..7b40886 100644 --- a/changes.xml +++ b/changes.xml @@ -27,6 +27,9 @@ Update CONGA AEM plugin. + + Update global-parent dependency to 48. + diff --git a/pom.xml b/pom.xml index f9b10b3..402fe55 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ io.wcm.maven io.wcm.maven.global-parent - 47 + 48-SNAPSHOT @@ -490,7 +490,7 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem - 2.18.6 + 2.18.7-SNAPSHOT io.wcm.devops.conga.plugins @@ -502,7 +502,7 @@ io.wcm.devops.conga.plugins conga-aem-maven-plugin - 2.18.6 + 2.18.7-SNAPSHOT ${sling.url}/crx/packmgr/service ${sling.vault.user} From cf1d6f5f91f6b7df232155cfadfb83730d204b85 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Thu, 10 Nov 2022 13:28:45 +0100 Subject: [PATCH 05/11] update dependency --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 402fe55..03758bb 100644 --- a/pom.xml +++ b/pom.xml @@ -490,7 +490,7 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem - 2.18.7-SNAPSHOT + 2.19.0 io.wcm.devops.conga.plugins @@ -502,7 +502,7 @@ io.wcm.devops.conga.plugins conga-aem-maven-plugin - 2.18.7-SNAPSHOT + 2.19.0 ${sling.url}/crx/packmgr/service ${sling.vault.user} From 6f967d889523205f50ee833f047bad328725766e Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Fri, 11 Nov 2022 12:45:18 +0100 Subject: [PATCH 06/11] Update aem-nodetypes to 2022.10.0. --- changes.xml | 3 +++ pom.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes.xml b/changes.xml index 7b40886..d9b6241 100644 --- a/changes.xml +++ b/changes.xml @@ -27,6 +27,9 @@ Update CONGA AEM plugin. + + Update aem-nodetypes to 2022.10.0. + Update global-parent dependency to 48. diff --git a/pom.xml b/pom.xml index 03758bb..d824f5f 100644 --- a/pom.xml +++ b/pom.xml @@ -386,7 +386,7 @@ - 2020.11.0 + 2022.10.0 io.wcm.tooling.nodetypes From a5b4f67ac70c8b6275c10ca24c244e11a4ed3330 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Nov 2022 19:09:25 +0000 Subject: [PATCH 07/11] Bump bnd.version from 6.3.1 to 6.4.0 Bumps `bnd.version` from 6.3.1 to 6.4.0. Updates `bnd-maven-plugin` from 6.3.1 to 6.4.0 - [Release notes](https://github.com/bndtools/bnd/releases) - [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md) - [Commits](https://github.com/bndtools/bnd/compare/6.3.1...6.4.0) Updates `bnd-baseline-maven-plugin` from 6.3.1 to 6.4.0 - [Release notes](https://github.com/bndtools/bnd/releases) - [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md) - [Commits](https://github.com/bndtools/bnd/compare/6.3.1...6.4.0) --- updated-dependencies: - dependency-name: biz.aQute.bnd:bnd-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: biz.aQute.bnd:bnd-baseline-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d824f5f..7b2c398 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ 3.0.2 - 6.3.1 + 6.4.0 From 21f62f35c54563691ff36c3b46080fb33956c12d Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Wed, 30 Nov 2022 20:46:56 +0100 Subject: [PATCH 08/11] update changelog --- changes.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes.xml b/changes.xml index d9b6241..761d251 100644 --- a/changes.xml +++ b/changes.xml @@ -27,6 +27,9 @@ Update CONGA AEM plugin. + + Update to bnd Maven plugins 6.4.0. + Update aem-nodetypes to 2022.10.0. From f1f940eaeb6d9a59bfc8d15ad19b2db401b6adda Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Dec 2022 09:57:42 +0100 Subject: [PATCH 09/11] Bump aemanalyser-maven-plugin from 1.4.16 to 1.5.8 (#10) --- changes.xml | 3 +++ pom.xml | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/changes.xml b/changes.xml index 761d251..10eb3e6 100644 --- a/changes.xml +++ b/changes.xml @@ -27,6 +27,9 @@ Update CONGA AEM plugin. + + Update to AEM Analyser plugin 1.5.8. + Update to bnd Maven plugins 6.4.0. diff --git a/pom.xml b/pom.xml index 7b2c398..cf75153 100644 --- a/pom.xml +++ b/pom.xml @@ -399,8 +399,7 @@ com.adobe.aem aemanalyser-maven-plugin - - 1.4.16 + 1.5.8 From a7ed0c6d790c917fc1629e0572640aac72f7f5c7 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Thu, 15 Dec 2022 11:55:16 +0100 Subject: [PATCH 10/11] prepare release --- changes.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changes.xml b/changes.xml index 10eb3e6..dd0e3e1 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 CONGA AEM plugin. diff --git a/pom.xml b/pom.xml index cf75153..f375108 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ io.wcm.maven io.wcm.maven.global-parent - 48-SNAPSHOT + 48 From 0f3de4eae4ca6927f69384a8742f3fdc2ebfcbd6 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Thu, 15 Dec 2022 11:57:02 +0100 Subject: [PATCH 11/11] [gitflow-maven-plugin] Update versions for release 2.0.18 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f375108..20be29d 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ io.wcm.maven io.wcm.maven.aem-global-parent - 2.0.17-SNAPSHOT + 2.0.18 pom io.wcm.maven.aem-global-parent