diff --git a/.github/workflows/ci_examples_java.yml b/.github/workflows/ci_examples_java.yml index d33c4fc93..6008b2a90 100644 --- a/.github/workflows/ci_examples_java.yml +++ b/.github/workflows/ci_examples_java.yml @@ -46,6 +46,12 @@ jobs: with: submodules: recursive + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + with: + gradle-version: "7.6" # Supports Java 8-17 + cache-read-only: false + - name: Setup Java ${{ matrix.java-version }} uses: actions/setup-java@v4 with: diff --git a/.github/workflows/library_rust_tests.yml b/.github/workflows/library_rust_tests.yml index 5e586c149..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 @@ -62,7 +63,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 }} 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/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" 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/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/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 @@ false true - 3.7.0 + 3.7.1 AWS.Cryptography.DbEncryptionSDK.DynamoDb AWS.Cryptography.DbEncryptionSDK.DynamoDb @@ -57,8 +57,7 @@ - - +