From 5bf96ca54cedaa472966da72e5c38a3712844c0d Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Thu, 5 Oct 2023 09:37:22 -0700 Subject: [PATCH 01/10] chore: update MPL submodule --- .gitmodules | 2 +- submodules/MaterialProviders | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 894ca5e35..b872bcbda 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "submodules/MaterialProviders"] path = submodules/MaterialProviders - url = https://github.com/aws/aws-cryptographic-material-providers-library-java.git + url = https://github.com/aws/aws-cryptographic-material-providers-library-dafny.git [submodule "submodules/smithy-dafny"] path = submodules/smithy-dafny url = https://github.com/awslabs/smithy-dafny.git diff --git a/submodules/MaterialProviders b/submodules/MaterialProviders index 13e0ac3c3..cce342923 160000 --- a/submodules/MaterialProviders +++ b/submodules/MaterialProviders @@ -1 +1 @@ -Subproject commit 13e0ac3c3c5eea83494706e4a96f40126d8f38a8 +Subproject commit cce342923ce5602f2e6162dccca44ecefaffca68 From 493e3f6bd6d3a2571ebf30ebf3534653af664598 Mon Sep 17 00:00:00 2001 From: Andy Jewell Date: Thu, 5 Oct 2023 15:38:58 -0400 Subject: [PATCH 02/10] update 4.1 to 4.2 --- .github/workflows/ci_examples_java.yml | 2 +- .github/workflows/ci_test_java.yml | 2 +- .github/workflows/ci_test_net.yml | 2 +- .github/workflows/ci_test_vector_java.yml | 2 +- .github/workflows/ci_verification.yml | 2 +- TestVectors/README.md | 2 +- codebuild/release/release-prod.yml | 2 +- codebuild/release/validate-release.yml | 2 +- codebuild/staging/release-staging.yml | 2 +- codebuild/staging/validate-staging.yml | 2 +- project.properties | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci_examples_java.yml b/.github/workflows/ci_examples_java.yml index dfa810c16..a38b5a24a 100644 --- a/.github/workflows/ci_examples_java.yml +++ b/.github/workflows/ci_examples_java.yml @@ -63,7 +63,7 @@ jobs: uses: dafny-lang/setup-dafny-action@v1.6.1 with: # A && B || C is the closest thing to an if .. then ... else ... or ?: expression the GitHub Actions syntax supports. - dafny-version: ${{ (github.event_name == 'schedule' || inputs.nightly) && 'nightly-latest' || '4.1.0' }} + dafny-version: ${{ (github.event_name == 'schedule' || inputs.nightly) && 'nightly-latest' || '4.2.0' }} - name: Build and locally deploy dependencies for examples shell: bash diff --git a/.github/workflows/ci_test_java.yml b/.github/workflows/ci_test_java.yml index 91eb11700..ab085970a 100644 --- a/.github/workflows/ci_test_java.yml +++ b/.github/workflows/ci_test_java.yml @@ -59,7 +59,7 @@ jobs: uses: dafny-lang/setup-dafny-action@v1.6.1 with: # A && B || C is the closest thing to an if .. then ... else ... or ?: expression the GitHub Actions syntax supports. - dafny-version: ${{ (github.event_name == 'schedule' || inputs.nightly) && 'nightly-latest' || '4.1.0' }} + dafny-version: ${{ (github.event_name == 'schedule' || inputs.nightly) && 'nightly-latest' || '4.2.0' }} - name: Setup Java ${{ matrix.java-version }} uses: actions/setup-java@v3 diff --git a/.github/workflows/ci_test_net.yml b/.github/workflows/ci_test_net.yml index 4063ede6c..b464e602b 100644 --- a/.github/workflows/ci_test_net.yml +++ b/.github/workflows/ci_test_net.yml @@ -60,7 +60,7 @@ jobs: uses: dafny-lang/setup-dafny-action@v1.6.1 with: # A && B || C is the closest thing to an if .. then ... else ... or ?: expression the GitHub Actions syntax supports. - dafny-version: ${{ (github.event_name == 'schedule' || inputs.nightly) && 'nightly-latest' || '4.1.0' }} + dafny-version: ${{ (github.event_name == 'schedule' || inputs.nightly) && 'nightly-latest' || '4.2.0' }} - name: Download Dependencies working-directory: ./${{ matrix.library }} diff --git a/.github/workflows/ci_test_vector_java.yml b/.github/workflows/ci_test_vector_java.yml index 19917495e..c550898bc 100644 --- a/.github/workflows/ci_test_vector_java.yml +++ b/.github/workflows/ci_test_vector_java.yml @@ -41,7 +41,7 @@ jobs: - name: Setup Dafny uses: dafny-lang/setup-dafny-action@v1.6.1 with: - dafny-version: '4.1.0' + dafny-version: '4.2.0' - name: Setup Java ${{ matrix.java-version }} uses: actions/setup-java@v3 diff --git a/.github/workflows/ci_verification.yml b/.github/workflows/ci_verification.yml index 0ee2efad7..98963b88b 100644 --- a/.github/workflows/ci_verification.yml +++ b/.github/workflows/ci_verification.yml @@ -50,7 +50,7 @@ jobs: uses: dafny-lang/setup-dafny-action@v1.6.1 with: # A && B || C is the closest thing to an if .. then ... else ... or ?: expression the GitHub Actions syntax supports. - dafny-version: ${{ (github.event_name == 'schedule' || inputs.nightly) && 'nightly-latest' || '4.1.0' }} + dafny-version: ${{ (github.event_name == 'schedule' || inputs.nightly) && 'nightly-latest' || '4.2.0' }} - name: Verify ${{ matrix.library }} Dafny code shell: bash diff --git a/TestVectors/README.md b/TestVectors/README.md index 544eeb073..c0ba641db 100644 --- a/TestVectors/README.md +++ b/TestVectors/README.md @@ -7,7 +7,7 @@ This validates the Database Encryption SDK's cross-version compatibility. ### Development Requirements -* Dafny 4.1.0: https://github.com/dafny-lang/dafny +* Dafny 4.2.0: https://github.com/dafny-lang/dafny The code that executes the test vectors is written in Dafny. You must install the Dafny runtime to compile the Dafny tests into Java. diff --git a/codebuild/release/release-prod.yml b/codebuild/release/release-prod.yml index 6248a1430..095f7e6ed 100644 --- a/codebuild/release/release-prod.yml +++ b/codebuild/release/release-prod.yml @@ -21,7 +21,7 @@ phases: commands: - cd .. # Get Dafny - - curl https://github.com/dafny-lang/dafny/releases/download/v4.1.0/dafny-4.1.0-x64-ubuntu-20.04.zip -L -o dafny.zip + - curl https://github.com/dafny-lang/dafny/releases/download/v4.2.0/dafny-4.2.0-x64-ubuntu-20.04.zip -L -o dafny.zip - unzip -qq dafny.zip && rm dafny.zip - export PATH="$PWD/dafny:$PATH" # Get Gradle 7.6 diff --git a/codebuild/release/validate-release.yml b/codebuild/release/validate-release.yml index 0aa6e427a..0a631d08e 100644 --- a/codebuild/release/validate-release.yml +++ b/codebuild/release/validate-release.yml @@ -14,7 +14,7 @@ phases: commands: - cd .. # Get Dafny - - curl https://github.com/dafny-lang/dafny/releases/download/v4.1.0/dafny-4.1.0-x64-ubuntu-20.04.zip -L -o dafny.zip + - curl https://github.com/dafny-lang/dafny/releases/download/v4.2.0/dafny-4.2.0-x64-ubuntu-20.04.zip -L -o dafny.zip - unzip -qq dafny.zip && rm dafny.zip - export PATH="$PWD/dafny:$PATH" # Get Gradle 7.6 diff --git a/codebuild/staging/release-staging.yml b/codebuild/staging/release-staging.yml index 818ccc5d4..694f949a5 100644 --- a/codebuild/staging/release-staging.yml +++ b/codebuild/staging/release-staging.yml @@ -21,7 +21,7 @@ phases: commands: - cd .. # Get Dafny - - curl https://github.com/dafny-lang/dafny/releases/download/v4.1.0/dafny-4.1.0-x64-ubuntu-20.04.zip -L -o dafny.zip + - curl https://github.com/dafny-lang/dafny/releases/download/v4.2.0/dafny-4.2.0-x64-ubuntu-20.04.zip -L -o dafny.zip - unzip -qq dafny.zip && rm dafny.zip - export PATH="$PWD/dafny:$PATH" # Get Gradle 7.6 diff --git a/codebuild/staging/validate-staging.yml b/codebuild/staging/validate-staging.yml index 7ee7814bc..c2ab5dac0 100644 --- a/codebuild/staging/validate-staging.yml +++ b/codebuild/staging/validate-staging.yml @@ -18,7 +18,7 @@ phases: commands: - cd .. # Get Dafny - - curl https://github.com/dafny-lang/dafny/releases/download/v4.1.0/dafny-4.1.0-x64-ubuntu-20.04.zip -L -o dafny.zip + - curl https://github.com/dafny-lang/dafny/releases/download/v4.2.0/dafny-4.2.0-x64-ubuntu-20.04.zip -L -o dafny.zip - unzip -qq dafny.zip && rm dafny.zip - export PATH="$PWD/dafny:$PATH" # Get Gradle 7.6 diff --git a/project.properties b/project.properties index 2cacfbd4c..aa393fed9 100644 --- a/project.properties +++ b/project.properties @@ -1,4 +1,4 @@ projectJavaVersion=3.1.0 mplDependencyJavaVersion=1.0.0 -dafnyRuntimeJavaVersion=4.1.0 +dafnyRuntimeJavaVersion=4.2.0 smithyDafnyJavaConversionVersion=0.1 From fa76ba1f53359af39ed67ca883b4b89765740008 Mon Sep 17 00:00:00 2001 From: Andy Jewell Date: Thu, 5 Oct 2023 15:52:47 -0400 Subject: [PATCH 03/10] update bouncycastle --- DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj b/DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj index 06ca3fb03..f0a680204 100644 --- a/DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj +++ b/DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj @@ -12,7 +12,7 @@ - +