From ace97b2ec21373afb715f676bcc02f68bc3d1f39 Mon Sep 17 00:00:00 2001
From: Shubham Chaturvedi <scchatur@amazon.com>
Date: Tue, 14 Oct 2025 17:11:57 -0700
Subject: [PATCH 1/8] fix(net): pin aws-sdk version < 4.x

---
 CHANGELOG.md                                              | 4 ++++
 DynamoDbEncryption/runtimes/net/AssemblyInfo.cs           | 2 +-
 DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj | 5 ++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec4d21f6a..ce3d3a6af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [3.7.1]
+
+Pin DynamoDb and aws sdk version < 4.x
+
 ## [3.7.0](https://github.com/aws/aws-database-encryption-sdk-dynamodb/compare/v3.6.2...v3.7.0) (2024-09-17)
 
 ### Features
diff --git a/DynamoDbEncryption/runtimes/net/AssemblyInfo.cs b/DynamoDbEncryption/runtimes/net/AssemblyInfo.cs
index bd1671dc8..4b5d1b057 100644
--- a/DynamoDbEncryption/runtimes/net/AssemblyInfo.cs
+++ b/DynamoDbEncryption/runtimes/net/AssemblyInfo.cs
@@ -3,5 +3,5 @@
 [assembly: AssemblyTitle("AWS.Cryptography.DbEncryptionSDK.DynamoDb")]
 
 // This should be kept in sync with the version number in MPL.csproj
-[assembly: AssemblyVersion("3.7.0")]
+[assembly: AssemblyVersion("3.7.1")]
 
diff --git a/DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj b/DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj
index 9867a97dd..490ba5fb1 100644
--- a/DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj
+++ b/DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj
@@ -5,7 +5,7 @@
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <IsPackable>true</IsPackable>
 
-    <Version>3.7.0</Version>
+    <Version>3.7.1</Version>
 
     <AssemblyName>AWS.Cryptography.DbEncryptionSDK.DynamoDb</AssemblyName>
     <PackageId>AWS.Cryptography.DbEncryptionSDK.DynamoDb</PackageId>
@@ -57,8 +57,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.402.2"/>
-    <PackageReference Include="AWSSDK.Core" Version="3.7.400.38"/>
+    <PackageReference Include="AWSSDK.DynamoDBv2" Version="[3.7.*, 4.0)" />
     <PackageReference Include="DafnyRuntime" Version="$(DafnyVersion)" />
     <ProjectReference Include="../../../submodules/MaterialProviders/AwsCryptographicMaterialProviders/runtimes/net/MPL.csproj"/>
     <!--

From 8a6a7e1b38d7bcaf37fd13304da738c68616c092 Mon Sep 17 00:00:00 2001
From: Shubham Chaturvedi <scchatur@amazon.com>
Date: Wed, 15 Oct 2025 15:29:58 -0700
Subject: [PATCH 2/8] fix(rust): CI

---
 .github/workflows/library_rust_tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/library_rust_tests.yml b/.github/workflows/library_rust_tests.yml
index 5e586c149..df4360455 100644
--- a/.github/workflows/library_rust_tests.yml
+++ b/.github/workflows/library_rust_tests.yml
@@ -62,7 +62,7 @@ jobs:
       - name: Setup Dafny
         uses: dafny-lang/setup-dafny-action@v1.7.0
         with:
-          dafny-version: nightly-2024-12-03-4954170
+          dafny-version: 4.10.0
 
       - name: Update MPL submodule if using MPL HEAD
         if: ${{ inputs.mpl-head == true }}

From 47ff68c0bccba4a3302264b43ae421d7d237d315 Mon Sep 17 00:00:00 2001
From: Shubham Chaturvedi <scchatur@amazon.com>
Date: Wed, 15 Oct 2025 16:31:14 -0700
Subject: [PATCH 3/8] submodules

---
 submodules/MaterialProviders | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/MaterialProviders b/submodules/MaterialProviders
index 9c80544bb..adf3ffe2b 160000
--- a/submodules/MaterialProviders
+++ b/submodules/MaterialProviders
@@ -1 +1 @@
-Subproject commit 9c80544bbfeac5547915aa93795f9b79eac7db6b
+Subproject commit adf3ffe2bd6ea88b88e211dcce760196c419eb1d

