Merge remote-tracking branch 'origin/master' into k8s-build-updates

lsst-epo · Dec 19, 2023 · b48b7a3 · b48b7a3
2 parents 85fe862 + 43f1c0f
commit b48b7a3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 146 deletions.
diff --git a/api/composer.json b/api/composer.json
@@ -2,15 +2,13 @@
     "require": {
         "carlcs/craft-assetmetadata": "^4.0",
         "castiron/next-builds": "^1.0",
-        "craftcms/aws-s3": "2.0.3",
         "craftcms/cms": "4.5.4",
         "craftcms/contact-form": "3.0.1",
         "craftcms/contact-form-honeypot": "^2.0.0",
         "craftcms/google-cloud": "^2.0.0",
         "craftcms/redactor": "3.0.4",
         "jamesedmonston/graphql-authentication": "2.5.0",
-        "lsst-epo/canto-dam-assets": "dev-develop-v4",
-        "lsst/canto-dam-integrator": "dev-EPO-7854#v0.3.2",
+        "lsst-epo/canto-dam-assets": "4.0.9",
         "rynpsc/craft-phone-number": "^2.1.0",
         "sebastianlenz/linkfield": "^2.1.4",
         "spicyweb/craft-neo": "3.8.6",

diff --git a/api/composer.lock b/api/composer.lock
diff --git a/api/config/project/fields/cantoDamAsset--676da0d6-dc63-48fd-a5cd-7253c956974c.yaml b/api/config/project/fields/cantoDamAsset--676da0d6-dc63-48fd-a5cd-7253c956974c.yaml
diff --git a/api/config/project/project.yaml b/api/config/project/project.yaml
@@ -1,4 +1,4 @@
-dateModified: 1694646040
+dateModified: 1701284966
 email:
   fromEmail: $EMAIL_FROM_ADDRESS
   fromName: $EMAIL_SENDER_NAME
@@ -206,7 +206,6 @@ meta:
     635a4a93-f10b-4d3c-bd44-2ea1474ad4cb: 'Vertical Alignment' # Vertical Alignment
     644c6b87-ac0c-4cdf-88be-744a5ee684bb: Description # Description
     657b9edd-b6d3-4b7f-af89-36117c5d98a8: 'Rich Text Description' # Rich Text Description
-    676da0d6-dc63-48fd-a5cd-7253c956974c: 'Canto DAM Asset' # Canto DAM Asset
     753b10b6-e9e6-44f5-a9d9-4a07788733e1: 'Content Ratio' # Content Ratio
     824d9ca2-e755-4e41-8f6a-18e573fec8e4: 'News Posts' # News Posts
     831db889-442e-4553-9076-fc3bc2843c8c: 'Hide title' # Hide title