Upstream Merge Conflict (2.4-develop)

app/code/Magento/AdvancedSearch/README.md

@@ -7,7 +7,7 @@ The Magento_AdvancedSearch module introduces advanced search functionality and p
 Before disabling or uninstalling this module, note that the following modules depends on this module:
 
 - Magento_Elasticsearch
-- Magento_Elasticsearch7
+- Magento_Elasticsearch8
 
 For information about module installation in Magento 2, see [Enable or disable modules](https://experienceleague.adobe.com/docs/commerce-operations/installation-guide/tutorials/manage-modules.html).
 

app/code/Magento/CatalogSearch/view/adminhtml/web/js/search-engine-comment.js

@@ -17,7 +17,7 @@ require([
                 'It is recommended to use OpenSearch as a search engine instead.'),
             updateCommentText = () => {
                 const engineValue = engineField.val(),
-                    newCommentText = ['elasticsearch7', 'elasticsearch8'].includes(engineValue) ?
+                    newCommentText = ['elasticsearch8'].includes(engineValue) ?
                         unsupportedText : defaultText;
 
                 if (commentContainer.text() !== newCommentText) {

app/code/Magento/Config/Test/Mftf/ActionGroup/ChooseElasticSearchAsSearchEngineActionGroup.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="ChooseElasticSearchAsSearchEngineActionGroup">
         <annotations>
-            <description>Goes to the 'Configuration' page for 'Catalog'. Sets the 'Search Engine' to 'elasticsearch7'. Clicks on the Save button. PLEASE NOTE: The value is Hardcoded.</description>
+            <description>Goes to the 'Configuration' page for 'Catalog'. Sets the 'Search Engine' to 'elasticsearch8'. Clicks on the Save button. PLEASE NOTE: The value is Hardcoded.</description>
         </annotations>
 
         <amOnPage url="{{AdminCatalogSearchConfigurationPage.url}}" stepKey="configureSearchEngine"/>
@@ -19,7 +19,7 @@
         <conditionalClick selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" dependentSelector="{{AdminCatalogSearchConfigurationSection.checkIfCatalogSearchTabExpand}}" visible="true" stepKey="expandCatalogSearchTab"/>
         <waitForElementVisible selector="{{AdminCatalogSearchConfigurationSection.searchEngine}}" stepKey="waitForDropdownToBeVisible"/>
         <uncheckOption selector="{{AdminCatalogSearchConfigurationSection.searchEngineDefaultSystemValue}}" stepKey="uncheckUseSystemValue"/>
-        <selectOption selector="{{AdminCatalogSearchConfigurationSection.searchEngine}}" userInput="Elasticsearch 7" stepKey="chooseES5"/>
+        <selectOption selector="{{AdminCatalogSearchConfigurationSection.searchEngine}}" userInput="Elasticsearch 8" stepKey="chooseES5"/>
         <!--<scrollTo selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="scrollToCatalogSearchTab2"/>-->
         <!--<click selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="collapseCatalogSearchTab"/>-->
         <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfiguration"/>

app/code/Magento/Elasticsearch/composer.json

@@ -12,7 +12,7 @@
         "magento/module-store": "*",
         "magento/module-catalog-inventory": "*",
         "magento/framework": "*",
-        "magento/elasticsearch": "^1.0.0"
+        "elasticsearch/elasticsearch": "^8.15"
     },
     "suggest": {
         "magento/module-config": "*"