Skip to content

Commit 7bacf08

Browse files
diazwatsondiazwatson
authored
Merge branch 'develop' into issue-444
2 parents 75a61e1 + dfdca91 commit 7bacf08

File tree

14 files changed

+85
-83
lines changed

14 files changed

+85
-83
lines changed

‎AdobeIms/composer.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "Magento module responsible for authentication to Adobe services",
44
"require": {
55
"php": "~7.1.3||~7.2.0||~7.3.0",
6-
"magento/framework": "*",
7-
"magento/module-adobe-ims-api": "*",
8-
"magento/module-authorization": "*",
9-
"magento/module-backend": "*",
10-
"magento/module-config": "*",
11-
"magento/module-user": "*"
6+
"magento/framework": "102.0.*",
7+
"magento/module-adobe-ims-api": "1.*.*",
8+
"magento/module-authorization": "100.3.*",
9+
"magento/module-backend": "101.0.*",
10+
"magento/module-config": "101.1.*",
11+
"magento/module-user": "101.1.*"
1212
},
1313
"type": "magento2-module",
1414
"license": [
@@ -22,5 +22,6 @@
2222
"psr-4": {
2323
"Magento\\AdobeIms\\": ""
2424
}
25-
}
25+
},
26+
"version": "1.0.0"
2627
}

‎AdobeImsApi/composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Implementation of Magento module responsible for authentication to Adobe services",
44
"require": {
55
"php": "~7.1.3||~7.2.0||~7.3.0",
6-
"magento/framework": "*"
6+
"magento/framework": "102.0.*"
77
},
88
"type": "magento2-module",
99
"license": [
@@ -17,5 +17,6 @@
1717
"psr-4": {
1818
"Magento\\AdobeImsApi\\": ""
1919
}
20-
}
20+
},
21+
"version": "1.0.0"
2122
}

‎AdobeMediaGallery/composer.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"description": "Magento module responsible for media handling",
44
"require": {
55
"php": "~7.1.3||~7.2.0||~7.3.0",
6-
"magento/framework": "*",
7-
"magento/module-adobe-media-gallery-api": "*",
8-
"magento/module-cms": "*",
9-
"magento/module-catalog": "*"
6+
"magento/framework": "102.0.*",
7+
"magento/module-adobe-media-gallery-api": "1.*.*",
8+
"magento/module-cms": "103.0.*",
9+
"magento/module-catalog": "103.0.*"
1010
},
1111
"type": "magento2-module",
1212
"license": [
@@ -20,5 +20,6 @@
2020
"psr-4": {
2121
"Magento\\AdobeMediaGallery\\": ""
2222
}
23-
}
23+
},
24+
"version": "1.0.0"
2425
}

‎AdobeMediaGalleryApi/composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Magento module responsible for media gallery asset attributes storage and management",
44
"require": {
55
"php": "~7.1.3||~7.2.0||~7.3.0",
6-
"magento/framework": "*"
6+
"magento/framework": "102.0.*"
77
},
88
"type": "magento2-module",
99
"license": [
@@ -17,5 +17,6 @@
1717
"psr-4": {
1818
"Magento\\AdobeMediaGalleryApi\\": ""
1919
}
20-
}
20+
},
21+
"version": "1.0.0"
2122
}

‎AdobeStockAdminUi/composer.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"description": "Magento module responsible for the admin panel UI implementation",
44
"require": {
55
"php": "~7.1.3||~7.2.0||~7.3.0",
6-
"magento/framework": "*",
7-
"magento/module-adobe-ims-api": "*",
8-
"magento/module-adobe-stock-client-api": "*",
9-
"magento/module-backend": "*",
10-
"magento/module-config": "*"
6+
"magento/framework": "102.0.*",
7+
"magento/module-adobe-ims-api": "1.*.*",
8+
"magento/module-adobe-stock-client-api": "1.*.*",
9+
"magento/module-backend": "101.0.*",
10+
"magento/module-config": "101.1.*"
1111
},
1212
"suggest": {
1313
"magento/module-cms": "*"
@@ -24,5 +24,6 @@
2424
"psr-4": {
2525
"Magento\\AdobeStockAdminUi\\": ""
2626
}
27-
}
27+
},
28+
"version": "1.0.0"
2829
}

