Merge branch 'main' into 2853-AdaptiveImageServlet-send-redirect

adobe · Sep 29, 2024 · 774f083 · 774f083
2 parents fa7189b + d2a7b02
commit 774f083
Show file tree

Hide file tree

Showing 33 changed files with 72 additions and 59 deletions.
diff --git a/README.md b/README.md
@@ -93,7 +93,7 @@ For existing projects, take example from the [AEM Project Archetype](https://git
 
 Core Components | AEM as a Cloud Service | AEM 6.5   | Java SE | Maven
 ----------------|------------------------|-----------|---------|---------
-[2.26.0+](https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.23.4) | Continual | 6.5.21.0+ | 8, <br/>11 | 3.3.9+
+[2.27.0+](https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.23.4) | Continual | 6.5.21.0+ | 8, <br/>11 | 3.3.9+
 
 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  | Maven
 ----------------|-----------|-----------|---------|---------|-------|------
+[2.27.0](https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.26.0) | - | 6.5.21.0+ | - | - | 8, 11 | 3.3.9+
 [2.26.0](https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.26.0) | - | 6.5.21.0+ | - | - | 8, 11 | 3.3.9+
 [2.25.4](https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.25.4) | - | 6.5.21.0+ | - | - | 8, 11 | 3.3.9+
 [2.25.2](https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.25.2) | - | 6.5.21.0+ | - | - | 8, 11 | 3.3.9+

diff --git a/all/pom.xml b/all/pom.xml
@@ -23,15 +23,15 @@
     <parent>
         <artifactId>core.wcm.components.parent</artifactId>
         <groupId>com.adobe.cq</groupId>
-        <version>2.26.1-SNAPSHOT</version>
+        <version>2.27.1-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <!-- ====================================================================== -->
     <!-- P R O J E C T  D E S C R I P T I O N                                   -->
     <!-- ====================================================================== -->
     <artifactId>core.wcm.components.all</artifactId>
-    <version>2.26.1-SNAPSHOT</version>
+    <version>2.27.1-SNAPSHOT</version>
     <packaging>content-package</packaging>
 
     <name>Adobe Experience Manager Core WCM Components Full Package</name>

diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml
@@ -23,12 +23,12 @@
     <parent>
         <groupId>com.adobe.cq</groupId>
         <artifactId>core.wcm.components.parent</artifactId>
-        <version>2.26.1-SNAPSHOT</version>
+        <version>2.27.1-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>core.wcm.components.core</artifactId>
-    <version>2.26.1-SNAPSHOT</version>
+    <version>2.27.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>Adobe Experience Manager Core WCM Components Core Bundle</name>

diff --git a/config/pom.xml b/config/pom.xml
@@ -23,15 +23,15 @@
     <parent>
         <groupId>com.adobe.cq</groupId>
         <artifactId>core.wcm.components.parent</artifactId>
-        <version>2.26.1-SNAPSHOT</version>
+        <version>2.27.1-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <!-- ====================================================================== -->
     <!-- P R O J E C T  D E S C R I P T I O N                                   -->
     <!-- ====================================================================== -->
     <artifactId>core.wcm.components.config</artifactId>
-    <version>2.26.1-SNAPSHOT</version>
+    <version>2.27.1-SNAPSHOT</version>
     <packaging>content-package</packaging>
 
     <name>Adobe Experience Manager Core WCM Components Configurations</name>

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.26.1-SNAPSHOT",
+    "version": "2.27.1-SNAPSHOT",
     "description": "Adobe Experience Manager Core WCM Components Content Package",
     "license": "Apache-2.0",
     "private": false,

diff --git a/content/pom.xml b/content/pom.xml
@@ -23,15 +23,15 @@
     <parent>
         <groupId>com.adobe.cq</groupId>
         <artifactId>core.wcm.components.parent</artifactId>
-        <version>2.26.1-SNAPSHOT</version>
+        <version>2.27.1-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <!-- ====================================================================== -->
     <!-- P R O J E C T  D E S C R I P T I O N                                   -->
     <!-- ====================================================================== -->
     <artifactId>core.wcm.components.content</artifactId>
-    <version>2.26.1-SNAPSHOT</version>
+    <version>2.27.1-SNAPSHOT</version>
     <packaging>content-package</packaging>
     <name>Adobe Experience Manager Core WCM Components Content Package</name>
 

diff --git a/...c/content/jcr_root/apps/core/wcm/components/search/v1/search/clientlibs/site/js/search.js b/...c/content/jcr_root/apps/core/wcm/components/search/v1/search/clientlibs/site/js/search.js
@@ -281,11 +281,17 @@
             var el = document.createElement("span");
             el.innerHTML = self._elements.itemTemplate.innerHTML;
             el.querySelectorAll(selectors.item.title)[0].appendChild(document.createTextNode(item.title));
-            el.querySelectorAll(selectors.item.self)[0].setAttribute("href", item.url);
+            el.querySelectorAll(selectors.item.self)[0].setAttribute("href", self._safeHref(item.url));
             results.innerHTML += el.innerHTML;
         });
     };
 
