Merge branch 'develop'

wcm-io · May 12, 2022 · 08c4563 · 08c4563
2 parents abb9338 + 4ecb19d
commit 08c4563
Show file tree

Hide file tree

Showing 13 changed files with 59 additions and 29 deletions.
diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>1.10.0-2.18.6</version>
+    <version>1.11.0-2.19.0</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.wcm.core.components</artifactId>
-  <version>1.10.0-2.18.6</version>
+  <version>1.11.0-2.19.0</version>
   <packaging>jar</packaging>
 
   <name>WCM Core Components</name>
@@ -188,7 +188,6 @@
     <dependency>
       <groupId>com.adobe.aem</groupId>
       <artifactId>uber-jar</artifactId>
-      <classifier>apis</classifier>
       <scope>provided</scope>
     </dependency>
 

diff --git a/bundles/core/src/main/webapp/app-root/components/search/v2/README.md b/bundles/core/src/main/webapp/app-root/components/search/v2/README.md
@@ -0,0 +1,16 @@
+Quick Search (v2)
+====
+Search component written in HTL.
+
+Extends the [Quick Search AEM Sites Core Component][extends-component]
+
+## Resource Type
+```
+wcm-io/wcm/core/components/search/v2/search
+```
+
+## Enhanced Features
+
+* No enhancements - inherits all features from its [super component][extends-component]
+
+[extends-component]: https://github.com/adobe/aem-core-wcm-components/tree/master/content/src/content/jcr_root/apps/core/wcm/components/search/v2/search
diff --git a/bundles/core/src/main/webapp/app-root/components/search/v2/search.json b/bundles/core/src/main/webapp/app-root/components/search/v2/search.json
@@ -0,0 +1,6 @@
+{
+  "jcr:primaryType": "cq:Component",
+  "jcr:title": "wcm.io Quick Search (v2)",
+  "componentGroup": ".wcmio-core-wcm",
+  "sling:resourceSuperType": "core/wcm/components/search/v2/search"
+}
diff --git a/changes.xml b/changes.xml
@@ -23,12 +23,21 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="1.11.0-2.19.0" date="not released">
+      <action type="add" dev="sseifert">
+        Add Quick Search (v2).
+      </action>
+      <action type="update" dev="sseifert">
+        Update to AEM WCM Core Components 2.19.0.
+      </action>
+    </release>
+
     <release version="1.10.0-2.18.6" date="2022-03-30">
       <action type="update" dev="sseifert">
         Update to AEM WCM Core Components 2.18.6.
       </action>
       <action type="update" dev="sseifert">
-        Switch to AEM 6.5 as minimum version.
+        Switch to AEM 6.5.7 as minimum version.
       </action>
       <action type="update" dev="sseifert">
         RTE config: Disable "paste-default" edit feature (discouraged because it is browser-dependent) and switch default paste mode to "wordhtml".

diff --git a/examples/bundles/examples-core/pom.xml b/examples/bundles/examples-core/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>1.10.0-2.18.6</version>
+    <version>1.11.0-2.19.0</version>
     <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.samples</groupId>
   <artifactId>io.wcm.wcm.core.components.examples-core</artifactId>
-  <version>1.10.0-2.18.6</version>
+  <version>1.11.0-2.19.0</version>
   <packaging>jar</packaging>
 
   <name>WCM Core Components Examples Core</name>
@@ -44,14 +44,13 @@
     <dependency>
       <groupId>io.wcm</groupId>
       <artifactId>io.wcm.wcm.core.components</artifactId>
-      <version>1.10.0-2.18.6</version>
+      <version>1.11.0-2.19.0</version>
       <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>com.adobe.aem</groupId>
       <artifactId>uber-jar</artifactId>
-      <classifier>apis</classifier>
       <scope>provided</scope>
     </dependency>
 

diff --git a/examples/content-packages/examples-libs/pom.xml b/examples/content-packages/examples-libs/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>1.10.0-2.18.6</version>
+    <version>1.11.0-2.19.0</version>
     <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.samples</groupId>  
   <artifactId>io.wcm.wcm.core.components.examples-libs</artifactId>
-  <version>1.10.0-2.18.6</version>
+  <version>1.11.0-2.19.0</version>
   <packaging>content-package</packaging>
 
   <name>WCM Core Components Examples wcm.io Libraries</name>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>io.wcm</groupId>
       <artifactId>io.wcm.wcm.core.components</artifactId>
-      <version>1.10.0-2.18.6</version>
+      <version>1.11.0-2.19.0</version>
       <scope>compile</scope>
     </dependency>
 
@@ -143,7 +143,7 @@
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.caconfig.editor</artifactId>
-        <version>1.10.0</version>
+        <version>1.11.0</version>
       </dependency>
       <dependency>
         <groupId>io.wcm</groupId>
@@ -173,7 +173,7 @@
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.handler.media</artifactId>
-        <version>1.14.0</version>
+        <version>1.14.2</version>
       </dependency>
       <dependency>
         <groupId>io.wcm</groupId>

diff --git a/examples/content-packages/examples-sample-content/pom.xml b/examples/content-packages/examples-sample-content/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>1.10.0-2.18.6</version>
+    <version>1.11.0-2.19.0</version>
     <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.samples</groupId>  
   <artifactId>io.wcm.wcm.core.components.examples-sample-content</artifactId>
-  <version>1.10.0-2.18.6</version>
+  <version>1.11.0-2.19.0</version>
   <packaging>content-package</packaging>
 
   <name>WCM Core Components Examples Content</name>

