Prepare versions for upcoming release (#1111)

* Prepare versions for upcoming release * Temporarily including fix for https://issues.apache.org/jira/browse/SLING-8781 * Updated version docs
adobe · Jul 20, 2020 · d1fb663 · d1fb663
1 parent cddf02b
commit d1fb663
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 7 deletions.
diff --git 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
@@ -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
@@ -56,6 +56,11 @@
                             <artifactId>core.wcm.components.extensions.amp</artifactId>
                             <target>/apps/core/wcm/install</target>
                         </embedded>
+                        <embedded>
+                            <groupId>org.apache.sling</groupId>
+                            <artifactId>org.apache.sling.models.impl</artifactId>
+                            <target>/apps/core/wcm/install</target>
+                        </embedded>
                     </embeddeds>
                     <subPackages>
                         <subPackage>
@@ -179,5 +184,10 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.models.impl</artifactId>
+            <version>1.4.12</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/content/package-lock.json b/content/package-lock.json
diff --git 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/.../conf/core-components-examples/settings/wcm/templates/content-page/structure/.content.xml b/.../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="&lt;p>Built with &lt;a href=&quot;https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.10.0&quot;>Core Components 2.10.0&lt;/a>.&lt;/p>&#xa;"
+                    text="&lt;p>Built with &lt;a href=&quot;https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.11.0&quot;>Core Components 2.11.0&lt;/a>.&lt;/p>&#xa;"
                     textIsRich="true"/>
             </responsivegrid_2176569853>
         </root>

diff --git a/...les/ui.content/src/content/jcr_root/content/core-components-examples/library/.content.xml b/...les/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="&lt;h1>Component Library &lt;a href=&quot;https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.10.0&quot;>2.10.0&lt;/a>&lt;/h1>&#xa;"
+                    text="&lt;h1>Component Library &lt;a href=&quot;https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.11.0&quot;>2.11.0&lt;/a>&lt;/h1>&#xa;"
                     textIsRich="true"/>
                 <text
                     cq:styleIds="[1544762734201]"

diff --git a/testing/it/ui-js/package-lock.json b/testing/it/ui-js/package-lock.json
diff --git a/testing/it/ui-js/package.json b/testing/it/ui-js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "com.adobe.cq.core.wcm.components.it.ui-js",
-    "version": "2.10.1-SNAPSHOT",
+    "version": "2.11.0",
     "description": "Adobe Experience Manager Core WCM Components UI End-to-End Tests",
     "license": "Apache-2.0",
     "private": false,