‎AdobeStockAsset/composer.json

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "Magento module responsible for the Adobe Stock assets handling implementation on Magento side",
44
"require": {
55
"php": "~7.1.3||~7.2.0||~7.3.0",
6-
"magento/framework": "*",
7-
"magento/module-adobe-stock-asset-api": "*",
8-
"magento/module-adobe-stock-client-api": "*",
9-
"magento/module-adobe-media-gallery-api": "*",
10-
"magento/module-adobe-media-gallery": "*",
11-
"magento/module-config": "*"
6+
"magento/framework": "102.0.*",
7+
"magento/module-adobe-stock-asset-api": "1.*.*",
8+
"magento/module-adobe-stock-client-api": "1.*.*",
9+
"magento/module-adobe-media-gallery-api": "1.*.*",
10+
"magento/module-adobe-media-gallery": "1.*.*",
11+
"magento/module-config": "101.1.*"
1212
},
1313
"type": "magento2-module",
1414
"license": [
@@ -23,10 +23,5 @@
2323
"Magento\\AdobeStockAsset\\": ""
2424
}
2525
},
26-
"repositories": {
27-
"stock-api-libphp": {
28-
"type": "vcs",
29-
"url": "[email protected]:adobe/stock-api-libphp.git"
30-
}
31-
}
26+
"version": "1.0.0"
3227
}

‎AdobeStockAssetApi/composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Magento module responsible for Adobe Stock assets handling on Magento side",
44
"require": {
55
"php": "~7.1.3||~7.2.0||~7.3.0",
6-
"magento/framework": "*"
6+
"magento/framework": "102.0.*"
77
},
88
"type": "magento2-module",
99
"license": [
@@ -17,5 +17,6 @@
1717
"psr-4": {
1818
"Magento\\AdobeStockAssetApi\\": ""
1919
}
20-
}
20+
},
21+
"version": "1.0.0"
2122
}

‎AdobeStockClient/composer.json

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"description": "Magento module responsible for interaction with Adobe Stock API implementation",
44
"require": {
55
"php": "~7.1.3||~7.2.0||~7.3.0",
6-
"magento/framework": "*",
7-
"magento/module-adobe-ims-api": "*",
8-
"magento/module-adobe-stock-client-api": "*",
9-
"magento/module-config": "*",
6+
"magento/framework": "102.0.*",
7+
"magento/module-adobe-ims-api": "1.*.*",
8+
"magento/module-adobe-stock-client-api": "1.*.*",
9+
"magento/module-config": "101.1.*",
1010
"astock/stock-api-libphp": "^1.1.2"
1111
},
1212
"type": "magento2-module",
@@ -22,10 +22,5 @@
2222
"Magento\\AdobeStockClient\\": ""
2323
}
2424
},
25-
"repositories": {
26-
"stock-api-libphp": {
27-
"type": "vcs",
28-
"url": "[email protected]:adobe/stock-api-libphp.git"
29-
}
30-
}
25+
"version": "1.0.0"
3126
}

‎AdobeStockClientApi/composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Magento module responsible for interaction with Adobe Stock API",
44
"require": {
55
"php": "~7.1.3||~7.2.0||~7.3.0",
6-
"magento/framework": "*"
6+
"magento/framework": "102.0.*"
77
},
88
"type": "magento2-module",
99
"license": [
@@ -17,5 +17,6 @@
1717
"psr-4": {
1818
"Magento\\AdobeStockClientApi\\": ""
1919
}
20-
}
20+
},
21+
"version": "1.0.0"
2122
}

‎AdobeStockImage/composer.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"description": "Magento module responsible for the images handling implementation",
44
"require": {
55
"php": "~7.1.3||~7.2.0||~7.3.0",
6-
"magento/framework": "*",
7-
"magento/module-adobe-stock-client-api": "*",
8-
"magento/module-adobe-stock-asset-api": "*",
9-
"magento/module-adobe-stock-image-api": "*",
10-
"magento/module-adobe-media-gallery-api": "*"
6+
"magento/framework": "102.0.*",
7+
"magento/module-adobe-stock-client-api": "1.*.*",
8+
"magento/module-adobe-stock-asset-api": "1.*.*",
9+
"magento/module-adobe-stock-image-api": "1.*.*",
10+
"magento/module-adobe-media-gallery-api": "1.*.*"
1111
},
1212
"suggest": {
13-
"magento/module-catalog": "*"
13+
"magento/module-catalog": "103.0.*"
1414
},
1515
"type": "magento2-module",
1616
"license": [
@@ -24,5 +24,6 @@
2424
"psr-4": {
2525
"Magento\\AdobeStockImage\\": ""
2626
}
27-
}
27+
},
28+
"version": "1.0.0"
2829
}

