Skip to content

Commit d2f9425

Browse files
authored
Merge pull request #57 from magento-commerce/develop
Merge develop into 2002.1
2 parents 3bf9f45 + aa57818 commit d2f9425

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

composer.json

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/ece-tools",
33
"description": "Provides tools to build and deploy Magento 2 Enterprise Edition",
44
"type": "magento2-component",
5-
"version": "2002.1.6",
5+
"version": "2002.1.7",
66
"license": "OSL-3.0",
77
"repositories": {
88
"repo.magento.com": {
@@ -16,15 +16,15 @@
1616
"ext-json": "*",
1717
"ext-sockets": "*",
1818
"colinmollenhour/credis": "^1.6.0",
19-
"composer/composer": "^1.4",
20-
"composer/semver": "^1.4",
19+
"composer/composer": "^1.4||^2.0",
20+
"composer/semver": "@stable",
2121
"graylog2/gelf-php": "^1.4.2",
2222
"guzzlehttp/guzzle": "^6.2",
2323
"illuminate/config": "^5.5",
24-
"magento/magento-cloud-components": "^1.0.6",
25-
"magento/magento-cloud-docker": "^1.0.0",
26-
"magento/magento-cloud-patches": "^1.0.6",
27-
"magento/quality-patches": "^1.0.3",
24+
"magento/magento-cloud-components": "^1.0.8",
25+
"magento/magento-cloud-docker": "^1.2",
26+
"magento/magento-cloud-patches": "^1.0.11",
27+
"magento/quality-patches": "^1.0.26",
2828
"monolog/monolog": "^1.16",
2929
"nesbot/carbon": "^1.0||^2.0",
3030
"psr/container": "^1.0",
@@ -94,12 +94,6 @@
9494
},
9595
"prefer-stable": true,
9696
"extra": {
97-
"map": [
98-
[
99-
"dist/.magento.env.yaml",
100-
".magento.env.yaml.dist"
101-
]
102-
],
10397
"include_files": [
10498
"vendor/codeception/phpunit-wrapper/src/phpunit7-interfaces.php"
10599
]

config/eol.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ php:
99
- version: '7.3'
1010
eol: 2021-12-06
1111
- version: '7.4'
12-
eol:
12+
eol: 2022-11-28
1313
mariadb:
1414
- version: '10.0'
1515
eol: 2019-03-31
@@ -40,6 +40,8 @@ elasticsearch:
4040
eol: 2021-08-11
4141
- version: '7.7'
4242
eol: 2021-11-13
43+
- version: '7.9'
44+
eol: 2022-02-18
4345
rabbitmq:
4446
- version: '3.5'
4547
eol: 2016-10-31

0 commit comments

Comments
 (0)