From 72f825415de96d4a193bd08c60d59991622d0fd0 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Mon, 27 May 2024 13:57:17 +0200 Subject: [PATCH 1/5] Update to AEM WCM Core Components 2.25.4 --- bundles/core/pom.xml | 4 ++-- changes.xml | 6 ++++++ examples/bundles/examples-core/pom.xml | 6 +++--- examples/content-packages/examples-libs/pom.xml | 6 +++--- examples/content-packages/examples-sample-content/pom.xml | 4 ++-- examples/content-packages/examples/pom.xml | 6 +++--- examples/pom.xml | 4 ++-- parent/pom.xml | 6 +++--- pom.xml | 4 ++-- 9 files changed, 26 insertions(+), 20 deletions(-) diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml index fa872de..61c50f2 100644 --- a/bundles/core/pom.xml +++ b/bundles/core/pom.xml @@ -25,13 +25,13 @@ io.wcm io.wcm.wcm.core.components.parent - 2.0.3-2.23.2-SNAPSHOT + 2.1.0-2.25.4-SNAPSHOT ../../parent/pom.xml io.wcm io.wcm.wcm.core.components - 2.0.3-2.23.2-SNAPSHOT + 2.1.0-2.25.4-SNAPSHOT jar WCM Core Components diff --git a/changes.xml b/changes.xml index 48c1ff8..9e4cebb 100644 --- a/changes.xml +++ b/changes.xml @@ -23,6 +23,12 @@ xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd"> + + + Update to AEM WCM Core Components 2.25.4. + + + Download (v1/v2): Don't display file size if it is not available. diff --git a/examples/bundles/examples-core/pom.xml b/examples/bundles/examples-core/pom.xml index 3821dcd..7251d30 100644 --- a/examples/bundles/examples-core/pom.xml +++ b/examples/bundles/examples-core/pom.xml @@ -25,13 +25,13 @@ io.wcm io.wcm.wcm.core.components.parent - 2.0.3-2.23.2-SNAPSHOT + 2.1.0-2.25.4-SNAPSHOT ../../../parent/pom.xml io.wcm.samples io.wcm.wcm.core.components.examples-core - 2.0.3-2.23.2-SNAPSHOT + 2.1.0-2.25.4-SNAPSHOT jar WCM Core Components Examples Core @@ -44,7 +44,7 @@ io.wcm io.wcm.wcm.core.components - 2.0.3-2.23.2-SNAPSHOT + 2.1.0-2.25.4-SNAPSHOT compile diff --git a/examples/content-packages/examples-libs/pom.xml b/examples/content-packages/examples-libs/pom.xml index a2933a6..94d4ae5 100644 --- a/examples/content-packages/examples-libs/pom.xml +++ b/examples/content-packages/examples-libs/pom.xml @@ -25,13 +25,13 @@ io.wcm io.wcm.wcm.core.components.parent - 2.0.3-2.23.2-SNAPSHOT + 2.1.0-2.25.4-SNAPSHOT ../../../parent/pom.xml io.wcm.samples io.wcm.wcm.core.components.examples-libs - 2.0.3-2.23.2-SNAPSHOT + 2.1.0-2.25.4-SNAPSHOT content-package WCM Core Components Examples wcm.io Libraries @@ -42,7 +42,7 @@ io.wcm io.wcm.wcm.core.components - 2.0.3-2.23.2-SNAPSHOT + 2.1.0-2.25.4-SNAPSHOT compile diff --git a/examples/content-packages/examples-sample-content/pom.xml b/examples/content-packages/examples-sample-content/pom.xml index 41f030e..742252d 100644 --- a/examples/content-packages/examples-sample-content/pom.xml +++ b/examples/content-packages/examples-sample-content/pom.xml @@ -25,13 +25,13 @@ io.wcm io.wcm.wcm.core.components.parent - 2.0.3-2.23.2-SNAPSHOT + 2.1.0-2.25.4-SNAPSHOT ../../../parent/pom.xml io.wcm.samples io.wcm.wcm.core.components.examples-sample-content - 2.0.3-2.23.2-SNAPSHOT + 2.1.0-2.25.4-SNAPSHOT content-package WCM Core Components Examples Content diff --git a/examples/content-packages/examples/pom.xml b/examples/content-packages/examples/pom.xml index 3883392..165b5d8 100644 --- a/examples/content-packages/examples/pom.xml +++ b/examples/content-packages/examples/pom.xml @@ -25,13 +25,13 @@ io.wcm io.wcm.wcm.core.components.parent - 2.0.3-2.23.2-SNAPSHOT + 2.1.0-2.25.4-SNAPSHOT ../../../parent/pom.xml io.wcm.samples io.wcm.wcm.core.components.examples - 2.0.3-2.23.2-SNAPSHOT + 2.1.0-2.25.4-SNAPSHOT content-package WCM Core Components Examples @@ -42,7 +42,7 @@ io.wcm.samples io.wcm.wcm.core.components.examples-core - 2.0.3-2.23.2-SNAPSHOT + 2.1.0-2.25.4-SNAPSHOT compile diff --git a/examples/pom.xml b/examples/pom.xml index 3fb9d44..1a7884c 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -25,13 +25,13 @@ io.wcm io.wcm.wcm.core.components.parent - 2.0.3-2.23.2-SNAPSHOT + 2.1.0-2.25.4-SNAPSHOT ../parent/pom.xml io.wcm.samples io.wcm.wcm.core.components.examples.root - 2.0.3-2.23.2-SNAPSHOT + 2.1.0-2.25.4-SNAPSHOT pom diff --git a/parent/pom.xml b/parent/pom.xml index 0f94bf2..fa0c820 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -31,7 +31,7 @@ io.wcm io.wcm.wcm.core.components.parent - 2.0.3-2.23.2-SNAPSHOT + 2.1.0-2.25.4-SNAPSHOT pom WCM Core Components @@ -48,13 +48,13 @@ - 2.23.2 + 2.25.4 http://localhost:4502 http://localhost:4503 - 2024-03-13T09:42:26Z + 2024-05-27T11:55:03Z diff --git a/pom.xml b/pom.xml index c98586a..35aaf68 100644 --- a/pom.xml +++ b/pom.xml @@ -25,13 +25,13 @@ io.wcm io.wcm.wcm.core.components.parent - 2.0.3-2.23.2-SNAPSHOT + 2.1.0-2.25.4-SNAPSHOT parent/pom.xml io.wcm io.wcm.wcm.core.components.root - 2.0.3-2.23.2-SNAPSHOT + 2.1.0-2.25.4-SNAPSHOT pom ${site.url}/${site.url.module.prefix}/ From 5a87ba7a5825353f475801d1c37bb44d399f9b15 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Mon, 27 May 2024 14:43:24 +0200 Subject: [PATCH 2/5] apply forceIgnoreFreshness="true" to checkbox attributes in image components which may be created via drag&drop, as in https://github.com/adobe/aem-core-wcm-components/pull/2735 --- .../main/webapp/app-root/components/image/v3/image.json | 1 + .../wcmio/responsiveimage/v1/responsiveimage.json | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/bundles/core/src/main/webapp/app-root/components/image/v3/image.json b/bundles/core/src/main/webapp/app-root/components/image/v3/image.json index 787d3ff..eb551ec 100644 --- a/bundles/core/src/main/webapp/app-root/components/image/v3/image.json +++ b/bundles/core/src/main/webapp/app-root/components/image/v3/image.json @@ -29,6 +29,7 @@ /** Overwrite property to switch default value to unchecked */ "imageFromPageImage": { "uncheckedValue": "false", + "forceIgnoreFreshness": true, "name": "./imageFromPageImage", "text": "Inherit featured image from page", "value": true, diff --git a/bundles/core/src/main/webapp/app-root/components/wcmio/responsiveimage/v1/responsiveimage.json b/bundles/core/src/main/webapp/app-root/components/wcmio/responsiveimage/v1/responsiveimage.json index 9530dc8..6f7adbc 100644 --- a/bundles/core/src/main/webapp/app-root/components/wcmio/responsiveimage/v1/responsiveimage.json +++ b/bundles/core/src/main/webapp/app-root/components/wcmio/responsiveimage/v1/responsiveimage.json @@ -130,6 +130,7 @@ "titleValueFromDAM": { "sling:resourceType": "granite/ui/components/coral/foundation/form/checkbox", "uncheckedValue": "false", + "forceIgnoreFreshness": true, "name": "./titleValueFromDAM", "text": "Get caption from DAM", "value": true, @@ -143,6 +144,7 @@ "displayPopupTitle": { "sling:resourceType": "granite/ui/components/coral/foundation/form/checkbox", "uncheckedValue": "false", + "forceIgnoreFreshness": true, "name": "./displayPopupTitle", "text": "Display caption as pop-up", "value": true, @@ -207,6 +209,7 @@ "decorative": { "sling:resourceType": "granite/ui/components/coral/foundation/form/checkbox", "uncheckedValue": "false", + "forceIgnoreFreshness": true, "name": "./isDecorative", "text": "Image is decorative", "value": true, @@ -215,6 +218,7 @@ "altValueFromDAM": { "sling:resourceType": "granite/ui/components/coral/foundation/form/checkbox", "uncheckedValue": "false", + "forceIgnoreFreshness": true, "name": "./altValueFromDAM", "text": "Get alternative text from DAM", "value": true, @@ -224,6 +228,7 @@ "titleValueFromDAM": { "sling:resourceType": "granite/ui/components/coral/foundation/form/checkbox", "uncheckedValue": "false", + "forceIgnoreFreshness": true, "name": "./titleValueFromDAM", "text": "Get caption from DAM", "value": true, @@ -233,6 +238,7 @@ "displayCaptionPopup": { "sling:resourceType": "granite/ui/components/coral/foundation/form/checkbox", "uncheckedValue": "false", + "forceIgnoreFreshness": true, "name": "./displayPopupTitle", "text": "Display caption as pop-up", "value": true, @@ -242,6 +248,7 @@ "disableUuidTracking": { "sling:resourceType": "granite/ui/components/coral/foundation/form/checkbox", "uncheckedValue": "false", + "forceIgnoreFreshness": true, "name": "./uuidDisabled", "text": "Disable UUID tracking", "value": true, @@ -282,6 +289,7 @@ "sling:resourceType": "granite/ui/components/coral/foundation/form/checkbox", "uncheckedValue": false, "granite:class": "js-cq-ImageEditor-allowUpload", + "forceIgnoreFreshness": true, "name": "./allowUpload", "text": "Allow asset upload from file system", "value": true, From 0dcd608a81e701e808d94ed660690a8cdee182b7 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Mon, 27 May 2024 14:48:09 +0200 Subject: [PATCH 3/5] set back version --- bundles/core/pom.xml | 4 ++-- changes.xml | 2 +- examples/bundles/examples-core/pom.xml | 6 +++--- examples/content-packages/examples-libs/pom.xml | 6 +++--- examples/content-packages/examples-sample-content/pom.xml | 4 ++-- examples/content-packages/examples/pom.xml | 6 +++--- examples/pom.xml | 4 ++-- parent/pom.xml | 4 ++-- pom.xml | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml index 61c50f2..b33cc70 100644 --- a/bundles/core/pom.xml +++ b/bundles/core/pom.xml @@ -25,13 +25,13 @@ io.wcm io.wcm.wcm.core.components.parent - 2.1.0-2.25.4-SNAPSHOT + 2.0.4-2.25.4-SNAPSHOT ../../parent/pom.xml io.wcm io.wcm.wcm.core.components - 2.1.0-2.25.4-SNAPSHOT + 2.0.4-2.25.4-SNAPSHOT jar WCM Core Components diff --git a/changes.xml b/changes.xml index 9e4cebb..195e826 100644 --- a/changes.xml +++ b/changes.xml @@ -23,7 +23,7 @@ xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd"> - + Update to AEM WCM Core Components 2.25.4. diff --git a/examples/bundles/examples-core/pom.xml b/examples/bundles/examples-core/pom.xml index 7251d30..e2da0ff 100644 --- a/examples/bundles/examples-core/pom.xml +++ b/examples/bundles/examples-core/pom.xml @@ -25,13 +25,13 @@ io.wcm io.wcm.wcm.core.components.parent - 2.1.0-2.25.4-SNAPSHOT + 2.0.4-2.25.4-SNAPSHOT ../../../parent/pom.xml io.wcm.samples io.wcm.wcm.core.components.examples-core - 2.1.0-2.25.4-SNAPSHOT + 2.0.4-2.25.4-SNAPSHOT jar WCM Core Components Examples Core @@ -44,7 +44,7 @@ io.wcm io.wcm.wcm.core.components - 2.1.0-2.25.4-SNAPSHOT + 2.0.4-2.25.4-SNAPSHOT compile diff --git a/examples/content-packages/examples-libs/pom.xml b/examples/content-packages/examples-libs/pom.xml index 94d4ae5..b8bf385 100644 --- a/examples/content-packages/examples-libs/pom.xml +++ b/examples/content-packages/examples-libs/pom.xml @@ -25,13 +25,13 @@ io.wcm io.wcm.wcm.core.components.parent - 2.1.0-2.25.4-SNAPSHOT + 2.0.4-2.25.4-SNAPSHOT ../../../parent/pom.xml io.wcm.samples io.wcm.wcm.core.components.examples-libs - 2.1.0-2.25.4-SNAPSHOT + 2.0.4-2.25.4-SNAPSHOT content-package WCM Core Components Examples wcm.io Libraries @@ -42,7 +42,7 @@ io.wcm io.wcm.wcm.core.components - 2.1.0-2.25.4-SNAPSHOT + 2.0.4-2.25.4-SNAPSHOT compile diff --git a/examples/content-packages/examples-sample-content/pom.xml b/examples/content-packages/examples-sample-content/pom.xml index 742252d..81662bf 100644 --- a/examples/content-packages/examples-sample-content/pom.xml +++ b/examples/content-packages/examples-sample-content/pom.xml @@ -25,13 +25,13 @@ io.wcm io.wcm.wcm.core.components.parent - 2.1.0-2.25.4-SNAPSHOT + 2.0.4-2.25.4-SNAPSHOT ../../../parent/pom.xml io.wcm.samples io.wcm.wcm.core.components.examples-sample-content - 2.1.0-2.25.4-SNAPSHOT + 2.0.4-2.25.4-SNAPSHOT content-package WCM Core Components Examples Content diff --git a/examples/content-packages/examples/pom.xml b/examples/content-packages/examples/pom.xml index 165b5d8..3a293ad 100644 --- a/examples/content-packages/examples/pom.xml +++ b/examples/content-packages/examples/pom.xml @@ -25,13 +25,13 @@ io.wcm io.wcm.wcm.core.components.parent - 2.1.0-2.25.4-SNAPSHOT + 2.0.4-2.25.4-SNAPSHOT ../../../parent/pom.xml io.wcm.samples io.wcm.wcm.core.components.examples - 2.1.0-2.25.4-SNAPSHOT + 2.0.4-2.25.4-SNAPSHOT content-package WCM Core Components Examples @@ -42,7 +42,7 @@ io.wcm.samples io.wcm.wcm.core.components.examples-core - 2.1.0-2.25.4-SNAPSHOT + 2.0.4-2.25.4-SNAPSHOT compile diff --git a/examples/pom.xml b/examples/pom.xml index 1a7884c..ae55a1c 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -25,13 +25,13 @@ io.wcm io.wcm.wcm.core.components.parent - 2.1.0-2.25.4-SNAPSHOT + 2.0.4-2.25.4-SNAPSHOT ../parent/pom.xml io.wcm.samples io.wcm.wcm.core.components.examples.root - 2.1.0-2.25.4-SNAPSHOT + 2.0.4-2.25.4-SNAPSHOT pom diff --git a/parent/pom.xml b/parent/pom.xml index fa0c820..c070418 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -31,7 +31,7 @@ io.wcm io.wcm.wcm.core.components.parent - 2.1.0-2.25.4-SNAPSHOT + 2.0.4-2.25.4-SNAPSHOT pom WCM Core Components @@ -54,7 +54,7 @@ http://localhost:4503 - 2024-05-27T11:55:03Z + 2024-05-27T12:47:47Z diff --git a/pom.xml b/pom.xml index 35aaf68..750f865 100644 --- a/pom.xml +++ b/pom.xml @@ -25,13 +25,13 @@ io.wcm io.wcm.wcm.core.components.parent - 2.1.0-2.25.4-SNAPSHOT + 2.0.4-2.25.4-SNAPSHOT parent/pom.xml io.wcm io.wcm.wcm.core.components.root - 2.1.0-2.25.4-SNAPSHOT + 2.0.4-2.25.4-SNAPSHOT pom ${site.url}/${site.url.module.prefix}/ From 5744288e38935105e98b24b4cda886d61d437d82 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Mon, 27 May 2024 14:49:49 +0200 Subject: [PATCH 4/5] update changelog --- changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes.xml b/changes.xml index 195e826..06bfd76 100644 --- a/changes.xml +++ b/changes.xml @@ -24,7 +24,7 @@ - + Update to AEM WCM Core Components 2.25.4. From a9f4e4853cc1fe998c52535103a009ea7e2627e5 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Mon, 27 May 2024 14:55:48 +0200 Subject: [PATCH 5/5] update changelog --- changes.xml | 3 +++ src/site/markdown/index.md | 1 + 2 files changed, 4 insertions(+) diff --git a/changes.xml b/changes.xml index 06bfd76..8ff0568 100644 --- a/changes.xml +++ b/changes.xml @@ -27,6 +27,9 @@ Update to AEM WCM Core Components 2.25.4. + PR #2735). + ]]> diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md index 84c6db9..bcb76bd 100644 --- a/src/site/markdown/index.md +++ b/src/site/markdown/index.md @@ -35,6 +35,7 @@ There is currently no added wcm.io support for the Core Component AMP extensions |wcm.io WCM Core Components version | AEM Sites Core Component version | AEM version supported |-----------------------------------|----------------------------------|--------------------------------------------- +| 2.0.4-2.25.4 | 2.25.4 and up | AEM 6.5.17, AEMaaCS | 2.0.x-2.23.2 | 2.23.2, 2.24.6 and up | AEM 6.5.17, AEMaaCS | 1.14.0-2.23.2 | 2.23.2 and up | AEM 6.5.17, AEMaaCS | 1.13.0-2.22.6 | 2.22.6 and up | AEM 6.5.14, AEMaaCS