Version 2.1.6-p1

magento · Jun 6, 2024 · 70bed0c · 70bed0c
1 parent abde9b5
commit 70bed0c
Show file tree

Hide file tree

Showing 13 changed files with 82 additions and 58 deletions.
diff --git a/AdobeStockAdminUi/composer.json b/AdobeStockAdminUi/composer.json
@@ -1,23 +1,24 @@
 {
     "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.4",
     "require": {
         "php": "~8.1.0||~8.2.0||~8.3.0",
         "magento/framework": "*",
         "magento/module-admin-adobe-ims": "*",
         "magento/module-adobe-ims-api": "*",
-        "magento/module-adobe-stock-client-api": "*",
+        "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"
@@ -27,3 +28,4 @@
         }
     }
 }
+
diff --git 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.3",
     "require": {
         "php": "~8.1.0||~8.2.0||~8.3.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
@@ -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": "~8.1.0||~8.2.0||~8.3.0",
-        "magento/framework": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "2.0.3",
+    "require": {
+        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "magento/framework": "*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -19,3 +20,4 @@
         }
     }
 }
+
diff --git 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",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "1.3.4",
     "require": {
         "php": "~8.1.0||~8.2.0||~8.3.0",
         "magento/framework": "*",
         "magento/module-adobe-ims-api": "*",
-        "magento/module-adobe-stock-client-api": "*",
+        "magento/module-adobe-stock-client-api": "2.1.*",
         "astock/stock-api-libphp": "^1.1.2"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -28,3 +29,4 @@
         }
     }
 }
+
diff --git 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": "~8.1.0||~8.2.0||~8.3.0",
-        "magento/framework": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "2.1.4",
+    "require": {
+        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "magento/framework": "*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -19,3 +20,4 @@
         }
     }
 }
+
diff --git 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.5",
     "require": {
         "php": "~8.1.0||~8.2.0||~8.3.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/Data/AdobeStockImageData.xml b/AdobeStockImageAdminUi/Test/Mftf/Data/AdobeStockImageData.xml
@@ -24,4 +24,10 @@
         <data key="category">Castles</data>
         <data key="author">gam16</data>
     </entity>
+    <entity name="AdobeStockUnlicensedNewImage">
+        <data key="id">{{_CREDS.magento/adobe_stock_not_licensed_new_image}}</data>
+        <data key="status">Unlicensed</data>
+        <data key="category">Family Life</data>
+        <data key="author">Drobot Dean</data>
+    </entity>
 </entities>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesSeeMoreTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesSeeMoreTest.xml
@@ -34,7 +34,7 @@
         </actionGroup>
         <grabTextFrom selector="{{AdminAdobeStockSection.recordsFound}}" stepKey="countWithoutModelFilter"/>
         <actionGroup ref="AdminSearchImagesOnModalActionGroup" stepKey="searchForUnlicensedImage">
-            <argument name="query" value="{{AdobeStockUnlicensedImage.id}}"/>
+            <argument name="query" value="{{AdobeStockUnlicensedNewImage.id}}"/>
         </actionGroup>
         <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview"/>
         <waitForAjaxLoad stepKey="waitForRelatedImagesToLoad"/>

diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesTest.xml
@@ -29,7 +29,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminSearchImagesOnModalActionGroup" stepKey="searchForUnlicensedImage">
-            <argument name="query" value="{{AdobeStockUnlicensedImage.id}}"/>
+            <argument name="query" value="{{AdobeStockUnlicensedNewImage.id}}"/>
         </actionGroup>
         <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview"/>
         <waitForAjaxLoad stepKey="waitForRelatedImagesToLoad"/>

diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminSeeMoreFromSeriesTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminSeeMoreFromSeriesTest.xml
@@ -30,7 +30,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminSearchImagesOnModalActionGroup" stepKey="searchForUnlicensedImage">
-            <argument name="query" value="{{AdobeStockUnlicensedImage.id}}"/>
+            <argument name="query" value="{{AdobeStockUnlicensedNewImage.id}}"/>
         </actionGroup>
         <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandsFirstImageInGrid"/>
         <waitForAjaxLoad stepKey="waitForRelatedImagesToLoad"/>

diff --git 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.5-p1",
     "require": {
         "php": "~8.1.0||~8.2.0||~8.3.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-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
@@ -1,15 +1,16 @@
 {
     "name": "magento/module-adobe-stock-image-api",
     "description": "Magento module responsible for the images handling",
-    "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
-        "magento/framework": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "1.3.3",
+    "require": {
+        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "magento/framework": "*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -19,3 +20,4 @@
         }
     }
 }
+
diff --git a/_metapackage/composer.json b/_metapackage/composer.json
@@ -2,14 +2,16 @@
     "name": "magento/adobe-stock-integration",
     "description": "Adobe Stock integration",
     "type": "metapackage",
+    "version": "2.1.6-p1",
     "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/module-adobe-stock-asset": "1.3.3",
+        "magento/module-adobe-stock-asset-api": "2.0.3",
+        "magento/module-adobe-stock-image": "1.3.5",
+        "magento/module-adobe-stock-image-admin-ui": "1.3.5-p1",
+        "magento/module-adobe-stock-image-api": "1.3.3",
+        "magento/module-adobe-stock-client": "1.3.4",
+        "magento/module-adobe-stock-client-api": "2.1.4",
+        "magento/module-adobe-stock-admin-ui": "1.3.4"
     }
 }
+