entry : osgiConfigurationsToDelete.entries()) {
+ entry.getKey().deleteConfiguration(entry.getValue());
+ }
+ }
+
+ /**
+ * This test verifies that the TableOfContentsFilter does not interfere with the resourceType-based rewriter pipeline selection.
+ *
+ * It creates a rewriter pipeline configuration specific to the {@code "core/wcm/tests/components/test-page"} resourceType adding the
+ * {@link com.adobe.cq.wcm.core.components.it.support.TestTransformerFactory} to the pipeline. If everything works this transformer sets
+ * a response header which the test assets.
+ *
+ * @throws ClientException
+ */
+ @Test
+ public void testResourceTypeEnabledRewriterPipelineUsed() throws ClientException {
+ String pipelineConfig = "/apps/core/config/rewriter/core-components-test-transformer";
+ author.createNode(pipelineConfig, "nt:unstructured");
+
+ try {
+ Map properties = new LinkedHashMap<>();
+ properties.put("contentTypes", new String[] { "text/html" });
+ properties.put("enabled", "true");
+ properties.put("order", "2000");
+ properties.put("generatorType", "htmlparser");
+ properties.put("paths", new String[] { "/content" });
+ properties.put("serializerType", "htmlwriter");
+ // include the test transformer
+ properties.put("transformerTypes", new String[] { "core-components-test-transformer" });
+ // limit the rewriter pipeline to the test-page resourceType
+ properties.put("resourceTypes", new String[] { "core/wcm/tests/components/test-page" });
+
+ for (Map.Entry entry : properties.entrySet()) {
+ Object value = entry.getValue();
+ if (value instanceof String[]) {
+ author.setPropertyStringArray(pipelineConfig, entry.getKey(), Arrays.asList((String[]) value), 200);
+ } else {
+ author.setPropertyString(pipelineConfig, entry.getKey(), (String) value, 200);
+ }
+ }
+
+ // if the pipeline is used the response to GET /content/core-components/core-components-page should contain the
+ // X-CoreComponents-TestTransformer response header
+ SlingHttpResponse resp = author.doGet("/content/core-components/core-components-page.html", 200);
+ Header expectedHeader = resp.getFirstHeader("X-CoreComponents-TestTransformer");
+ assertNotNull(expectedHeader);
+ assertEquals("true", expectedHeader.getValue());
+ } finally {
+ author.deletePath(pipelineConfig);
+ }
+ }
+
+}
diff --git a/testing/it/it.core/pom.xml b/testing/it/it.core/pom.xml
new file mode 100644
index 0000000000..c57491d850
--- /dev/null
+++ b/testing/it/it.core/pom.xml
@@ -0,0 +1,202 @@
+
+
+
+ 4.0.0
+
+
+
+
+
+ com.adobe.cq
+ core.wcm.components.parent
+ 2.23.5-SNAPSHOT
+ ../../../parent/pom.xml
+
+
+ core.wcm.components.it.core
+ 2.23.5-SNAPSHOT
+ bundle
+
+ Adobe Experience Manager Core WCM Components IT Core Bundle
+
+
+ ${project.build.directory}/jacoco.exec
+
+
+
+
+
+ org.apache.felix
+ maven-bundle-plugin
+ true
+
+
+ scr-metadata
+
+ manifest
+
+
+ true
+
+
+
+
+ true
+
+
+ <_dsannotations>*
+
+ <_metatypeannotations>*
+
+
+
+
+
+
+
+
+
+
+
+ autoInstallPackage
+
+ false
+
+
+
+
+ org.apache.sling
+ maven-sling-plugin
+
+
+ install-bundle
+
+ install
+
+
+
+
+ http://${aem.host}:${aem.port}${aem.contextPath}/system/console
+ true
+
+
+
+
+
+
+
+ autoInstallPackagePublish
+
+ false
+
+
+
+
+ org.apache.sling
+ maven-sling-plugin
+
+
+ install-bundle
+
+ install
+
+
+
+
+ http://${aem.publish.host}:${aem.publish.port}/system/console
+ true
+
+
+
+
+
+
+
+ release
+
+ false
+
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+
+
+ attach-javadocs
+
+ jar
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+
+
+ attach-sources
+
+ jar-no-fork
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ javax.servlet
+ javax.servlet-api
+
+
+ javax.servlet.jsp
+ jsp-api
+
+
+ javax.jcr
+ jcr
+
+
+ org.osgi
+ osgi.core
+
+
+ org.osgi
+ osgi.cmpn
+
+
+ org.osgi
+ osgi.annotation
+
+
+ org.jetbrains
+ annotations
+
+
+ com.adobe.aem
+ uber-jar
+
+
+
+
diff --git a/testing/it/it.core/src/main/java/com/adobe/cq/wcm/core/components/it/support/TestTransformerFactory.java b/testing/it/it.core/src/main/java/com/adobe/cq/wcm/core/components/it/support/TestTransformerFactory.java
new file mode 100644
index 0000000000..c7376cd03d
--- /dev/null
+++ b/testing/it/it.core/src/main/java/com/adobe/cq/wcm/core/components/it/support/TestTransformerFactory.java
@@ -0,0 +1,53 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2022 Adobe
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+package com.adobe.cq.wcm.core.components.it.support;
+
+import java.io.IOException;
+
+import org.apache.sling.rewriter.DefaultTransformer;
+import org.apache.sling.rewriter.ProcessingComponentConfiguration;
+import org.apache.sling.rewriter.ProcessingContext;
+import org.apache.sling.rewriter.Transformer;
+import org.apache.sling.rewriter.TransformerFactory;
+import org.osgi.service.component.annotations.Component;
+
+/**
+ * This {@link TransformerFactory} creates a {@link Transformer} that adds a {@code "X-CoreComponents-TestTransformer=true"} header to the
+ * response. The response header can be checked in a http IT.
+ */
+@Component(
+ service = TransformerFactory.class,
+ property = {
+ "pipeline.type=core-components-test-transformer"
+ }
+)
+public class TestTransformerFactory implements TransformerFactory {
+
+ @Override
+ public Transformer createTransformer() {
+ return new TestTransformer();
+ }
+
+ static class TestTransformer extends DefaultTransformer {
+
+ @Override
+ public void init(ProcessingContext context, ProcessingComponentConfiguration config) throws IOException {
+ // called when the rewriter pipeline is initialised, so first time the HttpServletResponse#getWriter() is called
+ // save to set a response header
+ context.getResponse().addHeader("X-CoreComponents-TestTransformer", "true");
+ }
+ }
+}
From 5156fbb860e5594c311fb8dee00e5c0d4951a1ea Mon Sep 17 00:00:00 2001
From: Dirk Rudolph
Date: Tue, 14 Nov 2023 09:16:26 +0100
Subject: [PATCH 12/63] fix: add missing folder in integration tests (#2618)
---
testing/it/it.ui.apps/pom.xml | 2 +-
testing/it/it.ui.apps/src/content/META-INF/vault/filter.xml | 1 +
.../src/content/jcr_root/apps/core/config/.content.xml | 3 +++
3 files changed, 5 insertions(+), 1 deletion(-)
create mode 100644 testing/it/it.ui.apps/src/content/jcr_root/apps/core/config/.content.xml
diff --git a/testing/it/it.ui.apps/pom.xml b/testing/it/it.ui.apps/pom.xml
index 0e1e7fdf98..c2d20af800 100644
--- a/testing/it/it.ui.apps/pom.xml
+++ b/testing/it/it.ui.apps/pom.xml
@@ -94,7 +94,7 @@
- /apps,/apps/core/wcm
+ /apps,/apps/core,/apps/core/wcm
diff --git a/testing/it/it.ui.apps/src/content/META-INF/vault/filter.xml b/testing/it/it.ui.apps/src/content/META-INF/vault/filter.xml
index 8d3e31878d..b420ed1ef8 100755
--- a/testing/it/it.ui.apps/src/content/META-INF/vault/filter.xml
+++ b/testing/it/it.ui.apps/src/content/META-INF/vault/filter.xml
@@ -16,6 +16,7 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
diff --git a/testing/it/it.ui.apps/src/content/jcr_root/apps/core/config/.content.xml b/testing/it/it.ui.apps/src/content/jcr_root/apps/core/config/.content.xml
new file mode 100644
index 0000000000..3d0c31ab4d
--- /dev/null
+++ b/testing/it/it.ui.apps/src/content/jcr_root/apps/core/config/.content.xml
@@ -0,0 +1,3 @@
+
+
From 14e70e32246f66236fbf1f61eccac6c7543b05e5 Mon Sep 17 00:00:00 2001
From: Deepak Maurya <32591299+dmaurya929@users.noreply.github.com>
Date: Wed, 22 Nov 2023 13:52:17 +0530
Subject: [PATCH 13/63] FORMS-7969 - Wizard selection does not list panel name
(#2568)
* exposed PanelSelector to CQ.CoreComponents namespace
---------
Co-authored-by: demaurya
---
.../clientlibs/panelselect/js/panelselect.js | 68 +++++++++----------
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/content/src/content/jcr_root/apps/core/wcm/components/commons/editor/clientlibs/panelselect/js/panelselect.js b/content/src/content/jcr_root/apps/core/wcm/components/commons/editor/clientlibs/panelselect/js/panelselect.js
index 820b384050..74d4b3aec1 100644
--- a/content/src/content/jcr_root/apps/core/wcm/components/commons/editor/clientlibs/panelselect/js/panelselect.js
+++ b/content/src/content/jcr_root/apps/core/wcm/components/commons/editor/clientlibs/panelselect/js/panelselect.js
@@ -37,7 +37,7 @@
* which allows selection of panel container items for editing, as well as other operations such as reordering of panels.
* @param {PanelSelectorConfig} config The Panel Selector configuration object
*/
- var PanelSelector = ns.util.createClass({
+ window.CQ.CoreComponents.PanelSelector = ns.util.createClass({
/**
* The Panel Selector configuration Object
@@ -178,7 +178,7 @@
items.push({
id: child.path,
name: child.name,
- title: getTitle(child, panelContainerItems[child.name], index + 1)
+ title: that.getTitle(child, panelContainerItems[child.name], index + 1)
});
});
@@ -379,6 +379,37 @@
that._unbindEvents();
that._elements.popover.parentNode.removeChild(that._elements.popover);
}
+ },
+
+ /**
+ * Retrieves a title from item data. If no item data exists, or it doesn't have a title
+ * instead lookup the editable display name of the corresponding [Editable]{@link Granite.author.Editable}.
+ * Prefixes each title with an index.
+ *
+ * @param {Granite.author.Editable} editable The [Editable]{@link Granite.author.Editable} representing the item
+ * @param {Object} item The item data
+ * @param {Number} index Index of the item
+ * @returns {String} The title
+ */
+ getTitle: function(editable, item, index) {
+ var title = "" + index + " ";
+ var subTitle = "";
+
+ title = title + " " + Granite.I18n.getVar(ns.editableHelper.getEditableDisplayableName(editable));
+
+ if (item) {
+ if (item[PN_PANEL_TITLE]) {
+ subTitle = item[PN_PANEL_TITLE];
+ } else if (item.title) {
+ subTitle = item.title;
+ }
+ }
+
+ if (subTitle) {
+ title = title + ": " + subTitle + "";
+ }
+
+ return title;
}
});
@@ -393,7 +424,7 @@
order: "before COPY",
execute: function(editable, param, target) {
if (!panelSelector || !panelSelector.isOpen()) {
- panelSelector = new PanelSelector({
+ panelSelector = new window.CQ.CoreComponents.PanelSelector({
"editable": editable,
"target": target[0]
});
@@ -423,35 +454,4 @@
}
});
- /**
- * Retrieves a title from item data. If no item data exists, or it doesn't have a title
- * instead lookup the editable display name of the corresponding [Editable]{@link Granite.author.Editable}.
- * Prefixes each title with an index.
- *
- * @param {Granite.author.Editable} editable The [Editable]{@link Granite.author.Editable} representing the item
- * @param {Object} item The item data
- * @param {Number} index Index of the item
- * @returns {String} The title
- */
- function getTitle(editable, item, index) {
- var title = "" + index + " ";
- var subTitle = "";
-
- title = title + " " + Granite.I18n.getVar(ns.editableHelper.getEditableDisplayableName(editable));
-
- if (item) {
- if (item[PN_PANEL_TITLE]) {
- subTitle = item[PN_PANEL_TITLE];
- } else if (item.title) {
- subTitle = item.title;
- }
- }
-
- if (subTitle) {
- title = title + ": " + subTitle + "";
- }
-
- return title;
- }
-
}(jQuery, Granite.author, jQuery(document), this));
From d36b91e1d35f9a55aa07f5b2301eecec2ddef2eb Mon Sep 17 00:00:00 2001
From: Patrique Legault
Date: Mon, 4 Dec 2023 10:40:31 -0500
Subject: [PATCH 14/63] Adding check for hasNext (#2627)
---
.../adobe/cq/wcm/core/components/util/LocalizationUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bundles/core/src/main/java/com/adobe/cq/wcm/core/components/util/LocalizationUtils.java b/bundles/core/src/main/java/com/adobe/cq/wcm/core/components/util/LocalizationUtils.java
index 37e48121fb..07066c62bb 100644
--- a/bundles/core/src/main/java/com/adobe/cq/wcm/core/components/util/LocalizationUtils.java
+++ b/bundles/core/src/main/java/com/adobe/cq/wcm/core/components/util/LocalizationUtils.java
@@ -97,7 +97,7 @@ public static String getBlueprintPath(@NotNull Resource resource, @NotNull LiveR
if (relationshipManager.isSource(resource)) {
// the resource is a blueprint
RangeIterator liveCopiesIterator = relationshipManager.getLiveRelationships(resource, null, null);
- if (liveCopiesIterator != null) {
+ if (liveCopiesIterator != null && liveCopiesIterator.hasNext()) {
LiveRelationship relationship = (LiveRelationship) liveCopiesIterator.next();
LiveCopy liveCopy = relationship.getLiveCopy();
if (liveCopy != null) {
From d5c8b2e477871560fd51df6a26e662fbc075788b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 17:56:13 +0200
Subject: [PATCH 15/63] Bump engine.io and socket.io in /content (#2494)
Bumps [engine.io](https://github.com/socketio/engine.io) and [socket.io](https://github.com/socketio/socket.io). These dependencies needed to be updated together.
Updates `engine.io` from 6.2.1 to 6.4.2
- [Release notes](https://github.com/socketio/engine.io/releases)
- [Changelog](https://github.com/socketio/engine.io/blob/main/CHANGELOG.md)
- [Commits](https://github.com/socketio/engine.io/compare/6.2.1...6.4.2)
Updates `socket.io` from 4.5.4 to 4.6.1
- [Release notes](https://github.com/socketio/socket.io/releases)
- [Changelog](https://github.com/socketio/socket.io/blob/main/CHANGELOG.md)
- [Commits](https://github.com/socketio/socket.io/compare/4.5.4...4.6.1)
---
updated-dependencies:
- dependency-name: engine.io
dependency-type: indirect
- dependency-name: socket.io
dependency-type: indirect
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
content/package-lock.json | 128 ++++++++++++++++++++++++++++----------
1 file changed, 96 insertions(+), 32 deletions(-)
diff --git a/content/package-lock.json b/content/package-lock.json
index b123c04684..da343d23a2 100644
--- a/content/package-lock.json
+++ b/content/package-lock.json
@@ -687,9 +687,9 @@
"dev": true
},
"node_modules/@types/node": {
- "version": "18.11.17",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.17.tgz",
- "integrity": "sha512-HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng==",
+ "version": "20.2.3",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.2.3.tgz",
+ "integrity": "sha512-pg9d0yC4rVNWQzX8U7xb4olIOFuuVL9za3bzMT2pu2SU0SNEi66i2qrvhE2qt0HvkhuCaWJu7pLNOt/Pj8BIrw==",
"dev": true
},
"node_modules/@types/normalize-package-data": {
@@ -3024,9 +3024,9 @@
}
},
"node_modules/engine.io": {
- "version": "6.2.1",
- "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz",
- "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==",
+ "version": "6.4.2",
+ "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.4.2.tgz",
+ "integrity": "sha512-FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg==",
"dev": true,
"dependencies": {
"@types/cookie": "^0.4.1",
@@ -3038,7 +3038,7 @@
"cors": "~2.8.5",
"debug": "~4.3.1",
"engine.io-parser": "~5.0.3",
- "ws": "~8.2.3"
+ "ws": "~8.11.0"
},
"engines": {
"node": ">=10.0.0"
@@ -3112,6 +3112,27 @@
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true
},
+ "node_modules/engine.io/node_modules/ws": {
+ "version": "8.11.0",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+ "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
+ "dev": true,
+ "engines": {
+ "node": ">=10.0.0"
+ },
+ "peerDependencies": {
+ "bufferutil": "^4.0.1",
+ "utf-8-validate": "^5.0.2"
+ },
+ "peerDependenciesMeta": {
+ "bufferutil": {
+ "optional": true
+ },
+ "utf-8-validate": {
+ "optional": true
+ }
+ }
+ },
"node_modules/enquirer": {
"version": "2.3.6",
"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
@@ -8697,16 +8718,16 @@
}
},
"node_modules/socket.io": {
- "version": "4.5.4",
- "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.4.tgz",
- "integrity": "sha512-m3GC94iK9MfIEeIBfbhJs5BqFibMtkRk8ZpKwG2QwxV0m/eEhPIV4ara6XCF1LWNAus7z58RodiZlAH71U3EhQ==",
+ "version": "4.6.1",
+ "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.6.1.tgz",
+ "integrity": "sha512-KMcaAi4l/8+xEjkRICl6ak8ySoxsYG+gG6/XfRCPJPQ/haCRIJBTL4wIl8YCsmtaBovcAXGLOShyVWQ/FG8GZA==",
"dev": true,
"dependencies": {
"accepts": "~1.3.4",
"base64id": "~2.0.0",
"debug": "~4.3.2",
- "engine.io": "~6.2.1",
- "socket.io-adapter": "~2.4.0",
+ "engine.io": "~6.4.1",
+ "socket.io-adapter": "~2.5.2",
"socket.io-parser": "~4.2.1"
},
"engines": {
@@ -8714,10 +8735,34 @@
}
},
"node_modules/socket.io-adapter": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz",
- "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==",
- "dev": true
+ "version": "2.5.2",
+ "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz",
+ "integrity": "sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==",
+ "dev": true,
+ "dependencies": {
+ "ws": "~8.11.0"
+ }
+ },
+ "node_modules/socket.io-adapter/node_modules/ws": {
+ "version": "8.11.0",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+ "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
+ "dev": true,
+ "engines": {
+ "node": ">=10.0.0"
+ },
+ "peerDependencies": {
+ "bufferutil": "^4.0.1",
+ "utf-8-validate": "^5.0.2"
+ },
+ "peerDependenciesMeta": {
+ "bufferutil": {
+ "optional": true
+ },
+ "utf-8-validate": {
+ "optional": true
+ }
+ }
},
"node_modules/socket.io-client": {
"version": "4.5.4",
@@ -11257,9 +11302,9 @@
"dev": true
},
"@types/node": {
- "version": "18.11.17",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.17.tgz",
- "integrity": "sha512-HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng==",
+ "version": "20.2.3",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.2.3.tgz",
+ "integrity": "sha512-pg9d0yC4rVNWQzX8U7xb4olIOFuuVL9za3bzMT2pu2SU0SNEi66i2qrvhE2qt0HvkhuCaWJu7pLNOt/Pj8BIrw==",
"dev": true
},
"@types/normalize-package-data": {
@@ -13186,9 +13231,9 @@
}
},
"engine.io": {
- "version": "6.2.1",
- "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz",
- "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==",
+ "version": "6.4.2",
+ "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.4.2.tgz",
+ "integrity": "sha512-FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg==",
"dev": true,
"requires": {
"@types/cookie": "^0.4.1",
@@ -13200,7 +13245,7 @@
"cors": "~2.8.5",
"debug": "~4.3.1",
"engine.io-parser": "~5.0.3",
- "ws": "~8.2.3"
+ "ws": "~8.11.0"
},
"dependencies": {
"debug": {
@@ -13217,6 +13262,13 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true
+ },
+ "ws": {
+ "version": "8.11.0",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+ "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
+ "dev": true,
+ "requires": {}
}
}
},
@@ -17533,16 +17585,16 @@
"dev": true
},
"socket.io": {
- "version": "4.5.4",
- "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.4.tgz",
- "integrity": "sha512-m3GC94iK9MfIEeIBfbhJs5BqFibMtkRk8ZpKwG2QwxV0m/eEhPIV4ara6XCF1LWNAus7z58RodiZlAH71U3EhQ==",
+ "version": "4.6.1",
+ "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.6.1.tgz",
+ "integrity": "sha512-KMcaAi4l/8+xEjkRICl6ak8ySoxsYG+gG6/XfRCPJPQ/haCRIJBTL4wIl8YCsmtaBovcAXGLOShyVWQ/FG8GZA==",
"dev": true,
"requires": {
"accepts": "~1.3.4",
"base64id": "~2.0.0",
"debug": "~4.3.2",
- "engine.io": "~6.2.1",
- "socket.io-adapter": "~2.4.0",
+ "engine.io": "~6.4.1",
+ "socket.io-adapter": "~2.5.2",
"socket.io-parser": "~4.2.1"
},
"dependencies": {
@@ -17564,10 +17616,22 @@
}
},
"socket.io-adapter": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz",
- "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==",
- "dev": true
+ "version": "2.5.2",
+ "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz",
+ "integrity": "sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==",
+ "dev": true,
+ "requires": {
+ "ws": "~8.11.0"
+ },
+ "dependencies": {
+ "ws": {
+ "version": "8.11.0",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+ "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
+ "dev": true,
+ "requires": {}
+ }
+ }
},
"socket.io-client": {
"version": "4.5.4",
From 35679bc720d0e8d2406086b229671d82457fd8a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 17:56:32 +0200
Subject: [PATCH 16/63] Bump engine.io and socket.io in /extensions/amp/content
(#2495)
Bumps [engine.io](https://github.com/socketio/engine.io) and [socket.io](https://github.com/socketio/socket.io). These dependencies needed to be updated together.
Updates `engine.io` from 6.2.1 to 6.4.2
- [Release notes](https://github.com/socketio/engine.io/releases)
- [Changelog](https://github.com/socketio/engine.io/blob/main/CHANGELOG.md)
- [Commits](https://github.com/socketio/engine.io/compare/6.2.1...6.4.2)
Updates `socket.io` from 4.5.4 to 4.6.1
- [Release notes](https://github.com/socketio/socket.io/releases)
- [Changelog](https://github.com/socketio/socket.io/blob/main/CHANGELOG.md)
- [Commits](https://github.com/socketio/socket.io/compare/4.5.4...4.6.1)
---
updated-dependencies:
- dependency-name: engine.io
dependency-type: indirect
- dependency-name: socket.io
dependency-type: indirect
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
extensions/amp/content/package-lock.json | 110 +++++++++--------------
1 file changed, 44 insertions(+), 66 deletions(-)
diff --git a/extensions/amp/content/package-lock.json b/extensions/amp/content/package-lock.json
index 513c9734a4..1d01476d02 100644
--- a/extensions/amp/content/package-lock.json
+++ b/extensions/amp/content/package-lock.json
@@ -648,9 +648,9 @@
"dev": true
},
"node_modules/@types/node": {
- "version": "18.11.15",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.15.tgz",
- "integrity": "sha512-VkhBbVo2+2oozlkdHXLrb3zjsRkpdnaU2bXmX8Wgle3PUi569eLRaHGlgETQHR7lLL1w7GiG3h9SnePhxNDecw==",
+ "version": "20.2.3",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.2.3.tgz",
+ "integrity": "sha512-pg9d0yC4rVNWQzX8U7xb4olIOFuuVL9za3bzMT2pu2SU0SNEi66i2qrvhE2qt0HvkhuCaWJu7pLNOt/Pj8BIrw==",
"dev": true
},
"node_modules/@types/normalize-package-data": {
@@ -2380,9 +2380,9 @@
}
},
"node_modules/engine.io": {
- "version": "6.2.1",
- "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz",
- "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==",
+ "version": "6.4.2",
+ "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.4.2.tgz",
+ "integrity": "sha512-FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg==",
"dev": true,
"dependencies": {
"@types/cookie": "^0.4.1",
@@ -2394,7 +2394,7 @@
"cors": "~2.8.5",
"debug": "~4.3.1",
"engine.io-parser": "~5.0.3",
- "ws": "~8.2.3"
+ "ws": "~8.11.0"
},
"engines": {
"node": ">=10.0.0"
@@ -2436,27 +2436,6 @@
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true
},
- "node_modules/engine.io-client/node_modules/ws": {
- "version": "8.11.0",
- "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
- "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
- "dev": true,
- "engines": {
- "node": ">=10.0.0"
- },
- "peerDependencies": {
- "bufferutil": "^4.0.1",
- "utf-8-validate": "^5.0.2"
- },
- "peerDependenciesMeta": {
- "bufferutil": {
- "optional": true
- },
- "utf-8-validate": {
- "optional": true
- }
- }
- },
"node_modules/engine.io-parser": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz",
@@ -6943,16 +6922,16 @@
}
},
"node_modules/socket.io": {
- "version": "4.5.4",
- "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.4.tgz",
- "integrity": "sha512-m3GC94iK9MfIEeIBfbhJs5BqFibMtkRk8ZpKwG2QwxV0m/eEhPIV4ara6XCF1LWNAus7z58RodiZlAH71U3EhQ==",
+ "version": "4.6.1",
+ "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.6.1.tgz",
+ "integrity": "sha512-KMcaAi4l/8+xEjkRICl6ak8ySoxsYG+gG6/XfRCPJPQ/haCRIJBTL4wIl8YCsmtaBovcAXGLOShyVWQ/FG8GZA==",
"dev": true,
"dependencies": {
"accepts": "~1.3.4",
"base64id": "~2.0.0",
"debug": "~4.3.2",
- "engine.io": "~6.2.1",
- "socket.io-adapter": "~2.4.0",
+ "engine.io": "~6.4.1",
+ "socket.io-adapter": "~2.5.2",
"socket.io-parser": "~4.2.1"
},
"engines": {
@@ -6960,10 +6939,13 @@
}
},
"node_modules/socket.io-adapter": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz",
- "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==",
- "dev": true
+ "version": "2.5.2",
+ "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz",
+ "integrity": "sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==",
+ "dev": true,
+ "dependencies": {
+ "ws": "~8.11.0"
+ }
},
"node_modules/socket.io-client": {
"version": "4.6.1",
@@ -8380,9 +8362,9 @@
}
},
"node_modules/ws": {
- "version": "8.2.3",
- "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
- "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
+ "version": "8.11.0",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+ "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
"dev": true,
"engines": {
"node": ">=10.0.0"
@@ -9040,9 +9022,9 @@
"dev": true
},
"@types/node": {
- "version": "18.11.15",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.15.tgz",
- "integrity": "sha512-VkhBbVo2+2oozlkdHXLrb3zjsRkpdnaU2bXmX8Wgle3PUi569eLRaHGlgETQHR7lLL1w7GiG3h9SnePhxNDecw==",
+ "version": "20.2.3",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.2.3.tgz",
+ "integrity": "sha512-pg9d0yC4rVNWQzX8U7xb4olIOFuuVL9za3bzMT2pu2SU0SNEi66i2qrvhE2qt0HvkhuCaWJu7pLNOt/Pj8BIrw==",
"dev": true
},
"@types/normalize-package-data": {
@@ -10392,9 +10374,9 @@
}
},
"engine.io": {
- "version": "6.2.1",
- "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz",
- "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==",
+ "version": "6.4.2",
+ "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.4.2.tgz",
+ "integrity": "sha512-FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg==",
"dev": true,
"requires": {
"@types/cookie": "^0.4.1",
@@ -10406,7 +10388,7 @@
"cors": "~2.8.5",
"debug": "~4.3.1",
"engine.io-parser": "~5.0.3",
- "ws": "~8.2.3"
+ "ws": "~8.11.0"
},
"dependencies": {
"debug": {
@@ -10453,13 +10435,6 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true
- },
- "ws": {
- "version": "8.11.0",
- "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
- "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
- "dev": true,
- "requires": {}
}
}
},
@@ -13861,16 +13836,16 @@
"dev": true
},
"socket.io": {
- "version": "4.5.4",
- "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.4.tgz",
- "integrity": "sha512-m3GC94iK9MfIEeIBfbhJs5BqFibMtkRk8ZpKwG2QwxV0m/eEhPIV4ara6XCF1LWNAus7z58RodiZlAH71U3EhQ==",
+ "version": "4.6.1",
+ "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.6.1.tgz",
+ "integrity": "sha512-KMcaAi4l/8+xEjkRICl6ak8ySoxsYG+gG6/XfRCPJPQ/haCRIJBTL4wIl8YCsmtaBovcAXGLOShyVWQ/FG8GZA==",
"dev": true,
"requires": {
"accepts": "~1.3.4",
"base64id": "~2.0.0",
"debug": "~4.3.2",
- "engine.io": "~6.2.1",
- "socket.io-adapter": "~2.4.0",
+ "engine.io": "~6.4.1",
+ "socket.io-adapter": "~2.5.2",
"socket.io-parser": "~4.2.1"
},
"dependencies": {
@@ -13892,10 +13867,13 @@
}
},
"socket.io-adapter": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz",
- "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==",
- "dev": true
+ "version": "2.5.2",
+ "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz",
+ "integrity": "sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==",
+ "dev": true,
+ "requires": {
+ "ws": "~8.11.0"
+ }
},
"socket.io-client": {
"version": "4.6.1",
@@ -14986,9 +14964,9 @@
}
},
"ws": {
- "version": "8.2.3",
- "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
- "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
+ "version": "8.11.0",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+ "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
"dev": true,
"requires": {}
},
From 918d7847f1fc38351c90bc9010643fe3fba4be73 Mon Sep 17 00:00:00 2001
From: Vlad
Date: Mon, 18 Dec 2023 09:09:51 +0200
Subject: [PATCH 17/63] Updated org.json dependency (#2593)
---
README.md | 2 +-
bundles/core/pom.xml | 1 -
.../com/day/cq/wcm/foundation/forms/FormsHelper.java | 5 ++---
parent/pom.xml | 12 ++++++++++++
4 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index 86a462fa2e..b643d1678f 100644
--- 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.23.4](https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.23.4) | Continual | 6.5.17.0+ | 8,
11 | 3.3.9+
+[2.23.5+](https://github.com/adobe/aem-core-wcm-components/releases/tag/core.wcm.components.reactor-2.23.4) | Continual | 6.5.19.0+ | 8,
11 | 3.3.9+
For the requirements from previous Core Component releases, see [Historical System Requirements](VERSIONS.md).
diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml
index a8ea6e2fa8..1be40ae6b4 100644
--- a/bundles/core/pom.xml
+++ b/bundles/core/pom.xml
@@ -528,7 +528,6 @@
3.8.1
test