salesforce · LihaoLiuXs · Feb 6, 2026 · Feb 6, 2026 · Feb 6, 2026 · Feb 6, 2026
diff --git a/blob/blob-aws/src/test/java/com/salesforce/multicloudj/blob/aws/AwsBlobStoreIT.java b/blob/blob-aws/src/test/java/com/salesforce/multicloudj/blob/aws/AwsBlobStoreIT.java
@@ -57,6 +57,11 @@ public AbstractBlobStore createBlobStore(boolean useValidBucket, boolean useVali
             return createBlobStore(bucketNameToUse, credentialsOverrider);
         }
 
+        @Override
+        public boolean isObjectLockSupported() {
+            return true;
+        }
+
         private AbstractBlobStore createBlobStore(final String bucketName, final CredentialsOverrider credentialsOverrider) {
 
             AwsSessionCredentials awsCredentials = AwsSessionCredentials.create(

diff --git a/blob/blob-aws/src/test/resources/mappings/delete-5wi9bl80gj.json b/blob/blob-aws/src/test/resources/mappings/delete-5wi9bl80gj.json
@@ -0,0 +1,22 @@
+{
+  "id" : "9128ed99-d86c-4570-a55e-8ebc755dd931",
+  "name" : "chameleon-jcloud-versioned_conformance-tests_objectlock_retention-compliance",
+  "request" : {
+    "url" : "/chameleon-jcloud-versioned/conformance-tests/objectlock/retention-compliance",
+    "method" : "DELETE"
+  },
+  "response" : {
+    "status" : 204,
+    "headers" : {
+      "Server" : "AmazonS3",
+      "x-amz-delete-marker" : "true",
+      "x-amz-request-id" : "C23ABJCWFSRXW4K0",
+      "x-amz-id-2" : "MLoEc2sWyXmlIIhbwmOi+5CHcWSSZeb60O9zSrCBzSMEhMN6kmrl8/vy4iGCBvA6sRAkyujJ4zh8sptutw0ya7MRZj8aH/Kd",
+      "x-amz-version-id" : "0RgbnwcYl_V5zHPmusuDFt8VFbd3AupL",
+      "Date" : "Fri, 06 Feb 2026 20:00:16 GMT"
+    }
+  },
+  "uuid" : "9128ed99-d86c-4570-a55e-8ebc755dd931",
+  "persistent" : true,
+  "insertionIndex" : 614
+}
diff --git a/blob/blob-aws/src/test/resources/mappings/delete-vkfpscvsg1.json b/blob/blob-aws/src/test/resources/mappings/delete-vkfpscvsg1.json
@@ -0,0 +1,22 @@
+{
+  "id" : "7198d55b-c61b-4ecb-a4e0-4fd6226a4add",
+  "name" : "chameleon-jcloud-versioned_conformance-tests_objectlock_retention-governance",
+  "request" : {
+    "url" : "/chameleon-jcloud-versioned/conformance-tests/objectlock/retention-governance",
+    "method" : "DELETE"
+  },
+  "response" : {
+    "status" : 204,
+    "headers" : {
+      "Server" : "AmazonS3",
+      "x-amz-delete-marker" : "true",
+      "x-amz-request-id" : "1YEXQ12C579RW0KQ",
+      "x-amz-id-2" : "qyXEwb1T0zhsflhscoSkSYHfouB8AmoZdd65/TvtY2JTOW59XBWF0Q0JesbKQ5q3surPipEb9dNJ8Oiqh7cMlSV4G16Ffp+j",
+      "x-amz-version-id" : "XIyxjBTeuMrVLlQhZyBknIysvYH2fSGK",
+      "Date" : "Fri, 06 Feb 2026 20:00:19 GMT"
+    }
+  },
+  "uuid" : "7198d55b-c61b-4ecb-a4e0-4fd6226a4add",
+  "persistent" : true,
+  "insertionIndex" : 619
+}
diff --git a/blob/blob-aws/src/test/resources/mappings/delete-zc3job12kj.json b/blob/blob-aws/src/test/resources/mappings/delete-zc3job12kj.json
@@ -0,0 +1,22 @@
+{
+  "id" : "aa2145d4-1c1b-423d-924f-057d98ebbe16",
+  "name" : "chameleon-jcloud-versioned_conformance-tests_objectlock_no-lock",
+  "request" : {
+    "url" : "/chameleon-jcloud-versioned/conformance-tests/objectlock/no-lock",
+    "method" : "DELETE"
+  },
+  "response" : {
+    "status" : 204,
+    "headers" : {
+      "Server" : "AmazonS3",
+      "x-amz-delete-marker" : "true",
+      "x-amz-request-id" : "E2QV4DT8PTVMRM4G",
+      "x-amz-id-2" : "jiiJxUakuDURxGBT51SfcjtaoO1IQDnPpJ74FDNrrIuUpoqRzfZ0UhW2oJMHoKq+vkd9+S779ozwgEHfaBcTMDZ4WolgiERE",
+      "x-amz-version-id" : "lMcN19fE1JZNwdtTafPoKlg90sChfKhN",
+      "Date" : "Fri, 06 Feb 2026 20:00:12 GMT"
+    }
+  },
+  "uuid" : "aa2145d4-1c1b-423d-924f-057d98ebbe16",
+  "persistent" : true,
+  "insertionIndex" : 608
+}
diff --git a/blob/blob-aws/src/test/resources/mappings/get-6wbl1f0j9t.json b/blob/blob-aws/src/test/resources/mappings/get-6wbl1f0j9t.json
@@ -0,0 +1,21 @@
+{
+  "id" : "611524a6-323a-4db2-876f-8ba87d7b18ef",
+  "name" : "chameleon-jcloud-versioned_conformance-tests_objectlock_retention-compliance",
+  "request" : {
+    "url" : "/chameleon-jcloud-versioned/conformance-tests/objectlock/retention-compliance?retention",
+    "method" : "GET"
+  },
+  "response" : {
+    "status" : 200,
+    "base64Body" : "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPFJldGVudGlvbiB4bWxucz0iaHR0cDovL3MzLmFtYXpvbmF3cy5jb20vZG9jLzIwMDYtMDMtMDEvIj48TW9kZT5DT01QTElBTkNFPC9Nb2RlPjxSZXRhaW5VbnRpbERhdGU+MjAyNi0wMi0wN1QyMDowMDoxMS45MTZaPC9SZXRhaW5VbnRpbERhdGU+PC9SZXRlbnRpb24+",
+    "headers" : {
+      "Server" : "AmazonS3",
+      "x-amz-request-id" : "7Y29EQQXX4YRQ62V",
+      "x-amz-id-2" : "SV0qkewBtQqyCSx7ItCA1I3gQ2TtIDuXE/hcEDQL/634+ZKIfbTszIcvvZbCdfzKhl3YtJHiNkStg4irE1AVP3p2ASZAKBTh",
+      "Date" : "Fri, 06 Feb 2026 20:00:13 GMT"
+    }
+  },
+  "uuid" : "611524a6-323a-4db2-876f-8ba87d7b18ef",
+  "persistent" : true,
+  "insertionIndex" : 616
+}
diff --git a/blob/blob-aws/src/test/resources/mappings/get-dtkyrojxp0.json b/blob/blob-aws/src/test/resources/mappings/get-dtkyrojxp0.json
@@ -0,0 +1,22 @@
+{
+  "id" : "6dcec650-0822-426b-9c7e-627c19a53f79",
+  "name" : "chameleon-jcloud-versioned_conformance-tests_objectlock_nonexistent",
+  "request" : {
+    "url" : "/chameleon-jcloud-versioned/conformance-tests/objectlock/nonexistent?retention",
+    "method" : "GET"
+  },
+  "response" : {
+    "status" : 404,
+    "body" : "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Error><Code>NoSuchKey</Code><Message>The specified key does not exist.</Message><Key>conformance-tests/objectlock/nonexistent</Key><RequestId>E2QS9BPQM508ZYTP</RequestId><HostId>Tfte+PiDMU55Rd3ptoQW0bgwDAmEnkTpJkaAOmmag6CIRi+xPOE5w3F8ZtihAHOjhbGe8NQMP5v6Re9miaKhzwCubJcQh/Bw</HostId></Error>",
+    "headers" : {
+      "Server" : "AmazonS3",
+      "x-amz-request-id" : "E2QS9BPQM508ZYTP",
+      "x-amz-id-2" : "Tfte+PiDMU55Rd3ptoQW0bgwDAmEnkTpJkaAOmmag6CIRi+xPOE5w3F8ZtihAHOjhbGe8NQMP5v6Re9miaKhzwCubJcQh/Bw",
+      "Date" : "Fri, 06 Feb 2026 20:00:11 GMT",
+      "Content-Type" : "application/xml"
+    }
+  },
+  "uuid" : "6dcec650-0822-426b-9c7e-627c19a53f79",
+  "persistent" : true,
+  "insertionIndex" : 612
+}
diff --git a/blob/blob-aws/src/test/resources/mappings/get-fcaqtgbgub.json b/blob/blob-aws/src/test/resources/mappings/get-fcaqtgbgub.json
@@ -0,0 +1,21 @@
+{
+  "id" : "e00b9056-fecb-4ec4-9769-847cee9f9da3",
+  "name" : "chameleon-jcloud-versioned_conformance-tests_objectlock_retention-compliance",
+  "request" : {
+    "url" : "/chameleon-jcloud-versioned/conformance-tests/objectlock/retention-compliance?legal-hold",
+    "method" : "GET"
+  },
+  "response" : {
+    "status" : 200,
+    "base64Body" : "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPExlZ2FsSG9sZCB4bWxucz0iaHR0cDovL3MzLmFtYXpvbmF3cy5jb20vZG9jLzIwMDYtMDMtMDEvIj48U3RhdHVzPk9GRjwvU3RhdHVzPjwvTGVnYWxIb2xkPg==",
+    "headers" : {
+      "Server" : "AmazonS3",
+      "x-amz-request-id" : "C23FABFN3SN6PG1B",
+      "x-amz-id-2" : "H4u8GFY0H5QZYjQl7FKqdV3EmLAnliaJAQDJ4/td8uC596pQ5wtszuVh48//gHrrM8PA/wrjy9eFcUeOJ6ORZAJ+61nf6KVt",
+      "Date" : "Fri, 06 Feb 2026 20:00:16 GMT"
+    }
+  },
+  "uuid" : "e00b9056-fecb-4ec4-9769-847cee9f9da3",
+  "persistent" : true,
+  "insertionIndex" : 615
+}
diff --git a/blob/blob-aws/src/test/resources/mappings/get-qmwrx6fg5w.json b/blob/blob-aws/src/test/resources/mappings/get-qmwrx6fg5w.json
@@ -0,0 +1,21 @@
+{
+  "id" : "0dc7e8dd-9e38-45e4-b2bd-0368d9a13bd8",
+  "name" : "chameleon-jcloud-versioned_conformance-tests_objectlock_retention-governance",
+  "request" : {
+    "url" : "/chameleon-jcloud-versioned/conformance-tests/objectlock/retention-governance?legal-hold",
+    "method" : "GET"
+  },
+  "response" : {
+    "status" : 200,
+    "base64Body" : "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPExlZ2FsSG9sZCB4bWxucz0iaHR0cDovL3MzLmFtYXpvbmF3cy5jb20vZG9jLzIwMDYtMDMtMDEvIj48U3RhdHVzPk9GRjwvU3RhdHVzPjwvTGVnYWxIb2xkPg==",
+    "headers" : {
+      "Server" : "AmazonS3",
+      "x-amz-request-id" : "WXBAJ5BCDB6PKFNQ",
+      "x-amz-id-2" : "wR/R6DkhCWPKkkDIWXU7h1EgU6+Yvnjj0SnvopHwN9tev1G0V94cTHqEUac2g9E3bahqNeatBn1tZvz52qqRUS9eqLPIBCom",
+      "Date" : "Fri, 06 Feb 2026 20:00:18 GMT"
+    }
+  },
+  "uuid" : "0dc7e8dd-9e38-45e4-b2bd-0368d9a13bd8",
+  "persistent" : true,
+  "insertionIndex" : 620
+}
diff --git a/blob/blob-aws/src/test/resources/mappings/get-u6nywavkbn.json b/blob/blob-aws/src/test/resources/mappings/get-u6nywavkbn.json
@@ -0,0 +1,22 @@
+{
+  "id" : "dd95a9a9-9e6d-4953-9adc-89e7a0185f43",
+  "name" : "chameleon-jcloud-versioned_conformance-tests_objectlock_no-lock",
+  "request" : {
+    "url" : "/chameleon-jcloud-versioned/conformance-tests/objectlock/no-lock?retention",
+    "method" : "GET"
+  },
+  "response" : {
+    "status" : 404,
+    "body" : "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Error><Code>NoSuchObjectLockConfiguration</Code><Message>The specified object does not have a ObjectLock configuration</Message><RequestId>7JHPTBAXJHCYX1R7</RequestId><HostId>nNGCN7quGVRkRpcCHDzMhZnUIqs60PXeC3IrbCDjfYuXtdV1YKseAxs4dSGEVSYzrDEIV8seTM8TjRP4XD5xUhjfvgdnOE7g</HostId></Error>",
+    "headers" : {
+      "Server" : "AmazonS3",
+      "x-amz-request-id" : "7JHPTBAXJHCYX1R7",
+      "x-amz-id-2" : "nNGCN7quGVRkRpcCHDzMhZnUIqs60PXeC3IrbCDjfYuXtdV1YKseAxs4dSGEVSYzrDEIV8seTM8TjRP4XD5xUhjfvgdnOE7g",
+      "Date" : "Fri, 06 Feb 2026 20:00:10 GMT",
+      "Content-Type" : "application/xml"
+    }
+  },
+  "uuid" : "dd95a9a9-9e6d-4953-9adc-89e7a0185f43",
+  "persistent" : true,
+  "insertionIndex" : 609
+}
diff --git a/blob/blob-aws/src/test/resources/mappings/get-ymd9e7ep32.json b/blob/blob-aws/src/test/resources/mappings/get-ymd9e7ep32.json
@@ -0,0 +1,21 @@
+{
+  "id" : "2f00cb5c-d843-49db-b554-19207256f5e7",
+  "name" : "chameleon-jcloud-versioned_conformance-tests_objectlock_retention-governance",
+  "request" : {
+    "url" : "/chameleon-jcloud-versioned/conformance-tests/objectlock/retention-governance?retention",
+    "method" : "GET"
+  },
+  "response" : {
+    "status" : 200,
+    "base64Body" : "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPFJldGVudGlvbiB4bWxucz0iaHR0cDovL3MzLmFtYXpvbmF3cy5jb20vZG9jLzIwMDYtMDMtMDEvIj48TW9kZT5HT1ZFUk5BTkNFPC9Nb2RlPjxSZXRhaW5VbnRpbERhdGU+MjAyNi0wMi0wN1QyMDowMDoxNS44OTFaPC9SZXRhaW5VbnRpbERhdGU+PC9SZXRlbnRpb24+",
+    "headers" : {
+      "Server" : "AmazonS3",
+      "x-amz-request-id" : "WXB2QJ1M2XQYR34A",
+      "x-amz-id-2" : "xrgTXDlXYgwvVDuRbOy4ZQijJkTu67qe36AIprLJHlLJ0rnqE7BXsSYlnQ8cc+BYbrc84pPr+wqqjAeMxau4a+BAkEUVsoJn",
+      "Date" : "Fri, 06 Feb 2026 20:00:18 GMT"
+    }
+  },
+  "uuid" : "2f00cb5c-d843-49db-b554-19207256f5e7",
+  "persistent" : true,
+  "insertionIndex" : 621
+}
diff --git a/blob/blob-aws/src/test/resources/mappings/put-ievkn426z3.json b/blob/blob-aws/src/test/resources/mappings/put-ievkn426z3.json
@@ -0,0 +1,28 @@
+{
+  "id" : "59624aa0-ea9e-4ecc-97b0-9216a5ce865f",
+  "name" : "chameleon-jcloud-versioned_conformance-tests_objectlock_retention-compliance",
+  "request" : {
+    "url" : "/chameleon-jcloud-versioned/conformance-tests/objectlock/retention-compliance",
+    "method" : "PUT",
+    "bodyPatterns" : [ {
+      "binaryEqualTo" : "T2JqZWN0IGxvY2sgcmV0ZW50aW9uIGNvbXBsaWFuY2UgdGVzdA=="
+    } ]
+  },
+  "response" : {
+    "status" : 200,
+    "headers" : {
+      "Server" : "AmazonS3",
+      "ETag" : "\"a0d246afc0f8baf1e7dd602c80efd967\"",
+      "x-amz-checksum-type" : "FULL_OBJECT",
+      "x-amz-request-id" : "7Y27F0JTG6BQ309P",
+      "x-amz-checksum-crc32c" : "4z8aNg==",
+      "x-amz-server-side-encryption" : "AES256",
+      "x-amz-id-2" : "33jV28bqt3rbRAgU4yEqZI+31fgfqmBWeh7SbWyoJpj18EIGEXpO+kFDBmGguMqnrIOe3XwvjaqrXm//cCQkIB8aTlVxshD5",
+      "x-amz-version-id" : "zLsUsFgmtnxTZCDrCMNEl40YqfTx..oB",
+      "Date" : "Fri, 06 Feb 2026 20:00:13 GMT"
+    }
+  },
+  "uuid" : "59624aa0-ea9e-4ecc-97b0-9216a5ce865f",
+  "persistent" : true,
+  "insertionIndex" : 617
+}
diff --git a/blob/blob-aws/src/test/resources/mappings/put-riacevxmhn.json b/blob/blob-aws/src/test/resources/mappings/put-riacevxmhn.json
@@ -0,0 +1,28 @@
+{
+  "id" : "48f566ce-94a6-4d4c-ac5f-5b8268399987",
+  "name" : "chameleon-jcloud-versioned_conformance-tests_objectlock_no-lock",
+  "request" : {
+    "url" : "/chameleon-jcloud-versioned/conformance-tests/objectlock/no-lock",
+    "method" : "PUT",
+    "bodyPatterns" : [ {
+      "binaryEqualTo" : "T2JqZWN0IHdpdGhvdXQgbG9jayB0ZXN0"
+    } ]
+  },
+  "response" : {
+    "status" : 200,
+    "headers" : {
+      "Server" : "AmazonS3",
+      "ETag" : "\"fdd2c398fd6d009c474f1f9a02d38ec5\"",
+      "x-amz-checksum-crc64nvme" : "59pOl5UH6tE=",
+      "x-amz-checksum-type" : "FULL_OBJECT",
+      "x-amz-request-id" : "7JHK68N47E4ZRWSQ",
+      "x-amz-server-side-encryption" : "AES256",
+      "x-amz-id-2" : "YScnzGFcPCL7GM0FLOaNQcXRX/dDB5qEl+SFmLQUHVURw6x9eRtZVc6u2EFBxFM4p+BNH9FBWnoUP80AaSlnVJL1JFYdnWYQ",
+      "x-amz-version-id" : "nMqKRM_DQzj1_w2Pn52cIMooegPvSHz5",
+      "Date" : "Fri, 06 Feb 2026 20:00:11 GMT"
+    }
+  },
+  "uuid" : "48f566ce-94a6-4d4c-ac5f-5b8268399987",
+  "persistent" : true,
+  "insertionIndex" : 610
+}
diff --git a/blob/blob-aws/src/test/resources/mappings/put-sp1enepgxu.json b/blob/blob-aws/src/test/resources/mappings/put-sp1enepgxu.json
@@ -0,0 +1,28 @@
+{
+  "id" : "1dfcd8e4-17e1-4b89-b83e-6e8462167d65",
+  "name" : "chameleon-jcloud-versioned_conformance-tests_objectlock_retention-governance",
+  "request" : {
+    "url" : "/chameleon-jcloud-versioned/conformance-tests/objectlock/retention-governance",
+    "method" : "PUT",
+    "bodyPatterns" : [ {
+      "binaryEqualTo" : "T2JqZWN0IGxvY2sgcmV0ZW50aW9uIGdvdmVybmFuY2UgdGVzdA=="
+    } ]
+  },
+  "response" : {
+    "status" : 200,
+    "headers" : {
+      "Server" : "AmazonS3",
+      "ETag" : "\"7e7cee74a915a322ef6c75c3ab034d4f\"",
+      "x-amz-checksum-type" : "FULL_OBJECT",
+      "x-amz-request-id" : "0TJ4VZ9FH6KD5WK6",
+      "x-amz-checksum-crc32c" : "s67YvA==",
+      "x-amz-server-side-encryption" : "AES256",
+      "x-amz-id-2" : "hupN+V74krKCrybh1oxcxWN1YBCKITqnYb9Yn146ZfeTDsrMy+yNM6A2U1Q29wFFAp2gUGo2cuSYGUkRKzrsOw97LQDeUaoS",
+      "x-amz-version-id" : "gxWcsKRtCMgLuudI4nVJ4MPxZLnPJL1i",
+      "Date" : "Fri, 06 Feb 2026 20:00:17 GMT"
+    }
+  },
+  "uuid" : "1dfcd8e4-17e1-4b89-b83e-6e8462167d65",
+  "persistent" : true,
+  "insertionIndex" : 622
+}