From a5100c1ea6b1796ad8a7d0cddbf1433e2b700145 Mon Sep 17 00:00:00 2001
From: magento packaging service <magento-comops@adobe.com>
Date: Fri, 9 Aug 2024 16:08:16 +0000
Subject: [PATCH] Version 2.1.5-p7

---
 AdobeStockAdminUi/composer.json                | 14 ++++++++------
 AdobeStockAsset/composer.json                  | 16 +++++++++-------
 AdobeStockAssetApi/composer.json               | 10 ++++++----
 AdobeStockClient/composer.json                 | 14 ++++++++------
 AdobeStockClientApi/composer.json              | 10 ++++++----
 AdobeStockImage/composer.json                  | 18 ++++++++++--------
 .../Test/Mftf/Data/AdobeStockImageData.xml     |  6 ++++++
 .../AdminAdobeStockImagePreviewSection.xml     |  1 +
 ...eStockImagePreviewSameSeriesSeeMoreTest.xml |  2 +-
 ...minAdobeStockImagePreviewSameSeriesTest.xml |  2 +-
 .../Test/AdminAdobeStockLocalizationTest.xml   |  2 +-
 .../Mftf/Test/AdminSeeMoreFromSeriesTest.xml   |  2 +-
 AdobeStockImageAdminUi/composer.json           | 18 ++++++++++--------
 AdobeStockImageApi/composer.json               | 10 ++++++----
 _metapackage/composer.json                     | 18 ++++++++++--------
 15 files changed, 84 insertions(+), 59 deletions(-)

diff --git a/AdobeStockAdminUi/composer.json b/AdobeStockAdminUi/composer.json
index 2b1f789346cb..45112395cf75 100644
--- 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.3",
     "require": {
         "php": "~8.1.0||~8.2.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
index 46e88f303fab..76c3f7c48555 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.2",
     "require": {
         "php": "~8.1.0||~8.2.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 05297d20b5b3..26f33cfeb41d 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": "~8.1.0||~8.2.0",
-        "magento/framework": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "2.0.2",
+    "require": {
+        "php": "~8.1.0||~8.2.0",
+        "magento/framework": "*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -19,3 +20,4 @@
         }
     }
 }
+
diff --git a/AdobeStockClient/composer.json b/AdobeStockClient/composer.json
index 59fdb698d196..51e13d3b921f 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",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "1.3.3",
     "require": {
         "php": "~8.1.0||~8.2.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
index 03293cb3c401..da2933759c71 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": "~8.1.0||~8.2.0",
-        "magento/framework": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "2.1.3",
+    "require": {
+        "php": "~8.1.0||~8.2.0",
+        "magento/framework": "*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -19,3 +20,4 @@
         }
     }
 }
+
diff --git a/AdobeStockImage/composer.json b/AdobeStockImage/composer.json
index c6c082bb8712..6a18258fde93 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.4",
     "require": {
         "php": "~8.1.0||~8.2.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
index 40e43346fe34..bbd375317540 100644
--- 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/Section/AdminAdobeStockImagePreviewSection.xml b/AdobeStockImageAdminUi/Test/Mftf/Section/AdminAdobeStockImagePreviewSection.xml
index fc324c9a5b04..8a9e2b19e0c7 100644
--- a/AdobeStockImageAdminUi/Test/Mftf/Section/AdminAdobeStockImagePreviewSection.xml
+++ b/AdobeStockImageAdminUi/Test/Mftf/Section/AdminAdobeStockImagePreviewSection.xml
@@ -35,5 +35,6 @@
         <element name="moreFromThisSeriesSeeMore" selector="//div[@aria-labelledby='series_tab']//div[@class='see-more-wrapper']" type="button"/>
         <element name="seeMoreFromSeriesImages" type="block" selector="//*[@id='adobe-stock-images-search-modal']//div[@class='see-more-wrapper']"/>
         <element name="imagePreviewTitle" type="text" selector=".preview-row-content .title"/>
+        <element name="firstKeywordNotAI" type="text" selector="//*[@id='adobe-stock-images-search-modal']//div[@class='keyword' and not(contains(.,'nobody'))][1]"/>
     </section>
 </sections>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesSeeMoreTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImagePreviewSameSeriesSeeMoreTest.xml
index 9991e07afb1e..b9ce5f7faec9 100644
--- 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
index c98f0ff9620c..e9fc417875f6 100644
--- 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/AdminAdobeStockLocalizationTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockLocalizationTest.xml
index 9b8bcc18e366..c04dd4d10665 100644
--- a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockLocalizationTest.xml
+++ b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockLocalizationTest.xml
@@ -44,7 +44,7 @@
         </actionGroup>
         <actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview"/>
         <wait time="5" stepKey="waitBeforeExpandSectionLoadFull"/>
-        <grabTextFrom selector="{{AdminAdobeStockImagePreviewSection.firstKeyword}}" stepKey="grabKeyword"/>
+        <grabTextFrom selector="{{AdminAdobeStockImagePreviewSection.firstKeywordNotAI}}" stepKey="grabKeyword"/>
         <grabTextFrom selector="{{AdminAdobeStockImagePreviewSection.imagePreviewCategoryText}}" stepKey="grabCategoryText"/>
         <actionGroup ref="AssertAdminAdobeStockKeywordLocalizedActionGroup" stepKey="assertKeywordLocalized">
              <argument name="stringToBeVerified" value="{$grabKeyword}"/>
diff --git a/AdobeStockImageAdminUi/Test/Mftf/Test/AdminSeeMoreFromSeriesTest.xml b/AdobeStockImageAdminUi/Test/Mftf/Test/AdminSeeMoreFromSeriesTest.xml
index 7a34ad54a690..cd35ade6800a 100644
--- 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
index 97b35ed32725..b2d7acce03f0 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.4-p6",
     "require": {
         "php": "~8.1.0||~8.2.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
index 78cebbaec5bd..ab5a97316069 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": "~8.1.0||~8.2.0",
-        "magento/framework": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "1.3.2",
+    "require": {
+        "php": "~8.1.0||~8.2.0",
+        "magento/framework": "*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -19,3 +20,4 @@
         }
     }
 }
+
diff --git a/_metapackage/composer.json b/_metapackage/composer.json
index fcbfab124b30..fd7181cd6a1d 100644
--- 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.5-p7",
     "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.2",
+        "magento/module-adobe-stock-asset-api": "2.0.2",
+        "magento/module-adobe-stock-image": "1.3.4",
+        "magento/module-adobe-stock-image-admin-ui": "1.3.4-p6",
+        "magento/module-adobe-stock-image-api": "1.3.2",
+        "magento/module-adobe-stock-client": "1.3.3",
+        "magento/module-adobe-stock-client-api": "2.1.3",
+        "magento/module-adobe-stock-admin-ui": "1.3.3"
     }
 }
+