diff --git a/examples/content-packages/examples/pom.xml b/examples/content-packages/examples/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>1.10.0-2.18.6</version>
+    <version>1.11.0-2.19.0</version>
     <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.samples</groupId>  
   <artifactId>io.wcm.wcm.core.components.examples</artifactId>
-  <version>1.10.0-2.18.6</version>
+  <version>1.11.0-2.19.0</version>
   <packaging>content-package</packaging>
 
   <name>WCM Core Components Examples</name>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>io.wcm.samples</groupId>  
       <artifactId>io.wcm.wcm.core.components.examples-core</artifactId>
-      <version>1.10.0-2.18.6</version>
+      <version>1.11.0-2.19.0</version>
       <scope>compile</scope>
     </dependency>
 

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>1.10.0-2.18.6</version>
+    <version>1.11.0-2.19.0</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.samples</groupId>
   <artifactId>io.wcm.wcm.core.components.examples.root</artifactId>
-  <version>1.10.0-2.18.6</version>
+  <version>1.11.0-2.19.0</version>
   <packaging>pom</packaging>
 
   <modules>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.parent_toplevel</artifactId>
-    <version>2.0.2</version>
+    <version>2.1.0</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-  <version>1.10.0-2.18.6</version>
+  <version>1.11.0-2.19.0</version>
   <packaging>pom</packaging>
 
   <name>WCM Core Components</name>
@@ -43,13 +43,13 @@
   </ciManagement>
 
   <properties>
-    <core.wcm.components.version>2.18.6</core.wcm.components.version>
+    <core.wcm.components.version>2.19.0</core.wcm.components.version>
 
     <sling.url>http://localhost:4502</sling.url>
     <sling.publish.url>http://localhost:4503</sling.publish.url>
 
     <!-- Enable reproducible builds -->
-    <project.build.outputTimestamp>2022-03-30T11:06:35Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2022-05-12T09:45:53Z</project.build.outputTimestamp>
   </properties>
 
   <dependencyManagement>
@@ -147,7 +147,7 @@
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.testing.aem-mock.junit5</artifactId>
-        <version>4.1.8</version>
+        <version>5.0.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.sling</groupId>

diff --git a/pom.xml b/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.wcm.core.components.parent</artifactId>
-    <version>1.10.0-2.18.6</version>
+    <version>1.11.0-2.19.0</version>
     <relativePath>parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.wcm.core.components.root</artifactId>
-  <version>1.10.0-2.18.6</version>
+  <version>1.11.0-2.19.0</version>
   <packaging>pom</packaging>
   <url>${site.url}/${site.url.module.prefix}/</url>
 

diff --git a/src/site/markdown/components.md b/src/site/markdown/components.md
@@ -10,7 +10,7 @@ _Enhanced with_ <span class="marker-label">MEDIA</span>&nbsp;_Media&nbsp;Handler
 * [Navigation (v2)](https://github.com/wcm-io/wcm-io-wcm-core-components/tree/develop/bundles/core/src/main/webapp/app-root/components/navigation/v2) | [(v1)](https://github.com/wcm-io/wcm-io-wcm-core-components/tree/develop/bundles/core/src/main/webapp/app-root/components/navigation/v1) <span class="marker-label">LINK</span> <span class="marker-label">URL</span>
 * [Language Navigation (v2)](https://github.com/wcm-io/wcm-io-wcm-core-components/tree/develop/bundles/core/src/main/webapp/app-root/components/languagenavigation/v2) | [(v1)](https://github.com/wcm-io/wcm-io-wcm-core-components/tree/develop/bundles/core/src/main/webapp/app-root/components/languagenavigation/v1) <span class="marker-label">LINK</span>
 * [Breadcrumb (v3)](https://github.com/wcm-io/wcm-io-wcm-core-components/tree/develop/bundles/core/src/main/webapp/app-root/components/breadcrumb/v3) | [(v2)](https://github.com/wcm-io/wcm-io-wcm-core-components/tree/develop/bundles/core/src/main/webapp/app-root/components/breadcrumb/v2) <span class="marker-label">LINK</span> <span class="marker-label">URL</span>
-* [Quick Search (v1)](https://github.com/wcm-io/wcm-io-wcm-core-components/tree/develop/bundles/core/src/main/webapp/app-root/components/search/v1)
+* [Quick Search (v2)](https://github.com/wcm-io/wcm-io-wcm-core-components/tree/develop/bundles/core/src/main/webapp/app-root/components/search/v2) | [(v1)](https://github.com/wcm-io/wcm-io-wcm-core-components/tree/develop/bundles/core/src/main/webapp/app-root/components/search/v1)
 
 **Page Authoring Components**
 

diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
@@ -35,7 +35,8 @@ 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.10.0-2.18.6                     | 2.18.6 and up                    | AEM 6.5.6, AEMaaCS
+| 1.11.0-2.19.0                     | 2.19.0 and up                    | AEM 6.5.7, AEMaaCS
+| 1.10.0-2.18.6                     | 2.18.6 and up                    | AEM 6.5.7, AEMaaCS
 | 1.9.2-2.17.12                     | 2.17.12 and up                   | AEM 6.4.8.4, AEM 6.5.6, AEMaaCS
 | 1.9.0-2.17.2                      | 2.17.x and up                    | AEM 6.4.8.4, AEM 6.5.6, AEMaaCS
 | 1.8.x-2.15.0                      | 2.15.x, 2.16.x                   | AEM 6.4.8.1, AEM 6.5.6, AEMaaCS