+    Search.prototype._safeHref = function(href) {
+        var a = document.createElement("a");
+        a.href = href;
+        return a.pathname;
+    };
+
     Search.prototype._markResults = function() {
         var nodeList = this._elements.results.querySelectorAll(selectors.item.self);
         var escapedTerm = this._elements.input.value.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");

diff --git a/...c/content/jcr_root/apps/core/wcm/components/search/v2/search/clientlibs/site/js/search.js b/...c/content/jcr_root/apps/core/wcm/components/search/v2/search/clientlibs/site/js/search.js
@@ -293,11 +293,17 @@
             var el = document.createElement("span");
             el.innerHTML = self._elements.itemTemplate.innerHTML;
             el.querySelectorAll(selectors.item.title)[0].appendChild(document.createTextNode(item.title));
-            el.querySelectorAll(selectors.item.self)[0].setAttribute("href", item.url);
+            el.querySelectorAll(selectors.item.self)[0].setAttribute("href", self._safeHref(item.url));
             results.innerHTML += el.innerHTML;
         });
     };
 
+    Search.prototype._safeHref = function(href) {
+        var a = document.createElement("a");
+        a.href = href;
+        return a.pathname;
+    };
+
     Search.prototype._markResults = function() {
         var nodeList = this._elements.results.querySelectorAll(selectors.item.self);
         var escapedTerm = this._elements.input.value.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");

diff --git a/examples/all/pom.xml b/examples/all/pom.xml
@@ -23,12 +23,12 @@
     <parent>
         <groupId>com.adobe.cq</groupId>
         <artifactId>core.wcm.components.parent</artifactId>
-        <version>2.26.1-SNAPSHOT</version>
+        <version>2.27.1-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>core.wcm.components.examples.all</artifactId>
-    <version>2.26.1-SNAPSHOT</version>
+    <version>2.27.1-SNAPSHOT</version>
     <packaging>content-package</packaging>
 
     <name>Adobe Experience Manager Core WCM Components Examples Aggregator Package</name>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -23,12 +23,12 @@
     <parent>
         <groupId>com.adobe.cq</groupId>
         <artifactId>core.wcm.components.parent</artifactId>
-        <version>2.26.1-SNAPSHOT</version>
+        <version>2.27.1-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>core.wcm.components.examples</artifactId>
-    <version>2.26.1-SNAPSHOT</version>
+    <version>2.27.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Adobe Experience Manager Core WCM Components Examples Reactor</name>

diff --git a/examples/ui.apps/pom.xml b/examples/ui.apps/pom.xml
@@ -23,15 +23,15 @@
     <parent>
         <groupId>com.adobe.cq</groupId>
         <artifactId>core.wcm.components.parent</artifactId>
-        <version>2.26.1-SNAPSHOT</version>
+        <version>2.27.1-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <!-- ====================================================================== -->
     <!-- P R O J E C T  D E S C R I P T I O N                                   -->
     <!-- ====================================================================== -->
     <artifactId>core.wcm.components.examples.ui.apps</artifactId>
-    <version>2.26.1-SNAPSHOT</version>
+    <version>2.27.1-SNAPSHOT</version>
     <packaging>content-package</packaging>
     <name>Adobe Experience Manager Core WCM Components Examples Application Package</name>
 

diff --git a/examples/ui.config/pom.xml b/examples/ui.config/pom.xml
@@ -23,15 +23,15 @@
     <parent>
         <groupId>com.adobe.cq</groupId>
         <artifactId>core.wcm.components.parent</artifactId>
-        <version>2.26.1-SNAPSHOT</version>
+        <version>2.27.1-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <!-- ====================================================================== -->
     <!-- P R O J E C T  D E S C R I P T I O N                                   -->
     <!-- ====================================================================== -->
     <artifactId>core.wcm.components.examples.ui.config</artifactId>
-    <version>2.26.1-SNAPSHOT</version>
+    <version>2.27.1-SNAPSHOT</version>
     <packaging>content-package</packaging>
     <name>Adobe Experience Manager Core WCM Components Examples Configuration &amp; Bundles Package</name>
 

diff --git a/examples/ui.content/pom.xml b/examples/ui.content/pom.xml
@@ -23,15 +23,15 @@
     <parent>
         <groupId>com.adobe.cq</groupId>
         <artifactId>core.wcm.components.parent</artifactId>
-        <version>2.26.1-SNAPSHOT</version>
+        <version>2.27.1-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <!-- ====================================================================== -->
     <!-- P R O J E C T  D E S C R I P T I O N                                   -->
     <!-- ====================================================================== -->
     <artifactId>core.wcm.components.examples.ui.content</artifactId>
-    <version>2.26.1-SNAPSHOT</version>
+    <version>2.27.1-SNAPSHOT</version>
     <packaging>content-package</packaging>
     <name>Adobe Experience Manager Core WCM Components Examples Content Package</name>
 

diff --git a/extensions/amp/bundle/pom.xml b/extensions/amp/bundle/pom.xml
@@ -23,12 +23,12 @@
     <parent>
         <groupId>com.adobe.cq</groupId>
         <artifactId>core.wcm.components.parent</artifactId>
-        <version>2.26.1-SNAPSHOT</version>
+        <version>2.27.1-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>core.wcm.components.extensions.amp</artifactId>
-    <version>2.26.1-SNAPSHOT</version>
+    <version>2.27.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>Adobe Experience Manager Core WCM Components AMP Extension Bundle</name>

diff --git a/extensions/amp/content/package-lock.json b/extensions/amp/content/package-lock.json
diff --git a/extensions/amp/content/package.json b/extensions/amp/content/package.json
@@ -1,6 +1,6 @@
 {
     "name": "core.wcm.components.extensions.amp-content",
-    "version": "2.26.1-SNAPSHOT",
+    "version": "2.27.1-SNAPSHOT",
     "description": "Adobe Experience Manager Core WCM Components AMP Extension Content Package",
     "license": "Apache-2.0",
     "private": false,

diff --git a/extensions/amp/content/pom.xml b/extensions/amp/content/pom.xml
@@ -23,15 +23,15 @@
     <parent>
         <groupId>com.adobe.cq</groupId>
         <artifactId>core.wcm.components.parent</artifactId>
-        <version>2.26.1-SNAPSHOT</version>
+        <version>2.27.1-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
     <!-- ====================================================================== -->
     <!-- P R O J E C T  D E S C R I P T I O N                                   -->
     <!-- ====================================================================== -->
     <artifactId>core.wcm.components.extensions.amp.content</artifactId>
-    <version>2.26.1-SNAPSHOT</version>
+    <version>2.27.1-SNAPSHOT</version>
     <packaging>content-package</packaging>
     <name>Adobe Experience Manager Core WCM Components AMP Extension Content Package</name>
 

diff --git a/extensions/amp/pom.xml b/extensions/amp/pom.xml
@@ -23,12 +23,12 @@
     <parent>
         <groupId>com.adobe.cq</groupId>
         <artifactId>core.wcm.components.parent</artifactId>
-        <version>2.26.1-SNAPSHOT</version>
+        <version>2.27.1-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>core.wcm.components.extensions.amp.reactor</artifactId>
-    <version>2.26.1-SNAPSHOT</version>
+    <version>2.27.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Adobe Experience Manager Core WCM Components AMP Extension Reactor</name>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -19,7 +19,7 @@
     <groupId>com.adobe.cq</groupId>
     <artifactId>core.wcm.components.parent</artifactId>
     <packaging>pom</packaging>
-    <version>2.26.1-SNAPSHOT</version>
+    <version>2.27.1-SNAPSHOT</version>
 
     <name>Adobe Experience Manager Core WCM Components Parent</name>
     <description>A set of standardized components for AEM 6.3+ that can be used to speed up development of websites.</description>

diff --git a/pom.xml b/pom.xml
@@ -23,13 +23,13 @@
     <parent>
         <groupId>com.adobe.cq</groupId>
         <artifactId>core.wcm.components.parent</artifactId>
-        <version>2.26.1-SNAPSHOT</version>
+        <version>2.27.1-SNAPSHOT</version>
         <relativePath>parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>core.wcm.components.reactor</artifactId>
     <packaging>pom</packaging>
-    <version>2.26.1-SNAPSHOT</version>
+    <version>2.27.1-SNAPSHOT</version>
 
     <name>Adobe Experience Manager Core WCM Components Reactor</name>
 

diff --git a/testing/aem-mock-plugin/pom.xml b/testing/aem-mock-plugin/pom.xml
@@ -23,12 +23,12 @@
     <parent>
         <groupId>com.adobe.cq</groupId>
         <artifactId>core.wcm.components.parent</artifactId>
-        <version>2.26.1-SNAPSHOT</version>
+        <version>2.27.1-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>core.wcm.components.testing.aem-mock-plugin</artifactId>
-    <version>2.26.1-SNAPSHOT</version>
+    <version>2.27.1-SNAPSHOT</version>
     <name>Adobe Experience Manager Core WCM Components AEM Mocks Plugin</name>
 
     <description>Helps setting up mock environment for unit testing custom code based on Core Components.</description>
@@ -66,13 +66,13 @@
         <dependency>
             <groupId>com.adobe.cq</groupId>
             <artifactId>core.wcm.components.core</artifactId>
-            <version>2.26.1-SNAPSHOT</version>
+            <version>2.27.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.adobe.cq</groupId>
             <artifactId>core.wcm.components.junit.core</artifactId>
-            <version>2.26.1-SNAPSHOT</version>
+            <version>2.27.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/testing/it/e2e-selenium-utils/pom.xml b/testing/it/e2e-selenium-utils/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.adobe.cq</groupId>
         <artifactId>core.wcm.components.parent</artifactId>
-        <version>2.26.1-SNAPSHOT</version>
+        <version>2.27.1-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
     <!-- ====================================================================== -->
     <groupId>com.adobe.cq</groupId>
     <artifactId>core.wcm.components.it.e2e-selenium-utils</artifactId>
-    <version>2.26.1-SNAPSHOT</version>
+    <version>2.27.1-SNAPSHOT</version>
     <name>Adobe Experience Manager Core WCM Components E2E Testing Utils</name>
     <packaging>jar</packaging>
 

diff --git a/testing/it/e2e-selenium/pom.xml b/testing/it/e2e-selenium/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.adobe.cq</groupId>
         <artifactId>core.wcm.components.parent</artifactId>
-        <version>2.26.1-SNAPSHOT</version>
+        <version>2.27.1-SNAPSHOT</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
     <!-- ====================================================================== -->
     <groupId>com.adobe.cq</groupId>
     <artifactId>core.wcm.components.it.e2e-selenium</artifactId>
-    <version>2.26.1-SNAPSHOT</version>
+    <version>2.27.1-SNAPSHOT</version>
     <name>Adobe Experience Manager Core WCM Components Selenium Base Test Framework</name>
 
     <build>