Skip to content

Commit 5fc194d

Browse files
zakdmazakdma
committed
MC-38139: SD branches of 2.4.1 release are not up-to-date with the latest release
Revert "COMOPS-1042: 2.4.0 packaging" This reverts commit ba6c8d4
1 parent ea5603b commit 5fc194d

File tree

20 files changed

+117
-137
lines changed

20 files changed

+117
-137
lines changed

‎app/code/Magento/BundleSampleData/composer.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "N/A",
44
"require": {
55
"php": "~7.3.0||~7.4.0",
6-
"magento/framework": "103.0.*",
7-
"magento/module-bundle": "101.0.*",
8-
"magento/module-catalog-sample-data": "100.4.*",
9-
"magento/module-store": "101.1.*",
10-
"magento/module-catalog": "104.0.*",
11-
"magento/module-eav": "102.1.*"
6+
"magento/framework": "*",
7+
"magento/module-bundle": "*",
8+
"magento/module-catalog-sample-data": "*",
9+
"magento/module-store": "*",
10+
"magento/module-catalog": "*",
11+
"magento/module-eav": "*"
1212
},
1313
"type": "magento2-module",
1414
"license": [
@@ -22,6 +22,5 @@
2222
"psr-4": {
2323
"Magento\\BundleSampleData\\": ""
2424
}
25-
},
26-
"version": "100.4.0"
25+
}
2726
}

‎app/code/Magento/CatalogRuleSampleData/composer.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"description": "N/A",
44
"require": {
55
"php": "~7.3.0||~7.4.0",
6-
"magento/framework": "103.0.*",
7-
"magento/module-catalog-rule": "101.2.*",
8-
"magento/module-store": "101.1.*",
9-
"magento/module-customer": "103.0.*",
10-
"magento/module-catalog": "104.0.*"
6+
"magento/framework": "*",
7+
"magento/module-catalog-rule": "*",
8+
"magento/module-store": "*",
9+
"magento/module-customer": "*",
10+
"magento/module-catalog": "*"
1111
},
1212
"type": "magento2-module",
1313
"license": [
@@ -21,6 +21,5 @@
2121
"psr-4": {
2222
"Magento\\CatalogRuleSampleData\\": ""
2323
}
24-
},
25-
"version": "100.4.0"
24+
}
2625
}

‎app/code/Magento/CatalogSampleData/composer.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"description": "N/A",
44
"require": {
55
"php": "~7.3.0||~7.4.0",
6-
"magento/framework": "103.0.*",
7-
"magento/module-store": "101.1.*",
8-
"magento/module-eav": "102.1.*",
9-
"magento/module-catalog": "104.0.*"
6+
"magento/framework": "*",
7+
"magento/module-store": "*",
8+
"magento/module-eav": "*",
9+
"magento/module-catalog": "*"
1010
},
1111
"type": "magento2-module",
1212
"license": [
@@ -20,6 +20,5 @@
2020
"psr-4": {
2121
"Magento\\CatalogSampleData\\": ""
2222
}
23-
},
24-
"version": "100.4.0"
23+
}
2524
}

‎app/code/Magento/CmsSampleData/composer.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"description": "N/A",
44
"require": {
55
"php": "~7.3.0||~7.4.0",
6-
"magento/framework": "103.0.*",
7-
"magento/module-cms": "104.0.*",
8-
"magento/module-theme-sample-data": "100.4.*",
9-
"magento/module-catalog-sample-data": "100.4.*",
10-
"magento/module-catalog": "104.0.*",
11-
"magento/module-store": "101.1.*",
12-
"magento/module-eav": "102.1.*"
6+
"magento/framework": "*",
7+
"magento/module-cms": "*",
8+
"magento/module-theme-sample-data": "*",
9+
"magento/module-catalog-sample-data": "*",
10+
"magento/module-catalog": "*",
11+
"magento/module-store": "*",
12+
"magento/module-eav": "*"
1313
},
1414
"type": "magento2-module",
1515
"license": [
@@ -23,6 +23,5 @@
2323
"psr-4": {
2424
"Magento\\CmsSampleData\\": ""
2525
}
26-
},
27-
"version": "100.4.0"
26+
}
2827
}

‎app/code/Magento/ConfigurableSampleData/composer.json

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"description": "N/A",
44
"require": {
55
"php": "~7.3.0||~7.4.0",
6-
"magento/framework": "103.0.*",
7-
"magento/module-configurable-product": "100.4.*",
8-
"magento/module-product-links-sample-data": "100.4.*",
9-
"magento/module-indexer": "100.4.*",
10-
"magento/module-catalog-sample-data": "100.4.*",
11-
"magento/module-import-export": "101.0.*",
12-
"magento/module-eav": "102.1.*",
13-
"magento/module-catalog": "104.0.*"
6+
"magento/framework": "*",
7+
"magento/module-configurable-product": "*",
8+
"magento/module-product-links-sample-data": "*",
9+
"magento/module-indexer": "*",
10+
"magento/module-catalog-sample-data": "*",
11+
"magento/module-import-export": "*",
12+
"magento/module-eav": "*",
13+
"magento/module-catalog": "*"
1414
},
1515
"type": "magento2-module",
1616
"license": [
@@ -24,6 +24,5 @@
2424
"psr-4": {
2525
"Magento\\ConfigurableSampleData\\": ""
2626
}
27-
},
28-
"version": "100.4.0"
27+
}
2928
}

