Merge remote-tracking branch 'mainline/2.4.0-develop' into 3.0.0-RC5-2.4.0

# Conflicts:
#	composer.lock

Author: soumyau

app/code/Magento/Elasticsearch/composer.json

@@ -12,7 +12,7 @@
         "magento/module-store": "*",
         "magento/module-catalog-inventory": "*",
         "magento/framework": "*",
-        "elasticsearch/elasticsearch": "~7.6"
+        "elasticsearch/elasticsearch": "~7.7.0"
     },
     "suggest": {
         "magento/module-config": "*"

app/code/Magento/Elasticsearch6/Block/Adminhtml/System/Config/TestConnection.php

@@ -7,6 +7,7 @@
 
 /**
  * Elasticsearch 6.x test connection block
+ * @deprecated the new minor release supports compatibility with Elasticsearch 7
  */
 class TestConnection extends \Magento\AdvancedSearch\Block\Adminhtml\System\Config\TestConnection
 {

app/code/Magento/Elasticsearch6/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolver.php

@@ -12,6 +12,8 @@
 
 /**
  * Default name resolver.
+ *
+ * @deprecated the new minor release supports compatibility with Elasticsearch 7
  */
 class DefaultResolver extends Base
 {

app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php

@@ -11,6 +11,8 @@
 
 /**
  * Elasticsearch client
+ *
+ * @deprecated the new minor release supports compatibility with Elasticsearch 7
  */
 class Elasticsearch implements ClientInterface
 {

app/code/Magento/Elasticsearch6/composer.json

@@ -8,7 +8,7 @@
         "magento/module-catalog-search": "*",
         "magento/module-search": "*",
         "magento/module-elasticsearch": "*",
-        "elasticsearch/elasticsearch": "~7.6"
+        "elasticsearch/elasticsearch": "~7.7.0"
     },
     "suggest": {
         "magento/module-config": "*"

app/code/Magento/Elasticsearch6/etc/di.xml

@@ -17,7 +17,7 @@
     <type name="Magento\Search\Model\Adminhtml\System\Config\Source\Engine">
         <arguments>
             <argument name="engines" xsi:type="array">
-                <item sortOrder="20" name="elasticsearch6" xsi:type="string">Elasticsearch 6.x</item>
+                <item sortOrder="20" name="elasticsearch6" xsi:type="string">Elasticsearch 6.x (Deprecated)</item>
             </argument>
         </arguments>
     </type>

app/code/Magento/Elasticsearch7/composer.json

@@ -5,7 +5,7 @@
         "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-elasticsearch": "*",
-        "elasticsearch/elasticsearch": "~7.6",
+        "elasticsearch/elasticsearch": "~7.7.0",
         "magento/module-advanced-search": "*",
         "magento/module-catalog-search": "*"
     },

app/code/Magento/Elasticsearch7/etc/adminhtml/system.xml

@@ -10,7 +10,7 @@
     <system>
         <section id="catalog">
             <group id="search">
-                <!-- Elasticsearch 7.0+ -->
+                <!-- Elasticsearch 7 -->
                 <field id="elasticsearch7_server_hostname" translate="label" type="text" sortOrder="61"
                        showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Elasticsearch Server Hostname</label>

app/code/Magento/Elasticsearch7/etc/di.xml

@@ -17,7 +17,7 @@
     <type name="Magento\Search\Model\Adminhtml\System\Config\Source\Engine">
         <arguments>
             <argument name="engines" xsi:type="array">
-                <item sortOrder="30" name="elasticsearch7" xsi:type="string">Elasticsearch 7.0+</item>
+                <item sortOrder="30" name="elasticsearch7" xsi:type="string">Elasticsearch 7</item>
             </argument>
         </arguments>
     </type>

composer.json

@@ -33,7 +33,7 @@
         "colinmollenhour/credis": "1.11.1",
         "colinmollenhour/php-redis-session-abstract": "~1.4.0",
         "composer/composer": "^1.9",
-        "elasticsearch/elasticsearch": "~7.6",
+        "elasticsearch/elasticsearch": "~7.7.0",
         "guzzlehttp/guzzle": "^6.3.3",
         "laminas/laminas-captcha": "^2.7.1",
         "laminas/laminas-code": "~3.4.1",
@@ -88,7 +88,7 @@
         "friendsofphp/php-cs-fixer": "~2.16.0",
         "lusitanian/oauth": "~0.8.10",
         "magento/magento-coding-standard": "*",
-        "magento/magento2-functional-testing-framework": "dev-3.0.0-RC5",
+        "magento/magento2-functional-testing-framework": "3.0.0-RC5",
         "pdepend/pdepend": "~2.7.1",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "^2.8.0",