From e1e15bc5ffdf4ce3e7dbd1e0212588811e558871 Mon Sep 17 00:00:00 2001
From: Shubham Chaturvedi <scchatur@amazon.com>
Date: Wed, 15 Oct 2025 16:40:08 -0700
Subject: [PATCH 4/8] submodules

---
 .../test/DynamoDbEncryptionBranchKeyIdSupplierTest.dfy          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DynamoDbEncryption/dafny/DynamoDbEncryption/test/DynamoDbEncryptionBranchKeyIdSupplierTest.dfy b/DynamoDbEncryption/dafny/DynamoDbEncryption/test/DynamoDbEncryptionBranchKeyIdSupplierTest.dfy
index 74e12264f..83d0fa9f9 100644
--- a/DynamoDbEncryption/dafny/DynamoDbEncryption/test/DynamoDbEncryptionBranchKeyIdSupplierTest.dfy
+++ b/DynamoDbEncryption/dafny/DynamoDbEncryption/test/DynamoDbEncryptionBranchKeyIdSupplierTest.dfy
@@ -26,7 +26,7 @@ module DynamoDbEncryptionBranchKeyIdSupplierTest {
   const logicalKeyStoreName := branchKeyStoreName
 
   // These tests require a keystore populated with a key with this Id
-  const BRANCH_KEY_ID := "75789115-1deb-4fe3-a2ec-be9e885d1945"
+  const BRANCH_KEY_ID := "3f43a9af-08c5-4317-b694-3d3e883dcaef"
   const BRANCH_KEY_ID_UTF8 := UTF8.EncodeAscii(BRANCH_KEY_ID)
   const ALTERNATE_BRANCH_KEY_ID := "4bb57643-07c1-419e-92ad-0df0df149d7c"
 

From 64e053b16ca991aac6d9ebd226d2b66e2299b76f Mon Sep 17 00:00:00 2001
From: Shubham Chaturvedi <scchatur@amazon.com>
Date: Thu, 16 Oct 2025 15:59:18 -0700
Subject: [PATCH 5/8] fix: CI

---
 .../cryptography/dbencryptionsdk/dynamodb/TestUtils.java     | 2 +-
 DynamoDbEncryption/runtimes/rust/Cargo.toml                  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/DynamoDbEncryption/runtimes/java/src/test/java/software/amazon/cryptography/dbencryptionsdk/dynamodb/TestUtils.java b/DynamoDbEncryption/runtimes/java/src/test/java/software/amazon/cryptography/dbencryptionsdk/dynamodb/TestUtils.java
index 2c3bfd2ee..9d1b0fccb 100644
--- a/DynamoDbEncryption/runtimes/java/src/test/java/software/amazon/cryptography/dbencryptionsdk/dynamodb/TestUtils.java
+++ b/DynamoDbEncryption/runtimes/java/src/test/java/software/amazon/cryptography/dbencryptionsdk/dynamodb/TestUtils.java
@@ -34,7 +34,7 @@ public class TestUtils {
   public static final String TEST_KEY_STORE_KMS_KEY =
     "arn:aws:kms:us-west-2:370957321024:key/9d989aa2-2f9c-438c-a745-cc57d3ad0126";
   public static final String BRANCH_KEY_ID =
-    "75789115-1deb-4fe3-a2ec-be9e885d1945";
+    "3f43a9af-08c5-4317-b694-3d3e883dcaef";
   public static final String ALTERNATE_BRANCH_KEY_ID =
     "4bb57643-07c1-419e-92ad-0df0df149d7c";
 
diff --git a/DynamoDbEncryption/runtimes/rust/Cargo.toml b/DynamoDbEncryption/runtimes/rust/Cargo.toml
index 9dcc9c7dc..93d286f17 100644
--- a/DynamoDbEncryption/runtimes/rust/Cargo.toml
+++ b/DynamoDbEncryption/runtimes/rust/Cargo.toml
@@ -25,7 +25,7 @@ aws-smithy-runtime-api = {version = "1.7.3", features = ["client"] }
 aws-smithy-types = "1.2.10"
 chrono = "0.4.39"
 cpu-time = "1.0.0"
-dafny-runtime = "0.1.1"
+dafny-runtime = "0.2.0"
 dashmap = "6.1.0"
 pem = "3.0.4"
 tokio = {version = "1.42.0", features = ["full"] }
@@ -33,3 +33,6 @@ uuid = { version = "1.11.0", features = ["v4"] }
 
 [[example]]
 name = "main"
+
+[lints.rust]
+deprecated = "allow"

From da83d9f30155951eb3baf3b380beeb6cca1dec57 Mon Sep 17 00:00:00 2001
From: Shubham Chaturvedi <scchatur@amazon.com>
Date: Thu, 16 Oct 2025 16:29:46 -0700
Subject: [PATCH 6/8] fix: CI

---
 .github/workflows/ci_examples_java.yml   | 6 ++++++
 .github/workflows/library_rust_tests.yml | 1 +
 2 files changed, 7 insertions(+)

diff --git a/.github/workflows/ci_examples_java.yml b/.github/workflows/ci_examples_java.yml
index d33c4fc93..1a51191ea 100644
--- a/.github/workflows/ci_examples_java.yml
+++ b/.github/workflows/ci_examples_java.yml
@@ -45,6 +45,12 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
+      
+      - name: Setup Java 8
+        uses: actions/setup-java@v4
+        with:
+          distribution: "corretto"
+          java-version: 8
 
       - name: Setup Java ${{ matrix.java-version }}
         uses: actions/setup-java@v4
diff --git a/.github/workflows/library_rust_tests.yml b/.github/workflows/library_rust_tests.yml
index df4360455..63353fa9d 100644
--- a/.github/workflows/library_rust_tests.yml
+++ b/.github/workflows/library_rust_tests.yml
@@ -54,6 +54,7 @@ jobs:
       - name: Setup Rust Toolchain for GitHub CI
         uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
         with:
+          toolchain: 1.86.0
           components: rustfmt
       # uncomment this after Rust formatter works
       # - name: Rustfmt Check

From 4114e8bbd586f248c846aac1597dd6bae646b161 Mon Sep 17 00:00:00 2001
From: Shubham Chaturvedi <scchatur@amazon.com>
Date: Thu, 16 Oct 2025 16:57:20 -0700
Subject: [PATCH 7/8] fix: CI

---
 .github/workflows/ci_examples_java.yml | 8 ++++----
 TestVectors/runtimes/rust/Cargo.toml   | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci_examples_java.yml b/.github/workflows/ci_examples_java.yml
index 1a51191ea..9bdcb02b0 100644
--- a/.github/workflows/ci_examples_java.yml
+++ b/.github/workflows/ci_examples_java.yml
@@ -46,11 +46,11 @@ jobs:
         with:
           submodules: recursive
       
-      - name: Setup Java 8
-        uses: actions/setup-java@v4
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
         with:
-          distribution: "corretto"
-          java-version: 8
+          gradle-version: '7.6'  # Supports Java 8-17
+          cache-read-only: false
 
       - name: Setup Java ${{ matrix.java-version }}
         uses: actions/setup-java@v4
diff --git a/TestVectors/runtimes/rust/Cargo.toml b/TestVectors/runtimes/rust/Cargo.toml
index 5a440c1e3..9209cf539 100644
--- a/TestVectors/runtimes/rust/Cargo.toml
+++ b/TestVectors/runtimes/rust/Cargo.toml
@@ -16,8 +16,11 @@ aws-smithy-runtime-api = {version = "1.7.3", features = ["client"] }
 aws-smithy-types = "1.2.10"
 chrono = "0.4.39"
 cpu-time = "1.0.0"
-dafny_runtime = { path = "../../../submodules/MaterialProviders/smithy-dafny/TestModels/dafny-dependencies/dafny_runtime_rust"}
+dafny-runtime = "0.2.0"
 dashmap = "6.1.0"
 pem = "3.0.4"
 tokio = {version = "1.42.0", features = ["full"] }
 uuid = { version = "1.11.0", features = ["v4"] }
+
+[lints.rust]
+deprecated = "allow"

From df8fcc87658f69d6e12cdb1c84a4d2b49d0394a2 Mon Sep 17 00:00:00 2001
From: Shubham Chaturvedi <scchatur@amazon.com>
Date: Mon, 20 Oct 2025 10:09:33 -0700
Subject: [PATCH 8/8] fix: CI

---
 .github/workflows/ci_examples_java.yml                        | 4 ++--
 DynamoDbEncryption/runtimes/java/README.md                    | 1 -
 .../dynamodb-encryption-client/ddb-attribute-serialization.md | 1 -
 .../dynamodb-encryption-client/ddb-item-conversion.md         | 1 -
 .../dynamodb-encryption-client/ddb-item-encryptor.md          | 1 -
 .../dynamodb-encryption-client/ddb-sdk-integration.md         | 1 -
 .../dynamodb-encryption-client/ddb-table-encryption-config.md | 1 -
 specification/dynamodb-encryption-client/decrypt-item.md      | 1 -
 specification/dynamodb-encryption-client/encrypt-item.md      | 1 -
 specification/dynamodb-encryption-client/string-ordering.md   | 1 -
 specification/structured-encryption/decrypt-path-structure.md | 1 -
 specification/structured-encryption/decrypt-structure.md      | 1 -
 specification/structured-encryption/encrypt-path-structure.md | 1 -
 specification/structured-encryption/encrypt-structure.md      | 1 -
 specification/structured-encryption/resolve-auth-actions.md   | 1 -
 specification/structured-encryption/structures.md             | 1 -
 16 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ci_examples_java.yml b/.github/workflows/ci_examples_java.yml
index 9bdcb02b0..6008b2a90 100644
--- a/.github/workflows/ci_examples_java.yml
+++ b/.github/workflows/ci_examples_java.yml
@@ -45,11 +45,11 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
-      
+
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
         with:
-          gradle-version: '7.6'  # Supports Java 8-17
+          gradle-version: "7.6" # Supports Java 8-17
           cache-read-only: false
 
       - name: Setup Java ${{ matrix.java-version }}
diff --git a/DynamoDbEncryption/runtimes/java/README.md b/DynamoDbEncryption/runtimes/java/README.md
index 7d81417be..3ec63a46f 100644
--- a/DynamoDbEncryption/runtimes/java/README.md
+++ b/DynamoDbEncryption/runtimes/java/README.md
@@ -59,7 +59,6 @@ To use the DB-ESDK for DynamoDB in Java, you must have:
 
   The KMS and DynamoDB-Enhanced Clients from the AWS SDK For Java V2
   are **optional** dependencies.
-
   - **Via Gradle Kotlin**  
     In a Gradle Java Project, add the following to the _dependencies_ section:
 
diff --git a/specification/dynamodb-encryption-client/ddb-attribute-serialization.md b/specification/dynamodb-encryption-client/ddb-attribute-serialization.md
index 68b093f92..918d26c45 100644
--- a/specification/dynamodb-encryption-client/ddb-attribute-serialization.md
+++ b/specification/dynamodb-encryption-client/ddb-attribute-serialization.md
@@ -10,7 +10,6 @@
 ### Changelog
 
 - 1.0.0
-
   - Initial record
 
 ## Definitions
diff --git a/specification/dynamodb-encryption-client/ddb-item-conversion.md b/specification/dynamodb-encryption-client/ddb-item-conversion.md
index 86918e0cd..058fef445 100644
--- a/specification/dynamodb-encryption-client/ddb-item-conversion.md
+++ b/specification/dynamodb-encryption-client/ddb-item-conversion.md
@@ -10,7 +10,6 @@
 ### Changelog
 
 - 1.0.0
-
   - Initial record
 
 ## Definitions
diff --git a/specification/dynamodb-encryption-client/ddb-item-encryptor.md b/specification/dynamodb-encryption-client/ddb-item-encryptor.md
index 9744f6f48..4f4e09bdb 100644
--- a/specification/dynamodb-encryption-client/ddb-item-encryptor.md
+++ b/specification/dynamodb-encryption-client/ddb-item-encryptor.md
@@ -10,7 +10,6 @@
 ### Changelog
 
 - 1.0.0
-
   - Initial record
 
 ## Definitions
diff --git a/specification/dynamodb-encryption-client/ddb-sdk-integration.md b/specification/dynamodb-encryption-client/ddb-sdk-integration.md
index b109dcc7a..1c51ff752 100644
--- a/specification/dynamodb-encryption-client/ddb-sdk-integration.md
+++ b/specification/dynamodb-encryption-client/ddb-sdk-integration.md
@@ -10,7 +10,6 @@
 ### Changelog
 
 - 1.0.0
-
   - Initial record
 
 ## Definitions
diff --git a/specification/dynamodb-encryption-client/ddb-table-encryption-config.md b/specification/dynamodb-encryption-client/ddb-table-encryption-config.md
index 3e1a15a9b..5c17da9b9 100644
--- a/specification/dynamodb-encryption-client/ddb-table-encryption-config.md
+++ b/specification/dynamodb-encryption-client/ddb-table-encryption-config.md
@@ -10,7 +10,6 @@
 ### Changelog
 
 - 1.0.0
-
   - Initial record
 
 ## Definitions
diff --git a/specification/dynamodb-encryption-client/decrypt-item.md b/specification/dynamodb-encryption-client/decrypt-item.md
index 80af930c0..8c72dfc1a 100644
--- a/specification/dynamodb-encryption-client/decrypt-item.md
+++ b/specification/dynamodb-encryption-client/decrypt-item.md
@@ -10,7 +10,6 @@
 ### Changelog
 
 - 1.0.0
-
   - Initial record
 
 ## Definitions
diff --git a/specification/dynamodb-encryption-client/encrypt-item.md b/specification/dynamodb-encryption-client/encrypt-item.md
index dfe1dc0d0..25ca530a3 100644
--- a/specification/dynamodb-encryption-client/encrypt-item.md
+++ b/specification/dynamodb-encryption-client/encrypt-item.md
@@ -10,7 +10,6 @@
 ### Changelog
 
 - 1.0.0
-
   - Initial record
 
 ## Definitions
diff --git a/specification/dynamodb-encryption-client/string-ordering.md b/specification/dynamodb-encryption-client/string-ordering.md
index 7b2cb8bc8..68eb4093d 100644
--- a/specification/dynamodb-encryption-client/string-ordering.md
+++ b/specification/dynamodb-encryption-client/string-ordering.md
@@ -10,7 +10,6 @@
 ### Changelog
 
 - 1.0.0
-
   - Initial record
 
 ## Definitions
diff --git a/specification/structured-encryption/decrypt-path-structure.md b/specification/structured-encryption/decrypt-path-structure.md
index 2e1fc9cdb..0fd6273db 100644
--- a/specification/structured-encryption/decrypt-path-structure.md
+++ b/specification/structured-encryption/decrypt-path-structure.md
@@ -10,7 +10,6 @@
 ### Changelog
 
 - 1.0.0
-
   - Initial record
 
 ## Definitions
diff --git a/specification/structured-encryption/decrypt-structure.md b/specification/structured-encryption/decrypt-structure.md
index cfbf42bc5..d4538c0fd 100644
--- a/specification/structured-encryption/decrypt-structure.md
+++ b/specification/structured-encryption/decrypt-structure.md
@@ -10,7 +10,6 @@
 ### Changelog
 
 - 1.1.0
-
   - Update for simplified structured encryption
 
 - 1.0.0
diff --git a/specification/structured-encryption/encrypt-path-structure.md b/specification/structured-encryption/encrypt-path-structure.md
index d587159e3..93f1bcabf 100644
--- a/specification/structured-encryption/encrypt-path-structure.md
+++ b/specification/structured-encryption/encrypt-path-structure.md
@@ -10,7 +10,6 @@
 ### Changelog
 
 - 1.0.0
-
   - Initial record
 
 ## Definitions
diff --git a/specification/structured-encryption/encrypt-structure.md b/specification/structured-encryption/encrypt-structure.md
index 4b8def4cd..52f224ae5 100644
--- a/specification/structured-encryption/encrypt-structure.md
+++ b/specification/structured-encryption/encrypt-structure.md
@@ -10,7 +10,6 @@
 ### Changelog
 
 - 1.1.0
-
   - Update for simplified structured encryption
 
 - 1.0.0
diff --git a/specification/structured-encryption/resolve-auth-actions.md b/specification/structured-encryption/resolve-auth-actions.md
index 8d51d9d79..89bd5663d 100644
--- a/specification/structured-encryption/resolve-auth-actions.md
+++ b/specification/structured-encryption/resolve-auth-actions.md
@@ -10,7 +10,6 @@
 ### Changelog
 
 - 1.0.0
-
   - Initial record
 
 ## Definitions
diff --git a/specification/structured-encryption/structures.md b/specification/structured-encryption/structures.md
index 9d23883c7..bc8abdd70 100644
--- a/specification/structured-encryption/structures.md
+++ b/specification/structured-encryption/structures.md
@@ -10,7 +10,6 @@
 ### Changelog
 
 - 1.1.0
-
   - Update for simplified structured encryption
 
 - 1.0.0