From da259f8744b68c72d6a136b6fff58e06ce629328 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Mon, 15 Jul 2024 13:45:10 -0700 Subject: [PATCH 1/6] chore(MPL): bump MPL submodule to 1.5.1 --- submodules/MaterialProviders | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/MaterialProviders b/submodules/MaterialProviders index b6d28dcd6..cdd4885cb 160000 --- a/submodules/MaterialProviders +++ b/submodules/MaterialProviders @@ -1 +1 @@ -Subproject commit b6d28dcd6968b00fa200fc0d51a1c83f437191ab +Subproject commit cdd4885cb22957b04167b11d8b40edbdf4301d8d From d1a622639291d3f1f158229d42fea3945b3eea4b Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Mon, 15 Jul 2024 13:48:43 -0700 Subject: [PATCH 2/6] update build.gradle.kts --- TestVectors/runtimes/java/build.gradle.kts | 5 ++--- project.properties | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/TestVectors/runtimes/java/build.gradle.kts b/TestVectors/runtimes/java/build.gradle.kts index ae608f1a9..6d08ecea8 100644 --- a/TestVectors/runtimes/java/build.gradle.kts +++ b/TestVectors/runtimes/java/build.gradle.kts @@ -28,8 +28,7 @@ var dafnyRuntimeJavaVersion = props.getProperty("dafnyRuntimeJavaVersion") var smithyDafnyJavaConversionVersion = props.getProperty("smithyDafnyJavaConversionVersion") group = "software.amazon.cryptography" -// change to ${mplVersion} for next MPL update -version = "1.0-SNAPSHOT" +version = ${mplVersion} description = "TestVectorsDynamoDbEncryption" java { @@ -92,7 +91,7 @@ dependencies { implementation("software.amazon.cryptography:aws-cryptographic-material-providers:${mplVersion}") implementation("software.amazon.cryptography:aws-database-encryption-sdk-dynamodb:${ddbecVersion}") // change to ${mplVersion} for next MPL update - implementation("software.amazon.cryptography:TestAwsCryptographicMaterialProviders:1.0-SNAPSHOT") + implementation("software.amazon.cryptography:TestAwsCryptographicMaterialProviders:${mplVersion}") implementation(platform("software.amazon.awssdk:bom:2.24.2")) implementation("software.amazon.awssdk:dynamodb") diff --git a/project.properties b/project.properties index aef7c7f86..479454a16 100644 --- a/project.properties +++ b/project.properties @@ -1,5 +1,5 @@ projectJavaVersion=3.5.0-SNAPSHOT -mplDependencyJavaVersion=1.4.0 +mplDependencyJavaVersion=1.5.1 dafnyVersion=4.2.0 dafnyVerifyVersion=4.7.0 dafnyRuntimeJavaVersion=4.2.0 From b702f98c34cacb29ddb131f02a94e4f2f55c1684 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Mon, 15 Jul 2024 15:38:47 -0700 Subject: [PATCH 3/6] bump sdk core --- DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj | 2 +- TestVectors/runtimes/net/DbEsdkTestVectors.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj b/DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj index 97376ee32..6a8b96001 100644 --- a/DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj +++ b/DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj @@ -58,7 +58,7 @@ - +