From 7f6e265be9b997c5e2d0ad2ca40089383fc33163 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Mon, 4 Sep 2023 16:41:07 +0200 Subject: [PATCH] Core Components 2.23.2 (#14) --- build-deploy_aem65.sh | 2 +- bundles/core/pom.xml | 4 ++-- .../impl/models/v2/form/FormsHelperStubber.java | 2 +- changes.xml | 5 ++++- 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 | 8 ++++---- pom.xml | 4 ++-- src/site/markdown/index.md | 1 + 12 files changed, 28 insertions(+), 24 deletions(-) diff --git a/build-deploy_aem65.sh b/build-deploy_aem65.sh index b069249b..0c4f88f4 100644 --- a/build-deploy_aem65.sh +++ b/build-deploy_aem65.sh @@ -26,7 +26,7 @@ fi # install AEM 6.5 with service pack mvn --non-recursive wcmio-content-package:install \ --activate-profiles=${MAVEN_PROFILES} \ - -Dvault.artifact=adobe.binary.aem.65.servicepack:aem-service-pkg:zip:6.5.16.0 \ + -Dvault.artifact=adobe.binary.aem.65.servicepack:aem-service-pkg:zip:6.5.18.0 \ -Dvault.delayAfterInstallSec=30 if [ "$?" -ne "0" ]; then diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml index ab80cde6..582489b7 100644 --- a/bundles/core/pom.xml +++ b/bundles/core/pom.xml @@ -25,13 +25,13 @@ io.wcm io.wcm.wcm.core.components.parent - 1.14.0-2.22.6-SNAPSHOT + 1.14.0-2.23.2-SNAPSHOT ../../parent/pom.xml io.wcm io.wcm.wcm.core.components - 1.14.0-2.22.6-SNAPSHOT + 1.14.0-2.23.2-SNAPSHOT jar WCM Core Components diff --git a/bundles/core/src/test/java/io/wcm/wcm/core/components/impl/models/v2/form/FormsHelperStubber.java b/bundles/core/src/test/java/io/wcm/wcm/core/components/impl/models/v2/form/FormsHelperStubber.java index 5e9b1b00..bf3c72f5 100644 --- a/bundles/core/src/test/java/io/wcm/wcm/core/components/impl/models/v2/form/FormsHelperStubber.java +++ b/bundles/core/src/test/java/io/wcm/wcm/core/components/impl/models/v2/form/FormsHelperStubber.java @@ -60,7 +60,7 @@ static void createStub() { // remove the static initializer block calling new on impl class. ctClass.removeConstructor(ctClass.getClassInitializer()); // load the stubbed class - ctClass.toClass(); + ctClass.toClass(com.day.cq.wcm.foundation.forms.FormsConstants.class); } catch (NotFoundException | CannotCompileException ex) { throw new RuntimeException(ex); diff --git a/changes.xml b/changes.xml index ad39c420..a405cea4 100644 --- a/changes.xml +++ b/changes.xml @@ -23,10 +23,13 @@ xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd"> - + Add Image (v3). + + Update to AEM WCM Core Components 2.23.2. + diff --git a/examples/bundles/examples-core/pom.xml b/examples/bundles/examples-core/pom.xml index 9607467a..10cfaa94 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 - 1.14.0-2.22.6-SNAPSHOT + 1.14.0-2.23.2-SNAPSHOT ../../../parent/pom.xml io.wcm.samples io.wcm.wcm.core.components.examples-core - 1.14.0-2.22.6-SNAPSHOT + 1.14.0-2.23.2-SNAPSHOT jar WCM Core Components Examples Core @@ -44,7 +44,7 @@ io.wcm io.wcm.wcm.core.components - 1.14.0-2.22.6-SNAPSHOT + 1.14.0-2.23.2-SNAPSHOT compile diff --git a/examples/content-packages/examples-libs/pom.xml b/examples/content-packages/examples-libs/pom.xml index 92ae6a31..de330e57 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 - 1.14.0-2.22.6-SNAPSHOT + 1.14.0-2.23.2-SNAPSHOT ../../../parent/pom.xml io.wcm.samples io.wcm.wcm.core.components.examples-libs - 1.14.0-2.22.6-SNAPSHOT + 1.14.0-2.23.2-SNAPSHOT content-package WCM Core Components Examples wcm.io Libraries @@ -42,7 +42,7 @@ io.wcm io.wcm.wcm.core.components - 1.14.0-2.22.6-SNAPSHOT + 1.14.0-2.23.2-SNAPSHOT compile diff --git a/examples/content-packages/examples-sample-content/pom.xml b/examples/content-packages/examples-sample-content/pom.xml index b76c7ad9..6968846e 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 - 1.14.0-2.22.6-SNAPSHOT + 1.14.0-2.23.2-SNAPSHOT ../../../parent/pom.xml io.wcm.samples io.wcm.wcm.core.components.examples-sample-content - 1.14.0-2.22.6-SNAPSHOT + 1.14.0-2.23.2-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 054c5f17..a73590fc 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 - 1.14.0-2.22.6-SNAPSHOT + 1.14.0-2.23.2-SNAPSHOT ../../../parent/pom.xml io.wcm.samples io.wcm.wcm.core.components.examples - 1.14.0-2.22.6-SNAPSHOT + 1.14.0-2.23.2-SNAPSHOT content-package WCM Core Components Examples @@ -42,7 +42,7 @@ io.wcm.samples io.wcm.wcm.core.components.examples-core - 1.14.0-2.22.6-SNAPSHOT + 1.14.0-2.23.2-SNAPSHOT compile diff --git a/examples/pom.xml b/examples/pom.xml index 1bce240b..d21b4a3a 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -25,13 +25,13 @@ io.wcm io.wcm.wcm.core.components.parent - 1.14.0-2.22.6-SNAPSHOT + 1.14.0-2.23.2-SNAPSHOT ../parent/pom.xml io.wcm.samples io.wcm.wcm.core.components.examples.root - 1.14.0-2.22.6-SNAPSHOT + 1.14.0-2.23.2-SNAPSHOT pom diff --git a/parent/pom.xml b/parent/pom.xml index 29967e17..73b5e87e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -31,7 +31,7 @@ io.wcm io.wcm.wcm.core.components.parent - 1.14.0-2.22.6-SNAPSHOT + 1.14.0-2.23.2-SNAPSHOT pom WCM Core Components @@ -48,13 +48,13 @@ - 2.22.6 + 2.23.2 http://localhost:4502 http://localhost:4503 - 2023-09-02T12:42:05Z + 2023-09-04T13:32:18Z @@ -63,7 +63,7 @@ io.wcm.maven io.wcm.maven.aem-dependencies - 6.5.14.0000 + 6.5.17.0001 pom import diff --git a/pom.xml b/pom.xml index 0ceb612a..72e7a591 100644 --- a/pom.xml +++ b/pom.xml @@ -25,13 +25,13 @@ io.wcm io.wcm.wcm.core.components.parent - 1.14.0-2.22.6-SNAPSHOT + 1.14.0-2.23.2-SNAPSHOT parent/pom.xml io.wcm io.wcm.wcm.core.components.root - 1.14.0-2.22.6-SNAPSHOT + 1.14.0-2.23.2-SNAPSHOT pom ${site.url}/${site.url.module.prefix}/ diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md index 8ed44bac..cfd5eb2b 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 |-----------------------------------|----------------------------------|--------------------------------------------- +| 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 | 1.12.0-2.20.0 | 2.20.0 and up | AEM 6.5.13, AEMaaCS | 1.11.0-2.19.0 | 2.19.0 and up | AEM 6.5.7, AEMaaCS