Skip to content

Commit e304792

Browse files
authored
Merge pull request #7565 from magento-atwix-pyrrans/delivery-bunch-w14
[Pyrrans] Delivery bunch 2022`W14
2 parents 5807cd9 + e1ffe1c commit e304792

File tree

6 files changed

+141
-24
lines changed

6 files changed

+141
-24
lines changed

app/code/Magento/Captcha/composer.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
"magento/module-sales": "*",
1414
"magento/module-store": "*",
1515
"magento/module-authorization": "*",
16-
"laminas/laminas-captcha": "^2.11.0",
17-
"laminas/laminas-db": "^2.13.4",
18-
"laminas/laminas-session": "^2.12.1"
16+
"laminas/laminas-captcha": "^2.12",
17+
"laminas/laminas-db": "^2.13.4"
1918
},
2019
"type": "magento2-module",
2120
"license": [

app/code/Magento/Elasticsearch/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"magento/module-store": "*",
1313
"magento/module-catalog-inventory": "*",
1414
"magento/framework": "*",
15-
"elasticsearch/elasticsearch": "~7.16.0"
15+
"elasticsearch/elasticsearch": "~7.17.0"
1616
},
1717
"suggest": {
1818
"magento/module-config": "*"

app/code/Magento/Elasticsearch6/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"magento/module-catalog-search": "*",
99
"magento/module-search": "*",
1010
"magento/module-elasticsearch": "*",
11-
"elasticsearch/elasticsearch": "~7.16.0"
11+
"elasticsearch/elasticsearch": "~7.17.0"
1212
},
1313
"suggest": {
1414
"magento/module-config": "*"

app/code/Magento/Elasticsearch7/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"php": "~7.4.0||~8.1.0",
66
"magento/framework": "*",
77
"magento/module-elasticsearch": "*",
8-
"elasticsearch/elasticsearch": "~7.16.0",
8+
"elasticsearch/elasticsearch": "~7.17.0",
99
"magento/module-advanced-search": "*",
1010
"magento/module-catalog-search": "*"
1111
},

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"composer/composer": "^1.9 || ^2.0",
4242
"elasticsearch/elasticsearch": "~7.17.0",
4343
"guzzlehttp/guzzle": "^7.4.2",
44-
"laminas/laminas-captcha": "^2.11",
44+
"laminas/laminas-captcha": "^2.12",
4545
"laminas/laminas-code": "~4.5.0",
4646
"laminas/laminas-db": "^2.13.4",
4747
"laminas/laminas-dependency-plugin": "^2.2.0",
@@ -57,7 +57,6 @@
5757
"laminas/laminas-mvc": "^3.3.3",
5858
"laminas/laminas-server": "^2.11.1",
5959
"laminas/laminas-servicemanager": "^3.10.0",
60-
"laminas/laminas-session": "^2.12.1",
6160
"laminas/laminas-soap": "^2.10.0",
6261
"laminas/laminas-stdlib": "^3.7.1",
6362
"laminas/laminas-uri": "^2.9.1",

composer.lock

Lines changed: 135 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)