From 87259906742bc7cd339a5380b2e884a30e953aea Mon Sep 17 00:00:00 2001
From: Andy Jewell <ajewell@amazon.com>
Date: Tue, 4 Jun 2024 13:34:49 -0400
Subject: [PATCH 1/4] chore: update to MPL 1.4

---
 AwsEncryptionSDK/runtimes/java/build.gradle.kts | 2 +-
 mpl                                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/AwsEncryptionSDK/runtimes/java/build.gradle.kts b/AwsEncryptionSDK/runtimes/java/build.gradle.kts
index 86db09935..b3ee86fd0 100644
--- a/AwsEncryptionSDK/runtimes/java/build.gradle.kts
+++ b/AwsEncryptionSDK/runtimes/java/build.gradle.kts
@@ -28,7 +28,7 @@ repositories {
 dependencies {
     implementation("org.dafny:DafnyRuntime:${dafnyVersion}")
     implementation("software.amazon.smithy.dafny:conversion:0.1")
-    implementation("software.amazon.cryptography:aws-cryptographic-material-providers:1.0.1")
+    implementation("software.amazon.cryptography:aws-cryptographic-material-providers:1.4.0")
 
     // Use JUnit test framework.
     testImplementation("junit:junit:4.13.2")
diff --git a/mpl b/mpl
index 6d0f00dfa..b6d28dcd6 160000
--- a/mpl
+++ b/mpl
@@ -1 +1 @@
-Subproject commit 6d0f00dfa8c31d490d89399cc104e7d4eac5b9b4
+Subproject commit b6d28dcd6968b00fa200fc0d51a1c83f437191ab

From 11da1824943194c06aec6231d29f79be5109d97b Mon Sep 17 00:00:00 2001
From: Andy Jewell <ajewell@amazon.com>
Date: Tue, 4 Jun 2024 16:18:00 -0400
Subject: [PATCH 2/4] m

---
 AwsEncryptionSDK/runtimes/net/ESDK.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AwsEncryptionSDK/runtimes/net/ESDK.csproj b/AwsEncryptionSDK/runtimes/net/ESDK.csproj
index 5d375c521..7065e467b 100644
--- a/AwsEncryptionSDK/runtimes/net/ESDK.csproj
+++ b/AwsEncryptionSDK/runtimes/net/ESDK.csproj
@@ -30,7 +30,7 @@
 
   <ItemGroup>
       <!-- TODO: manually upgraded to match the latest from MPL, is that reasonable? -->
-      <PackageReference Include="AWSSDK.Core" Version="3.7.300.2" />
+      <PackageReference Include="AWSSDK.Core" Version="3.7" />
       <PackageReference Include="DafnyRuntime" Version="4.2.0" />
       <PackageReference Include="BouncyCastle.Cryptography" Version="2.2.1" />
       <ProjectReference Include="../../../mpl/AwsCryptographicMaterialProviders/runtimes/net/MPL.csproj" />

From 0cc745d8a46d4d61b3d92eb7637fac9b71c753ad Mon Sep 17 00:00:00 2001
From: Andy Jewell <ajewell@amazon.com>
Date: Tue, 4 Jun 2024 16:19:00 -0400
Subject: [PATCH 3/4] m

---
 AwsEncryptionSDK/runtimes/net/ESDK.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AwsEncryptionSDK/runtimes/net/ESDK.csproj b/AwsEncryptionSDK/runtimes/net/ESDK.csproj
index 7065e467b..b096e22dc 100644
--- a/AwsEncryptionSDK/runtimes/net/ESDK.csproj
+++ b/AwsEncryptionSDK/runtimes/net/ESDK.csproj
@@ -32,7 +32,7 @@
       <!-- TODO: manually upgraded to match the latest from MPL, is that reasonable? -->
       <PackageReference Include="AWSSDK.Core" Version="3.7" />
       <PackageReference Include="DafnyRuntime" Version="4.2.0" />
-      <PackageReference Include="BouncyCastle.Cryptography" Version="2.2.1" />
+      <PackageReference Include="BouncyCastle.Cryptography" Version="2.3.1" />
       <ProjectReference Include="../../../mpl/AwsCryptographicMaterialProviders/runtimes/net/MPL.csproj" />
       <!--
         System.Collections.Immutable can be removed once dafny.msbuild is updated with

From 65447369f0d705f41be18b669d1c7e73a4bce816 Mon Sep 17 00:00:00 2001
From: Andy Jewell <ajewell@amazon.com>
Date: Tue, 4 Jun 2024 16:21:41 -0400
Subject: [PATCH 4/4] m

---
 AwsEncryptionSDK/runtimes/net/ESDK.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AwsEncryptionSDK/runtimes/net/ESDK.csproj b/AwsEncryptionSDK/runtimes/net/ESDK.csproj
index b096e22dc..71d8aa95b 100644
--- a/AwsEncryptionSDK/runtimes/net/ESDK.csproj
+++ b/AwsEncryptionSDK/runtimes/net/ESDK.csproj
@@ -30,7 +30,7 @@
 
   <ItemGroup>
       <!-- TODO: manually upgraded to match the latest from MPL, is that reasonable? -->
-      <PackageReference Include="AWSSDK.Core" Version="3.7" />
+      <PackageReference Include="AWSSDK.Core" Version="3.7.*" />
       <PackageReference Include="DafnyRuntime" Version="4.2.0" />
       <PackageReference Include="BouncyCastle.Cryptography" Version="2.3.1" />
       <ProjectReference Include="../../../mpl/AwsCryptographicMaterialProviders/runtimes/net/MPL.csproj" />