Skip to content

Commit ea5603b

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/2.4' into MC-38139-24
2 parents a3a9ac9 + ba6c8d4 commit ea5603b

File tree

20 files changed

+137
-117
lines changed

20 files changed

+137
-117
lines changed

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

Lines changed: 8 additions & 7 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": "*",
7-
"magento/module-bundle": "*",
8-
"magento/module-catalog-sample-data": "*",
9-
"magento/module-store": "*",
10-
"magento/module-catalog": "*",
11-
"magento/module-eav": "*"
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.*"
1212
},
1313
"type": "magento2-module",
1414
"license": [
@@ -22,5 +22,6 @@
2222
"psr-4": {
2323
"Magento\\BundleSampleData\\": ""
2424
}
25-
}
25+
},
26+
"version": "100.4.0"
2627
}

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

Lines changed: 7 additions & 6 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": "*",
7-
"magento/module-catalog-rule": "*",
8-
"magento/module-store": "*",
9-
"magento/module-customer": "*",
10-
"magento/module-catalog": "*"
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.*"
1111
},
1212
"type": "magento2-module",
1313
"license": [
@@ -21,5 +21,6 @@
2121
"psr-4": {
2222
"Magento\\CatalogRuleSampleData\\": ""
2323
}
24-
}
24+
},
25+
"version": "100.4.0"
2526
}

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

Lines changed: 6 additions & 5 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": "*",
7-
"magento/module-store": "*",
8-
"magento/module-eav": "*",
9-
"magento/module-catalog": "*"
6+
"magento/framework": "103.0.*",
7+
"magento/module-store": "101.1.*",
8+
"magento/module-eav": "102.1.*",
9+
"magento/module-catalog": "104.0.*"
1010
},
1111
"type": "magento2-module",
1212
"license": [
@@ -20,5 +20,6 @@
2020
"psr-4": {
2121
"Magento\\CatalogSampleData\\": ""
2222
}
23-
}
23+
},
24+
"version": "100.4.0"
2425
}

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

Lines changed: 9 additions & 8 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": "*",
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": "*"
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.*"
1313
},
1414
"type": "magento2-module",
1515
"license": [
@@ -23,5 +23,6 @@
2323
"psr-4": {
2424
"Magento\\CmsSampleData\\": ""
2525
}
26-
}
26+
},
27+
"version": "100.4.0"
2728
}

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

Lines changed: 10 additions & 9 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": "*",
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": "*"
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.*"
1414
},
1515
"type": "magento2-module",
1616
"license": [
@@ -24,5 +24,6 @@
2424
"psr-4": {
2525
"Magento\\ConfigurableSampleData\\": ""
2626
}
27-
}
27+
},
28+
"version": "100.4.0"
2829
}

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

Lines changed: 6 additions & 5 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": "*",
7-
"magento/module-customer": "*",
8-
"magento/module-directory": "*",
9-
"magento/module-store": "*"
6+
"magento/framework": "103.0.*",
7+
"magento/module-customer": "103.0.*",
8+
"magento/module-directory": "100.4.*",
9+
"magento/module-store": "101.1.*"
1010
},
1111
"type": "magento2-module",
1212
"license": [
@@ -20,5 +20,6 @@
2020
"psr-4": {
2121
"Magento\\CustomerSampleData\\": ""
2222
}
23-
}
23+
},
24+
"version": "100.4.0"
2425
}

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

Lines changed: 8 additions & 7 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": "*",
7-
"magento/module-catalog-sample-data": "*",
8-
"magento/module-downloadable": "*",
9-
"magento/module-store": "*",
10-
"magento/module-eav": "*",
11-
"magento/module-catalog": "*"
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.*"
1212
},
1313
"type": "magento2-module",
1414
"license": [
@@ -22,5 +22,6 @@
2222
"psr-4": {
2323
"Magento\\DownloadableSampleData\\": ""
2424
}
25-
}
25+
},
26+
"version": "100.4.0"
2627
}

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

Lines changed: 8 additions & 7 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": "*",
7-
"magento/module-catalog-sample-data": "*",
8-
"magento/module-grouped-product": "*",
9-
"magento/module-store": "*",
10-
"magento/module-catalog": "*",
11-
"magento/module-eav": "*"
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.*"
1212
},
1313
"type": "magento2-module",
1414
"license": [
@@ -22,5 +22,6 @@
2222
"psr-4": {
2323
"Magento\\GroupedProductSampleData\\": ""
2424
}
25-
}
25+
},
26+
"version": "100.4.0"
2627
}

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

Lines changed: 6 additions & 5 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": "*",
7-
"magento/module-msrp": "*",
8-
"magento/module-customer": "*",
9-
"magento/module-catalog": "*"
6+
"magento/framework": "103.0.*",
7+
"magento/module-msrp": "100.4.*",
8+
"magento/module-customer": "103.0.*",
9+
"magento/module-catalog": "104.0.*"
1010
},
1111
"type": "magento2-module",
1212
"license": [
@@ -20,5 +20,6 @@
2020
"psr-4": {
2121
"Magento\\MsrpSampleData\\": ""
2222
}
23-
}
23+
},
24+
"version": "100.4.0"
2425
}

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

Lines changed: 7 additions & 6 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": "*",
7-
"magento/module-offline-shipping": "*",
8-
"magento/module-directory": "*",
9-
"magento/module-config": "*",
10-
"magento/module-store": "*"
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.*"
1111
},
1212
"type": "magento2-module",
1313
"license": [
@@ -21,5 +21,6 @@
2121
"psr-4": {
2222
"Magento\\OfflineShippingSampleData\\": ""
2323
}
24-
}
24+
},
25+
"version": "100.4.0"
2526
}

0 commit comments

Comments
 (0)