MC-31986: Add support for ES 7 to 2.4-develop

Author: irenelagno

app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldType.php

@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\Index;
+namespace Magento\Elasticsearch\Test\Unit\Elasticsearch5\Model\Adapter\Index;
 
 use Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver;
 use Psr\Log\LoggerInterface;

app/code/Magento/Elasticsearch/Model/Adapter/Container/Attribute.php

@@ -4,14 +4,14 @@
     "require": {
         "php": "~7.1.3||~7.2.0||~7.3.0",
         "magento/framework": "*",
-        "magento/module-advanced-search": "*",
-        "magento/module-catalog-search": "*",
-        "magento/module-search": "*",
         "magento/module-elasticsearch": "*",
-        "elasticsearch/elasticsearch": "~7.6"
+        "elasticsearch/elasticsearch": "~7.6",
+        "magento/module-advanced-search": "*",
+        "magento/module-catalog-search": "*"
     },
     "suggest": {
-        "magento/module-config": "*"
+        "magento/module-config": "*",
+        "magento/module-search": "*"
     },
     "type": "magento2-module",
     "license": [