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 @@ <ItemGroup> <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.303.14"/> - <PackageReference Include="AWSSDK.Core" Version="3.7.304.7"/> + <PackageReference Include="AWSSDK.Core" Version="3.7.304.16"/> <PackageReference Include="DafnyRuntime" Version="$(DafnyVersion)" /> <ProjectReference Include="../../../submodules/MaterialProviders/AwsCryptographicMaterialProviders/runtimes/net/MPL.csproj"/> <!-- diff --git a/TestVectors/runtimes/java/build.gradle.kts b/TestVectors/runtimes/java/build.gradle.kts index ae608f1a9..57b93ec96 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 { @@ -91,8 +90,7 @@ dependencies { implementation("software.amazon.smithy.dafny:conversion:${smithyDafnyJavaConversionVersion}") 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/TestVectors/runtimes/net/DbEsdkTestVectors.csproj b/TestVectors/runtimes/net/DbEsdkTestVectors.csproj index 10fbf624d..f09ec4ed0 100644 --- a/TestVectors/runtimes/net/DbEsdkTestVectors.csproj +++ b/TestVectors/runtimes/net/DbEsdkTestVectors.csproj @@ -11,8 +11,6 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.303.14"/> - <PackageReference Include="AWSSDK.Core" Version="3.7.304.7"/> <ProjectReference Include="../../../DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj" /> <ProjectReference Include="../../../submodules/MaterialProviders/TestVectorsAwsCryptographicMaterialProviders/runtimes/net/TestVectors.csproj" /> <Compile Include="*.cs"/> 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 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