Merge remote-tracking branch 'origin/AC-12922' into Hammer-Platform-Health-2.4.8-beta2-28Oct24

Author: glo71317

composer.json

@@ -343,7 +343,6 @@
         "components/jquery": "1.11.0",
         "components/jqueryui": "1.10.4",
         "twbs/bootstrap": "3.1.0",
-        "tinymce/tinymce": "7.3.0",
         "magento/module-csp": "*",
         "magento/module-aws-s3": "*",
         "magento/module-remote-storage": "*",
@@ -365,8 +364,7 @@
             ],
             "twbs/bootstrap": [
                 "lib/web/jquery/jquery.tabs.js"
-            ],
-            "tinymce/tinymce": "lib/web/tiny_mce_5"
+            ]
         }
     },
     "autoload": {

dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/composer.json

@@ -160,8 +160,7 @@
         "components/jquery": "1.11.0",
         "blueimp/jquery-file-upload": "5.6.14",
         "components/jqueryui": "1.10.4",
-        "twbs/bootstrap": "3.1.0",
-        "tinymce/tinymce": "7.3.0"
+        "twbs/bootstrap": "3.1.0"
     },
     "extra": {
         "component_paths": {
@@ -180,8 +179,7 @@
             ],
             "twbs/bootstrap": [
                 "lib/web/jquery/jquery.tabs.js"
-            ],
-            "tinymce/tinymce": "lib/web/tiny_mce"
+            ]
         }
     },
     "config": {

dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.lock

@@ -21,8 +21,7 @@
         "lusitanian/oauth": "~0.3 <=0.7.0"
     },
     "replace": {
-        "magento/module-marketplace": "100.0.2",
-        "tinymce/tinymce": "7.3.0"
+        "magento/module-marketplace": "100.0.2"
     },
     "extra": {
         "component_paths": {
@@ -37,8 +36,7 @@
             ],
             "twbs/bootstrap": [
                 "lib/web/jquery/jquery.tabs.js"
-            ],
-            "tinymce/tinymce": "lib/web/tiny_mce"
+            ]
         }
     },
     "config": {