MC-38139: SD branches of 2.4.1 release are not up-to-date with the latest release

zakdma · zakdma · commit 5fc194dd7724 · 2020-10-06T22:30:58.000+03:00
Revert "COMOPS-1042: 2.4.0 packaging" This reverts commit ba6c8d4
diff --git a/app/code/Magento/BundleSampleData/composer.json b/app/code/Magento/BundleSampleData/composer.json
@@ -3,12 +3,12 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-bundle": "101.0.*",
-        "magento/module-catalog-sample-data": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-eav": "102.1.*"
+        "magento/framework": "*",
+        "magento/module-bundle": "*",
+        "magento/module-catalog-sample-data": "*",
+        "magento/module-store": "*",
+        "magento/module-catalog": "*",
+        "magento/module-eav": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -22,6 +22,5 @@
         "psr-4": {
             "Magento\\BundleSampleData\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/CatalogRuleSampleData/composer.json b/app/code/Magento/CatalogRuleSampleData/composer.json
@@ -3,11 +3,11 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog-rule": "101.2.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-catalog": "104.0.*"
+        "magento/framework": "*",
+        "magento/module-catalog-rule": "*",
+        "magento/module-store": "*",
+        "magento/module-customer": "*",
+        "magento/module-catalog": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -21,6 +21,5 @@
         "psr-4": {
             "Magento\\CatalogRuleSampleData\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/CatalogSampleData/composer.json b/app/code/Magento/CatalogSampleData/composer.json
@@ -3,10 +3,10 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-catalog": "104.0.*"
+        "magento/framework": "*",
+        "magento/module-store": "*",
+        "magento/module-eav": "*",
+        "magento/module-catalog": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -20,6 +20,5 @@
         "psr-4": {
             "Magento\\CatalogSampleData\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/CmsSampleData/composer.json b/app/code/Magento/CmsSampleData/composer.json
@@ -3,13 +3,13 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-cms": "104.0.*",
-        "magento/module-theme-sample-data": "100.4.*",
-        "magento/module-catalog-sample-data": "100.4.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-eav": "102.1.*"
+        "magento/framework": "*",
+        "magento/module-cms": "*",
+        "magento/module-theme-sample-data": "*",
+        "magento/module-catalog-sample-data": "*",
+        "magento/module-catalog": "*",
+        "magento/module-store": "*",
+        "magento/module-eav": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -23,6 +23,5 @@
         "psr-4": {
             "Magento\\CmsSampleData\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/ConfigurableSampleData/composer.json b/app/code/Magento/ConfigurableSampleData/composer.json
@@ -3,14 +3,14 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-configurable-product": "100.4.*",
-        "magento/module-product-links-sample-data": "100.4.*",
-        "magento/module-indexer": "100.4.*",
-        "magento/module-catalog-sample-data": "100.4.*",
-        "magento/module-import-export": "101.0.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-catalog": "104.0.*"
+        "magento/framework": "*",
+        "magento/module-configurable-product": "*",
+        "magento/module-product-links-sample-data": "*",
+        "magento/module-indexer": "*",
+        "magento/module-catalog-sample-data": "*",
+        "magento/module-import-export": "*",
+        "magento/module-eav": "*",
+        "magento/module-catalog": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -24,6 +24,5 @@
         "psr-4": {
             "Magento\\ConfigurableSampleData\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/CustomerSampleData/composer.json b/app/code/Magento/CustomerSampleData/composer.json
@@ -3,10 +3,10 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -20,6 +20,5 @@
         "psr-4": {
             "Magento\\CustomerSampleData\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/DownloadableSampleData/composer.json b/app/code/Magento/DownloadableSampleData/composer.json
@@ -3,12 +3,12 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog-sample-data": "100.4.*",
-        "magento/module-downloadable": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-catalog": "104.0.*"
+        "magento/framework": "*",
+        "magento/module-catalog-sample-data": "*",
+        "magento/module-downloadable": "*",
+        "magento/module-store": "*",
+        "magento/module-eav": "*",
+        "magento/module-catalog": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -22,6 +22,5 @@
         "psr-4": {
             "Magento\\DownloadableSampleData\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/GroupedProductSampleData/composer.json b/app/code/Magento/GroupedProductSampleData/composer.json
@@ -3,12 +3,12 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog-sample-data": "100.4.*",
-        "magento/module-grouped-product": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-eav": "102.1.*"
+        "magento/framework": "*",
+        "magento/module-catalog-sample-data": "*",
+        "magento/module-grouped-product": "*",
+        "magento/module-store": "*",
+        "magento/module-catalog": "*",
+        "magento/module-eav": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -22,6 +22,5 @@
         "psr-4": {
             "Magento\\GroupedProductSampleData\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/MsrpSampleData/composer.json b/app/code/Magento/MsrpSampleData/composer.json
@@ -3,10 +3,10 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-msrp": "100.4.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-catalog": "104.0.*"
+        "magento/framework": "*",
+        "magento/module-msrp": "*",
+        "magento/module-customer": "*",
+        "magento/module-catalog": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -20,6 +20,5 @@
         "psr-4": {
             "Magento\\MsrpSampleData\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/OfflineShippingSampleData/composer.json b/app/code/Magento/OfflineShippingSampleData/composer.json
@@ -3,11 +3,11 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-offline-shipping": "100.4.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-offline-shipping": "*",
+        "magento/module-directory": "*",
+        "magento/module-config": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -21,6 +21,5 @@
         "psr-4": {
             "Magento\\OfflineShippingSampleData\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/ProductLinksSampleData/composer.json b/app/code/Magento/ProductLinksSampleData/composer.json
@@ -3,8 +3,8 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog": "104.0.*"
+        "magento/framework": "*",
+        "magento/module-catalog": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -18,6 +18,5 @@
         "psr-4": {
             "Magento\\ProductLinksSampleData\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/ReviewSampleData/composer.json b/app/code/Magento/ReviewSampleData/composer.json
@@ -3,11 +3,11 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-review": "100.4.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-review": "*",
+        "magento/module-customer": "*",
+        "magento/module-catalog": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -21,6 +21,5 @@
         "psr-4": {
             "Magento\\ReviewSampleData\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/SalesRuleSampleData/composer.json b/app/code/Magento/SalesRuleSampleData/composer.json
@@ -3,10 +3,10 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog-rule-sample-data": "100.4.*",
-        "magento/module-sales-rule": "101.2.*",
-        "magento/module-eav": "102.1.*"
+        "magento/framework": "*",
+        "magento/module-catalog-rule-sample-data": "*",
+        "magento/module-sales-rule": "*",
+        "magento/module-eav": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -20,6 +20,5 @@
         "psr-4": {
             "Magento\\SalesRuleSampleData\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/SalesSampleData/composer.json b/app/code/Magento/SalesSampleData/composer.json
@@ -3,16 +3,16 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-configurable-sample-data": "100.4.*",
-        "magento/module-catalog-inventory": "100.4.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-shipping": "100.4.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-sales": "*",
+        "magento/module-configurable-sample-data": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-customer": "*",
+        "magento/module-catalog": "*",
+        "magento/module-eav": "*",
+        "magento/module-backend": "*",
+        "magento/module-shipping": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -26,6 +26,5 @@
         "psr-4": {
             "Magento\\SalesSampleData\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/SwatchesSampleData/composer.json b/app/code/Magento/SwatchesSampleData/composer.json
@@ -3,9 +3,9 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-catalog": "104.0.*"
+        "magento/framework": "*",
+        "magento/module-eav": "*",
+        "magento/module-catalog": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -19,6 +19,5 @@
         "psr-4": {
             "Magento\\SwatchesSampleData\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/TaxSampleData/composer.json b/app/code/Magento/TaxSampleData/composer.json
diff --git a/app/code/Magento/ThemeSampleData/composer.json b/app/code/Magento/ThemeSampleData/composer.json
diff --git a/app/code/Magento/WidgetSampleData/composer.json b/app/code/Magento/WidgetSampleData/composer.json
diff --git a/app/code/Magento/WishlistSampleData/composer.json b/app/code/Magento/WishlistSampleData/composer.json
diff --git a/pub/media/composer.json b/pub/media/composer.json
