diff --git a/README.md b/README.md index 483540569f..3d60804640 100644 --- a/README.md +++ b/README.md @@ -96,7 +96,9 @@ For existing projects, take example from the [AEM Project Archetype](https://git Core Components | AEM as a Cloud Service | AEM 6.5 | AEM 6.4 | Java SE | Maven ----------------|------------------------|---------|---------|---------|--------- -[2.10.0](https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.10.0) | Continual | 6.5.5.0+ | 6.4.8.1+ | 8, 11 | 3.3.9+ +[2.11.0](https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.11.0) | Continual | 6.5.5.0+ (*) | 6.4.8.1+ (*) | 8, 11 | 3.3.9+ + +(*) - Version 2.11.0 requires `org.apache.sling.models.impl` version 1.4.12 or higher (because of [SLING-8781](https://issues.apache.org/jira/browse/SLING-8781)). This will be provided for AEM 6.4 and 6.5 in a future Service Pack. Until then, the Sling Models bundle is included in the `core.wcm.components.all` package. For the requirements from previous Core Component releases, see [Historical System Requirements](VERSIONS.md). diff --git a/VERSIONS.md b/VERSIONS.md index adf2bf089e..248c8d8c3b 100644 --- a/VERSIONS.md +++ b/VERSIONS.md @@ -4,6 +4,7 @@ See below for a full list of system requirements for historical versions of the Core Components | Extension | AEM 6.5 | AEM 6.4 | AEM 6.3 | Java ----------------|-----------|---------|---------|---------|------ +[2.11.0](https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.11.0) | Continual | 6.5.5.0+ | 6.4.8.1+ | 8, 11 | 3.3.9+ [2.10.0](https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.10.0) | - | 6.5.5.0+ | 6.4.8.1+ | - | 8, 11 [2.9.0](https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.9.0) | - | 6.5.4.0+ | 6.4.8.0+ | - | 8, 11 [2.8.0](https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.8.0) | - | 6.5.0.0+ | 6.4.4.0+ | 6.3.3.4+ | 8, 11 diff --git a/all/pom.xml b/all/pom.xml index 44a64bffb3..b327f2bc35 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -56,6 +56,11 @@ core.wcm.components.extensions.amp /apps/core/wcm/install + + org.apache.sling + org.apache.sling.models.impl + /apps/core/wcm/install + @@ -179,5 +184,10 @@ ${project.version} provided + + org.apache.sling + org.apache.sling.models.impl + 1.4.12 + diff --git a/content/package-lock.json b/content/package-lock.json index 4ffae086a0..751719319e 100644 --- a/content/package-lock.json +++ b/content/package-lock.json @@ -1,6 +1,6 @@ { "name": "com.adobe.cq.core.wcm.components.content", - "version": "2.10.1-SNAPSHOT", + "version": "2.11.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/content/package.json b/content/package.json index fbba5f533b..6641831992 100644 --- a/content/package.json +++ b/content/package.json @@ -1,6 +1,6 @@ { "name": "com.adobe.cq.core.wcm.components.content", - "version": "2.10.1-SNAPSHOT", + "version": "2.11.0", "description": "Adobe Experience Manager Core WCM Components Content Package", "license": "Apache-2.0", "private": false, diff --git a/examples/ui.content/src/content/jcr_root/conf/core-components-examples/settings/wcm/templates/content-page/structure/.content.xml b/examples/ui.content/src/content/jcr_root/conf/core-components-examples/settings/wcm/templates/content-page/structure/.content.xml index 406a73aad3..de4516e5e4 100644 --- a/examples/ui.content/src/content/jcr_root/conf/core-components-examples/settings/wcm/templates/content-page/structure/.content.xml +++ b/examples/ui.content/src/content/jcr_root/conf/core-components-examples/settings/wcm/templates/content-page/structure/.content.xml @@ -141,7 +141,7 @@ jcr:lastModifiedBy="admin" jcr:primaryType="nt:unstructured" sling:resourceType="core/wcm/components/text/v2/text" - text="<p>Built with <a href="https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.10.0">Core Components 2.10.0</a>.</p> " + text="<p>Built with <a href="https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.11.0">Core Components 2.11.0</a>.</p> " textIsRich="true"/> diff --git a/examples/ui.content/src/content/jcr_root/content/core-components-examples/library/.content.xml b/examples/ui.content/src/content/jcr_root/content/core-components-examples/library/.content.xml index cb858fe586..5c66db1238 100644 --- a/examples/ui.content/src/content/jcr_root/content/core-components-examples/library/.content.xml +++ b/examples/ui.content/src/content/jcr_root/content/core-components-examples/library/.content.xml @@ -26,7 +26,7 @@ jcr:lastModifiedBy="admin" jcr:primaryType="nt:unstructured" sling:resourceType="core/wcm/components/text/v2/text" - text="<h1>Component Library <a href="https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.10.0">2.10.0</a></h1> " + text="<h1>Component Library <a href="https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.11.0">2.11.0</a></h1> " textIsRich="true"/>