diff --git a/AdobeStockAdminUi/composer.json b/AdobeStockAdminUi/composer.json index c9d3fa9bc153..ed2719d1062f 100644 --- a/AdobeStockAdminUi/composer.json +++ b/AdobeStockAdminUi/composer.json @@ -1,22 +1,23 @@ { "name": "magento/module-adobe-stock-admin-ui", "description": "Magento module responsible for the admin panel UI implementation", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.3.1", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", - "magento/module-adobe-ims-api": "*", - "magento/module-adobe-stock-client-api": "*", + "magento/module-adobe-ims-api": "2.1.*", + "magento/module-adobe-stock-client-api": "2.1.*", "magento/module-backend": "*", "magento/module-config": "*" }, "suggest": { "magento/module-cms": "*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -26,3 +27,4 @@ } } } + diff --git a/AdobeStockAsset/composer.json b/AdobeStockAsset/composer.json index c6e24e7cef5b..a8fc1e71cf05 100644 --- a/AdobeStockAsset/composer.json +++ b/AdobeStockAsset/composer.json @@ -1,20 +1,21 @@ { "name": "magento/module-adobe-stock-asset", "description": "Magento module responsible for the Adobe Stock assets handling implementation on Magento side", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.3.1", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", - "magento/module-adobe-stock-asset-api": "*", - "magento/module-adobe-stock-client-api": "*", + "magento/module-adobe-stock-asset-api": "2.0.*", + "magento/module-adobe-stock-client-api": "2.1.*", "magento/module-media-gallery-api": "*", "magento/module-media-gallery": "*", "magento/module-config": "*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -30,3 +31,4 @@ } } } + diff --git a/AdobeStockAssetApi/composer.json b/AdobeStockAssetApi/composer.json index 2330f8c8d352..ed178cefb27b 100644 --- a/AdobeStockAssetApi/composer.json +++ b/AdobeStockAssetApi/composer.json @@ -1,15 +1,16 @@ { "name": "magento/module-adobe-stock-asset-api", "description": "Magento module responsible for Adobe Stock assets handling on Magento side", - "require": { - "php": "~7.4.0||~8.1.0", - "magento/framework": "*" - }, "type": "magento2-module", "license": [ "OSL-3.0", "AFL-3.0" ], + "version": "2.0.1", + "require": { + "php": "~7.4.0||~8.1.0", + "magento/framework": "*" + }, "autoload": { "files": [ "registration.php" @@ -19,3 +20,4 @@ } } } + diff --git a/AdobeStockClient/composer.json b/AdobeStockClient/composer.json index b9d1f7a25698..0c99ef879680 100644 --- a/AdobeStockClient/composer.json +++ b/AdobeStockClient/composer.json @@ -1,18 +1,19 @@ { "name": "magento/module-adobe-stock-client", "description": "Magento module responsible for interaction with Adobe Stock API implementation", - "require": { - "php": "~7.4.0||~8.1.0", - "magento/framework": "*", - "magento/module-adobe-ims-api": "*", - "magento/module-adobe-stock-client-api": "*", - "astock/stock-api-libphp": "^1.1.2" - }, "type": "magento2-module", "license": [ "OSL-3.0", "AFL-3.0" ], + "version": "1.3.2", + "require": { + "php": "~7.4.0||~8.1.0", + "magento/framework": "*", + "magento/module-adobe-ims-api": "2.1.*", + "magento/module-adobe-stock-client-api": "2.1.*", + "astock/stock-api-libphp": "^1.1.2" + }, "autoload": { "files": [ "registration.php" @@ -28,3 +29,4 @@ } } } + diff --git a/AdobeStockClientApi/composer.json b/AdobeStockClientApi/composer.json index 3bccf1e61f3a..7eef1bbd4b6d 100644 --- a/AdobeStockClientApi/composer.json +++ b/AdobeStockClientApi/composer.json @@ -1,15 +1,16 @@ { "name": "magento/module-adobe-stock-client-api", "description": "Magento module responsible for interaction with Adobe Stock API", - "require": { - "php": "~7.4.0||~8.1.0", - "magento/framework": "*" - }, "type": "magento2-module", "license": [ "OSL-3.0", "AFL-3.0" ], + "version": "2.1.1", + "require": { + "php": "~7.4.0||~8.1.0", + "magento/framework": "*" + }, "autoload": { "files": [ "registration.php" @@ -19,3 +20,4 @@ } } } + diff --git a/AdobeStockImage/composer.json b/AdobeStockImage/composer.json index 0f963ebc8a3f..fcdeb7ae4fe3 100644 --- a/AdobeStockImage/composer.json +++ b/AdobeStockImage/composer.json @@ -1,23 +1,24 @@ { "name": "magento/module-adobe-stock-image", "description": "Magento module responsible for the images handling implementation", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.3.2", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", - "magento/module-adobe-stock-client-api": "*", - "magento/module-adobe-stock-asset-api": "*", - "magento/module-adobe-stock-image-api": "*", + "magento/module-adobe-stock-client-api": "2.1.*", + "magento/module-adobe-stock-asset-api": "2.0.*", + "magento/module-adobe-stock-image-api": "1.3.*", "magento/module-media-gallery-api": "*", "magento/module-media-gallery-synchronization-api": "*" }, "suggest": { "magento/module-catalog": "*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -27,3 +28,4 @@ } } } + diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavePreviewTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavePreviewTest.xml index f846c98b8a1f..02e537222e8e 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavePreviewTest.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockSavePreviewTest.xml @@ -17,6 +17,9 @@ + + Skipped + diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockStandaloneMediaGallerySavePreviewTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockStandaloneMediaGallerySavePreviewTest.xml index b331ee88a1c8..886934def5ff 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockStandaloneMediaGallerySavePreviewTest.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockStandaloneMediaGallerySavePreviewTest.xml @@ -16,6 +16,9 @@ media gallery storage root but they can save under the category and wysiwyg directory"/> + + Skipped + diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockVerifyUnlicensedLabelTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockVerifyUnlicensedLabelTest.xml index 8dae32bec580..e12018f9db1c 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockVerifyUnlicensedLabelTest.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockVerifyUnlicensedLabelTest.xml @@ -17,6 +17,9 @@ + + Skipped + diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminMediaGalleryCategorySavedPreviewAddSelectedTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminMediaGalleryCategorySavedPreviewAddSelectedTest.xml index acb30ea5802f..1977248ffcbc 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminMediaGalleryCategorySavedPreviewAddSelectedTest.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminMediaGalleryCategorySavedPreviewAddSelectedTest.xml @@ -17,6 +17,9 @@ + + Skipped + diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminSavesTheImagePreviewWithNewNameTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminSavesTheImagePreviewWithNewNameTest.xml index f64e5d4e734c..cb7b8d96119e 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminSavesTheImagePreviewWithNewNameTest.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminSavesTheImagePreviewWithNewNameTest.xml @@ -16,6 +16,9 @@ + + Skipped + diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminStandaloneMediaGallerySearchByKeywordTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminStandaloneMediaGallerySearchByKeywordTest.xml index 489d10b415ec..664079d2d1db 100644 --- a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminStandaloneMediaGallerySearchByKeywordTest.xml +++ b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminStandaloneMediaGallerySearchByKeywordTest.xml @@ -16,6 +16,9 @@ + + Skipped + diff --git a/AdobeStockImageAdminUi/composer.json b/AdobeStockImageAdminUi/composer.json index 20c878e64109..93c6efd1903f 100644 --- a/AdobeStockImageAdminUi/composer.json +++ b/AdobeStockImageAdminUi/composer.json @@ -1,14 +1,20 @@ { "name": "magento/module-adobe-stock-image-admin-ui", "description": "Magento module responsible for the admin panel images UI implementation", + "type": "magento2-module", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.3.2-p2", "require": { "php": "~7.4.0||~8.1.0", "magento/framework": "*", - "magento/module-adobe-ims": "*", - "magento/module-adobe-ims-api": "*", - "magento/module-adobe-stock-asset-api": "*", - "magento/module-adobe-stock-image-api": "*", - "magento/module-adobe-stock-client-api": "*", + "magento/module-adobe-ims": "2.1.*", + "magento/module-adobe-ims-api": "2.1.*", + "magento/module-adobe-stock-asset-api": "2.0.*", + "magento/module-adobe-stock-image-api": "1.3.*", + "magento/module-adobe-stock-client-api": "2.1.*", "magento/module-backend": "*", "magento/module-ui": "*", "magento/module-media-gallery-ui": "*", @@ -17,11 +23,6 @@ "suggest": { "magento/module-cms": "*" }, - "type": "magento2-module", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], "autoload": { "files": [ "registration.php" @@ -31,3 +32,4 @@ } } } + diff --git a/AdobeStockImageApi/composer.json b/AdobeStockImageApi/composer.json index aeffc363d25c..c89cb1376b83 100644 --- a/AdobeStockImageApi/composer.json +++ b/AdobeStockImageApi/composer.json @@ -1,15 +1,16 @@ { "name": "magento/module-adobe-stock-image-api", "description": "Magento module responsible for the images handling", - "require": { - "php": "~7.4.0||~8.1.0", - "magento/framework": "*" - }, "type": "magento2-module", "license": [ "OSL-3.0", "AFL-3.0" ], + "version": "1.3.1", + "require": { + "php": "~7.4.0||~8.1.0", + "magento/framework": "*" + }, "autoload": { "files": [ "registration.php" @@ -19,3 +20,4 @@ } } } + diff --git a/_metapackage/composer.json b/_metapackage/composer.json index 9ede320f0fd6..57720c58f506 100644 --- a/_metapackage/composer.json +++ b/_metapackage/composer.json @@ -2,15 +2,17 @@ "name": "magento/adobe-stock-integration", "description": "Adobe Stock integration", "type": "metapackage", + "version": "2.1.3-p4", "require": { - "magento/module-adobe-stock-asset": "*", - "magento/module-adobe-stock-asset-api": "*", - "magento/module-adobe-stock-image": "*", - "magento/module-adobe-stock-image-admin-ui": "*", - "magento/module-adobe-stock-image-api": "*", - "magento/module-adobe-stock-client": "*", - "magento/module-adobe-stock-client-api": "*", - "magento/module-adobe-stock-admin-ui": "*", - "magento/adobe-ims": "*" + "magento/module-adobe-stock-asset": "1.3.1", + "magento/module-adobe-stock-asset-api": "2.0.1", + "magento/module-adobe-stock-image": "1.3.2", + "magento/module-adobe-stock-image-admin-ui": "1.3.2-p2", + "magento/module-adobe-stock-image-api": "1.3.1", + "magento/module-adobe-stock-client": "1.3.2", + "magento/module-adobe-stock-client-api": "2.1.1", + "magento/module-adobe-stock-admin-ui": "1.3.1", + "magento/adobe-ims": "2.1.3-p4" } } +