‎AdobeStockImageAdminUi/composer.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
"description": "Magento module responsible for the admin panel images UI implementation",
44
"require": {
55
"php": "~7.1.3||~7.2.0||~7.3.0",
6-
"magento/framework": "*",
7-
"magento/module-adobe-ims": "*",
8-
"magento/module-adobe-ims-api": "*",
9-
"magento/module-adobe-stock-asset-api": "*",
10-
"magento/module-adobe-stock-image-api": "*",
11-
"magento/module-adobe-stock-client-api": "*",
12-
"magento/module-backend": "*",
13-
"magento/module-ui": "*"
6+
"magento/framework": "102.0.*",
7+
"magento/module-adobe-ims": "1.*.*",
8+
"magento/module-adobe-ims-api": "1.*.*",
9+
"magento/module-adobe-stock-asset-api": "1.*.*",
10+
"magento/module-adobe-stock-image-api": "1.*.*",
11+
"magento/module-adobe-stock-client-api": "1.*.*",
12+
"magento/module-backend": "101.0.*",
13+
"magento/module-ui": "101.1.*"
1414
},
1515
"suggest": {
16-
"magento/module-cms": "*"
16+
"magento/module-cms": "103.0.*"
1717
},
1818
"type": "magento2-module",
1919
"license": [
@@ -27,5 +27,6 @@
2727
"psr-4": {
2828
"Magento\\AdobeStockImageAdminUi\\": ""
2929
}
30-
}
30+
},
31+
"version": "1.0.0"
3132
}

‎AdobeStockImageApi/composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Magento module responsible for the images handling",
44
"require": {
55
"php": "~7.1.3||~7.2.0||~7.3.0",
6-
"magento/framework": "*"
6+
"magento/framework": "102.0.*"
77
},
88
"type": "magento2-module",
99
"license": [
@@ -17,5 +17,6 @@
1717
"psr-4": {
1818
"Magento\\AdobeStockImageApi\\": ""
1919
}
20-
}
20+
},
21+
"version": "1.0.0"
2122
}

‎AdobeUi/composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "N/A",
44
"require": {
55
"php": "~7.1.3||~7.2.0||~7.3.0",
6-
"magento/framework": "*"
6+
"magento/framework": "102.0.*"
77
},
88
"type": "magento2-module",
99
"license": [
@@ -17,5 +17,6 @@
1717
"psr-4": {
1818
"Magento\\AdobeUi\\": ""
1919
}
20-
}
20+
},
21+
"version": "1.0.0"
2122
}

‎_metapackage/composer.json

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,19 @@
33
"description": "Adobe Stock integration",
44
"type": "metapackage",
55
"require": {
6-
"magento/module-adobe-stock-asset": "*",
7-
"magento/module-adobe-stock-asset-api": "*",
8-
"magento/module-adobe-stock-image": "*",
9-
"magento/module-adobe-stock-image-admin-ui": "*",
10-
"magento/module-adobe-stock-image-api": "*",
11-
"magento/module-adobe-stock-client": "*",
12-
"magento/module-adobe-stock-client-api": "*",
13-
"magento/module-adobe-stock-admin-ui": "*",
14-
"magento/module-adobe-ims": "*",
15-
"magento/module-adobe-ui": "*",
16-
"magento/module-adobe-ims-api": "*",
17-
"magento/module-adobe-media-gallery-api": "*",
18-
"magento/module-adobe-media-gallery": "*"
19-
}
6+
"magento/module-adobe-stock-asset": "1.0.0",
7+
"magento/module-adobe-stock-asset-api": "1.0.0",
8+
"magento/module-adobe-stock-image": "1.0.0",
9+
"magento/module-adobe-stock-image-admin-ui": "1.0.0",
10+
"magento/module-adobe-stock-image-api": "1.0.0",
11+
"magento/module-adobe-stock-client": "1.0.0",
12+
"magento/module-adobe-stock-client-api": "1.0.0",
13+
"magento/module-adobe-stock-admin-ui": "1.0.0",
14+
"magento/module-adobe-ims": "1.0.0",
15+
"magento/module-adobe-ui": "1.0.0",
16+
"magento/module-adobe-ims-api": "1.0.0",
17+
"magento/module-adobe-media-gallery-api": "1.0.0",
18+
"magento/module-adobe-media-gallery": "1.0.0"
19+
},
20+
"version": "1.0.0"
2021
}

0 commit comments

Comments
 (0)