‎app/code/Magento/CustomerSampleData/composer.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"description": "N/A",
44
"require": {
55
"php": "~7.3.0||~7.4.0",
6-
"magento/framework": "103.0.*",
7-
"magento/module-customer": "103.0.*",
8-
"magento/module-directory": "100.4.*",
9-
"magento/module-store": "101.1.*"
6+
"magento/framework": "*",
7+
"magento/module-customer": "*",
8+
"magento/module-directory": "*",
9+
"magento/module-store": "*"
1010
},
1111
"type": "magento2-module",
1212
"license": [
@@ -20,6 +20,5 @@
2020
"psr-4": {
2121
"Magento\\CustomerSampleData\\": ""
2222
}
23-
},
24-
"version": "100.4.0"
23+
}
2524
}

‎app/code/Magento/DownloadableSampleData/composer.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "N/A",
44
"require": {
55
"php": "~7.3.0||~7.4.0",
6-
"magento/framework": "103.0.*",
7-
"magento/module-catalog-sample-data": "100.4.*",
8-
"magento/module-downloadable": "100.4.*",
9-
"magento/module-store": "101.1.*",
10-
"magento/module-eav": "102.1.*",
11-
"magento/module-catalog": "104.0.*"
6+
"magento/framework": "*",
7+
"magento/module-catalog-sample-data": "*",
8+
"magento/module-downloadable": "*",
9+
"magento/module-store": "*",
10+
"magento/module-eav": "*",
11+
"magento/module-catalog": "*"
1212
},
1313
"type": "magento2-module",
1414
"license": [
@@ -22,6 +22,5 @@
2222
"psr-4": {
2323
"Magento\\DownloadableSampleData\\": ""
2424
}
25-
},
26-
"version": "100.4.0"
25+
}
2726
}

‎app/code/Magento/GroupedProductSampleData/composer.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "N/A",
44
"require": {
55
"php": "~7.3.0||~7.4.0",
6-
"magento/framework": "103.0.*",
7-
"magento/module-catalog-sample-data": "100.4.*",
8-
"magento/module-grouped-product": "100.4.*",
9-
"magento/module-store": "101.1.*",
10-
"magento/module-catalog": "104.0.*",
11-
"magento/module-eav": "102.1.*"
6+
"magento/framework": "*",
7+
"magento/module-catalog-sample-data": "*",
8+
"magento/module-grouped-product": "*",
9+
"magento/module-store": "*",
10+
"magento/module-catalog": "*",
11+
"magento/module-eav": "*"
1212
},
1313
"type": "magento2-module",
1414
"license": [
@@ -22,6 +22,5 @@
2222
"psr-4": {
2323
"Magento\\GroupedProductSampleData\\": ""
2424
}
25-
},
26-
"version": "100.4.0"
25+
}
2726
}

‎app/code/Magento/MsrpSampleData/composer.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"description": "N/A",
44
"require": {
55
"php": "~7.3.0||~7.4.0",
6-
"magento/framework": "103.0.*",
7-
"magento/module-msrp": "100.4.*",
8-
"magento/module-customer": "103.0.*",
9-
"magento/module-catalog": "104.0.*"
6+
"magento/framework": "*",
7+
"magento/module-msrp": "*",
8+
"magento/module-customer": "*",
9+
"magento/module-catalog": "*"
1010
},
1111
"type": "magento2-module",
1212
"license": [
@@ -20,6 +20,5 @@
2020
"psr-4": {
2121
"Magento\\MsrpSampleData\\": ""
2222
}
23-
},
24-
"version": "100.4.0"
23+
}
2524
}

‎app/code/Magento/OfflineShippingSampleData/composer.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"description": "N/A",
44
"require": {
55
"php": "~7.3.0||~7.4.0",
6-
"magento/framework": "103.0.*",
7-
"magento/module-offline-shipping": "100.4.*",
8-
"magento/module-directory": "100.4.*",
9-
"magento/module-config": "101.2.*",
10-
"magento/module-store": "101.1.*"
6+
"magento/framework": "*",
7+
"magento/module-offline-shipping": "*",
8+
"magento/module-directory": "*",
9+
"magento/module-config": "*",
10+
"magento/module-store": "*"
1111
},
1212
"type": "magento2-module",
1313
"license": [
@@ -21,6 +21,5 @@
2121
"psr-4": {
2222
"Magento\\OfflineShippingSampleData\\": ""
2323
}
24-
},
25-
"version": "100.4.0"
24+
}
2625
}

0 commit comments

Comments
 (0)