From ec59c83d498732915ffd452da02d91b77fd9b493 Mon Sep 17 00:00:00 2001 From: Andy Jewell Date: Mon, 8 Dec 2025 09:43:43 -0500 Subject: [PATCH 1/8] chore: correct version numbers in README --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 0955c229..629ca5ae 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ To use the AWS Encryption SDK for Java you must have: software.amazon.cryptography aws-cryptographic-material-providers - 3.0.2 + 1.11.0 software.amazon.awssdk @@ -69,7 +69,7 @@ To use the AWS Encryption SDK for Java you must have: com.amazonaws aws-java-sdk - 3.0.2 + 1.12.794 true @@ -80,13 +80,13 @@ To use the AWS Encryption SDK for Java you must have: * **Via Gradle Kotlin** In a Gradle Java Project, add the following to the _dependencies_ section: ```kotlin - implementation("com.amazonaws:aws-encryption-sdk-java:3.0.0") - implementation("software.amazon.cryptography:aws-cryptographic-material-providers:1.0.2") - implementation(platform("software.amazon.awssdk:bom:2.20.91")) + implementation("com.amazonaws:aws-encryption-sdk-java:3.0.2") + implementation("software.amazon.cryptography:aws-cryptographic-material-providers:1.11.0") + implementation(platform("software.amazon.awssdk:bom:2.40.2")) implementation("software.amazon.awssdk:kms") implementation("software.amazon.awssdk:dynamodb") // The following are optional: - implementation("com.amazonaws:aws-java-sdk:1.12.394") + implementation("com.amazonaws:aws-java-sdk:1.12.794") ``` * **Bouncy Castle** or **Bouncy Castle FIPS** From fdab2d1dc349e1eaf691eec1375ef29856768fa4 Mon Sep 17 00:00:00 2001 From: Andy Jewell Date: Mon, 8 Dec 2025 13:52:46 -0500 Subject: [PATCH 2/8] m --- .github/workflows/ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6509f392..6613eee4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: project-name: AWS-ESDK-Java-CI buildspec-override: codebuild/ci/static-analysis.yml compute-type-override: BUILD_GENERAL1_MEDIUM - image-override: aws/codebuild/amazonlinux2-x86_64-standard:3.0 + image-override: aws/codebuild/amazonlinux2-x86_64-standard:5.0 vectorTests: name: Vector Tests runs-on: ubuntu-latest @@ -36,9 +36,9 @@ jobs: matrix: platform: - distribution: openjdk - image: "aws/codebuild/standard:3.0" + image: "aws/codebuild/standard:5.0" - distribution: corretto - image: "aws/codebuild/amazonlinux2-x86_64-standard:3.0" # Corretto only runs on AL2 + image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] steps: - name: Configure AWS Credentials @@ -66,9 +66,9 @@ jobs: matrix: platform: - distribution: openjdk - image: "aws/codebuild/standard:3.0" + image: "aws/codebuild/standard:5.0" - distribution: corretto - image: "aws/codebuild/amazonlinux2-x86_64-standard:3.0" # Corretto only runs on AL2 + image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] steps: - name: Configure AWS Credentials @@ -96,9 +96,9 @@ jobs: matrix: platform: - distribution: openjdk - image: "aws/codebuild/standard:3.0" + image: "aws/codebuild/standard:5.0" - distribution: corretto - image: "aws/codebuild/amazonlinux2-x86_64-standard:3.0" # Corretto only runs on AL2 + image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] steps: - name: Configure AWS Credentials @@ -127,9 +127,9 @@ jobs: matrix: platform: - distribution: openjdk - image: "aws/codebuild/standard:3.0" + image: "aws/codebuild/standard:5.0" - distribution: corretto - image: "aws/codebuild/amazonlinux2-x86_64-standard:3.0" # Corretto only runs on AL2 + image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] steps: - name: Configure AWS Credentials @@ -166,7 +166,7 @@ jobs: project-name: AWS-ESDK-Java-CI buildspec-override: codebuild/ci/release-ci.yml compute-type-override: BUILD_GENERAL1_LARGE - image-override: aws/codebuild/standard:3.0 + image-override: aws/codebuild/standard:5.0 env-vars-for-codebuild: GITHUB_EVENT_NAME env: GITHUB_EVENT_NAME: $GITHUB_EVENT_NAME @@ -179,9 +179,9 @@ jobs: matrix: platform: - distribution: openjdk - image: "aws/codebuild/standard:3.0" + image: "aws/codebuild/standard:5.0" - distribution: corretto - image: "aws/codebuild/amazonlinux2-x86_64-standard:3.0" # Corretto only runs on AL2 + image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] steps: - name: Configure AWS Credentials From e2db270d8a60f2631360fe82e2591a3c626411d5 Mon Sep 17 00:00:00 2001 From: Andy Jewell Date: Mon, 8 Dec 2025 13:58:01 -0500 Subject: [PATCH 3/8] m --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6613eee4..c59a9898 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: matrix: platform: - distribution: openjdk - image: "aws/codebuild/standard:5.0" + image: "aws/codebuild/standard:3.0" - distribution: corretto image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] @@ -66,7 +66,7 @@ jobs: matrix: platform: - distribution: openjdk - image: "aws/codebuild/standard:5.0" + image: "aws/codebuild/standard:3.0" - distribution: corretto image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] @@ -96,7 +96,7 @@ jobs: matrix: platform: - distribution: openjdk - image: "aws/codebuild/standard:5.0" + image: "aws/codebuild/standard:3.0" - distribution: corretto image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] @@ -127,7 +127,7 @@ jobs: matrix: platform: - distribution: openjdk - image: "aws/codebuild/standard:5.0" + image: "aws/codebuild/standard:3.0" - distribution: corretto image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] @@ -166,7 +166,7 @@ jobs: project-name: AWS-ESDK-Java-CI buildspec-override: codebuild/ci/release-ci.yml compute-type-override: BUILD_GENERAL1_LARGE - image-override: aws/codebuild/standard:5.0 + image-override: aws/codebuild/standard:3.0 env-vars-for-codebuild: GITHUB_EVENT_NAME env: GITHUB_EVENT_NAME: $GITHUB_EVENT_NAME @@ -179,7 +179,7 @@ jobs: matrix: platform: - distribution: openjdk - image: "aws/codebuild/standard:5.0" + image: "aws/codebuild/standard:3.0" - distribution: corretto image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] From 7b45cc2ea599860b5b2bf7f7bf2aec6eae9ac867 Mon Sep 17 00:00:00 2001 From: Andy Jewell Date: Mon, 8 Dec 2025 14:31:55 -0500 Subject: [PATCH 4/8] m --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c59a9898..bbac5b17 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: matrix: platform: - distribution: openjdk - image: "aws/codebuild/standard:3.0" + image: "aws/codebuild/standard:7.0" - distribution: corretto image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] @@ -66,7 +66,7 @@ jobs: matrix: platform: - distribution: openjdk - image: "aws/codebuild/standard:3.0" + image: "aws/codebuild/standard:7.0" - distribution: corretto image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] @@ -96,7 +96,7 @@ jobs: matrix: platform: - distribution: openjdk - image: "aws/codebuild/standard:3.0" + image: "aws/codebuild/standard:7.0" - distribution: corretto image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] @@ -127,7 +127,7 @@ jobs: matrix: platform: - distribution: openjdk - image: "aws/codebuild/standard:3.0" + image: "aws/codebuild/standard:7.0" - distribution: corretto image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] @@ -166,7 +166,7 @@ jobs: project-name: AWS-ESDK-Java-CI buildspec-override: codebuild/ci/release-ci.yml compute-type-override: BUILD_GENERAL1_LARGE - image-override: aws/codebuild/standard:3.0 + image-override: aws/codebuild/standard:7.0 env-vars-for-codebuild: GITHUB_EVENT_NAME env: GITHUB_EVENT_NAME: $GITHUB_EVENT_NAME @@ -179,7 +179,7 @@ jobs: matrix: platform: - distribution: openjdk - image: "aws/codebuild/standard:3.0" + image: "aws/codebuild/standard:7.0" - distribution: corretto image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] From c66728b1a27af2b27b6626569c4e8b88185db482 Mon Sep 17 00:00:00 2001 From: Andy Jewell Date: Mon, 8 Dec 2025 14:42:57 -0500 Subject: [PATCH 5/8] m --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bbac5b17..0167f69d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: matrix: platform: - distribution: openjdk - image: "aws/codebuild/standard:7.0" + image: "aws/codebuild/ubuntu-standard:7.0" - distribution: corretto image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] @@ -66,7 +66,7 @@ jobs: matrix: platform: - distribution: openjdk - image: "aws/codebuild/standard:7.0" + image: "aws/codebuild/ubuntu-standard:7.0" - distribution: corretto image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] @@ -96,7 +96,7 @@ jobs: matrix: platform: - distribution: openjdk - image: "aws/codebuild/standard:7.0" + image: "aws/codebuild/ubuntu-standard:7.0" - distribution: corretto image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] @@ -127,7 +127,7 @@ jobs: matrix: platform: - distribution: openjdk - image: "aws/codebuild/standard:7.0" + image: "aws/codebuild/ubuntu-standard:7.0" - distribution: corretto image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] @@ -166,7 +166,7 @@ jobs: project-name: AWS-ESDK-Java-CI buildspec-override: codebuild/ci/release-ci.yml compute-type-override: BUILD_GENERAL1_LARGE - image-override: aws/codebuild/standard:7.0 + image-override: aws/codebuild/ubuntu-standard:7.0 env-vars-for-codebuild: GITHUB_EVENT_NAME env: GITHUB_EVENT_NAME: $GITHUB_EVENT_NAME @@ -179,7 +179,7 @@ jobs: matrix: platform: - distribution: openjdk - image: "aws/codebuild/standard:7.0" + image: "aws/codebuild/ubuntu-standard:7.0" - distribution: corretto image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] From fdc3f7b2822147a655a9da69fb4597939c48f78a Mon Sep 17 00:00:00 2001 From: Andy Jewell Date: Mon, 8 Dec 2025 14:53:23 -0500 Subject: [PATCH 6/8] m --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0167f69d..bbac5b17 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: matrix: platform: - distribution: openjdk - image: "aws/codebuild/ubuntu-standard:7.0" + image: "aws/codebuild/standard:7.0" - distribution: corretto image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] @@ -66,7 +66,7 @@ jobs: matrix: platform: - distribution: openjdk - image: "aws/codebuild/ubuntu-standard:7.0" + image: "aws/codebuild/standard:7.0" - distribution: corretto image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] @@ -96,7 +96,7 @@ jobs: matrix: platform: - distribution: openjdk - image: "aws/codebuild/ubuntu-standard:7.0" + image: "aws/codebuild/standard:7.0" - distribution: corretto image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] @@ -127,7 +127,7 @@ jobs: matrix: platform: - distribution: openjdk - image: "aws/codebuild/ubuntu-standard:7.0" + image: "aws/codebuild/standard:7.0" - distribution: corretto image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] @@ -166,7 +166,7 @@ jobs: project-name: AWS-ESDK-Java-CI buildspec-override: codebuild/ci/release-ci.yml compute-type-override: BUILD_GENERAL1_LARGE - image-override: aws/codebuild/ubuntu-standard:7.0 + image-override: aws/codebuild/standard:7.0 env-vars-for-codebuild: GITHUB_EVENT_NAME env: GITHUB_EVENT_NAME: $GITHUB_EVENT_NAME @@ -179,7 +179,7 @@ jobs: matrix: platform: - distribution: openjdk - image: "aws/codebuild/ubuntu-standard:7.0" + image: "aws/codebuild/standard:7.0" - distribution: corretto image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] From f68ec3f1a65896e0c8897f36d87f72ca9bff1f94 Mon Sep 17 00:00:00 2001 From: Andy Jewell Date: Mon, 8 Dec 2025 15:04:45 -0500 Subject: [PATCH 7/8] m --- .github/workflows/ci.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bbac5b17..3ab807da 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,8 +36,10 @@ jobs: matrix: platform: - distribution: openjdk + runtime: corretto image: "aws/codebuild/standard:7.0" - distribution: corretto + runtime: corretto image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] steps: @@ -57,7 +59,7 @@ jobs: image-override: ${{ matrix.platform.image }} env-vars-for-codebuild: JAVA_ENV_VERSION env: - JAVA_ENV_VERSION: ${{ matrix.platform.distribution }}${{ matrix.version }} + JAVA_ENV_VERSION: ${{ matrix.platform.runtime }}${{ matrix.version }} vectorTestsMasterKeyProvider: name: Vector Tests MasterKeyProvider runs-on: ubuntu-latest @@ -66,8 +68,10 @@ jobs: matrix: platform: - distribution: openjdk + runtime: corretto image: "aws/codebuild/standard:7.0" - distribution: corretto + runtime: corretto image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] steps: @@ -87,7 +91,7 @@ jobs: image-override: ${{ matrix.platform.image }} env-vars-for-codebuild: JAVA_ENV_VERSION env: - JAVA_ENV_VERSION: ${{ matrix.platform.distribution }}${{ matrix.version }} + JAVA_ENV_VERSION: ${{ matrix.platform.runtime }}${{ matrix.version }} netVectorTests: name: ESDK-NET Vector Tests runs-on: ubuntu-latest @@ -96,8 +100,10 @@ jobs: matrix: platform: - distribution: openjdk + runtime: corretto image: "aws/codebuild/standard:7.0" - distribution: corretto + runtime: corretto image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] steps: @@ -117,7 +123,7 @@ jobs: image-override: ${{ matrix.platform.image }} env-vars-for-codebuild: JAVA_ENV_VERSION env: - JAVA_ENV_VERSION: ${{ matrix.platform.distribution }}${{ matrix.version }} + JAVA_ENV_VERSION: ${{ matrix.platform.runtime }}${{ matrix.version }} generateTestVectors: name: Generate Vectors runs-on: ubuntu-latest @@ -127,8 +133,10 @@ jobs: matrix: platform: - distribution: openjdk + runtime: corretto image: "aws/codebuild/standard:7.0" - distribution: corretto + runtime: corretto image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] steps: @@ -148,7 +156,7 @@ jobs: image-override: ${{ matrix.platform.image }} env-vars-for-codebuild: JAVA_ENV_VERSION env: - JAVA_ENV_VERSION: ${{ matrix.platform.distribution }}${{ matrix.version }} + JAVA_ENV_VERSION: ${{ matrix.platform.runtime }}${{ matrix.version }} releaseCI: name: Release CI runs-on: ubuntu-latest @@ -179,8 +187,10 @@ jobs: matrix: platform: - distribution: openjdk + runtime: corretto image: "aws/codebuild/standard:7.0" - distribution: corretto + runtime: corretto image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2 version: [ 8, 11 ] steps: @@ -203,6 +213,6 @@ jobs: JAVA_NUMERIC_VERSION, GITHUB_EVENT_NAME env: - JAVA_ENV_VERSION: ${{ matrix.platform.distribution }}${{ matrix.version }} + JAVA_ENV_VERSION: ${{ matrix.platform.runtime }}${{ matrix.version }} JAVA_NUMERIC_VERSION: ${{ matrix.version }} GITHUB_EVENT_NAME: $GITHUB_EVENT_NAME From 2119f2a3fc8298f08dd4d9cc8712e2f7665be74f Mon Sep 17 00:00:00 2001 From: Andy Jewell Date: Mon, 8 Dec 2025 15:39:15 -0500 Subject: [PATCH 8/8] m --- .github/workflows/ci.yml | 5 ++++- codebuild/ci/release-ci.yml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3ab807da..8762c373 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -175,9 +175,12 @@ jobs: buildspec-override: codebuild/ci/release-ci.yml compute-type-override: BUILD_GENERAL1_LARGE image-override: aws/codebuild/standard:7.0 - env-vars-for-codebuild: GITHUB_EVENT_NAME + env-vars-for-codebuild: | + GITHUB_EVENT_NAME, + JAVA_ENV_VERSION env: GITHUB_EVENT_NAME: $GITHUB_EVENT_NAME + JAVA_ENV_VERSION: corretto11 validateCI: name: Validate CI runs-on: ubuntu-latest diff --git a/codebuild/ci/release-ci.yml b/codebuild/ci/release-ci.yml index 0505a956..79cc5cd3 100644 --- a/codebuild/ci/release-ci.yml +++ b/codebuild/ci/release-ci.yml @@ -16,7 +16,7 @@ env: phases: install: runtime-versions: - java: openjdk11 + java: $JAVA_ENV_VERSION commands: - git submodule update --init submodules/MaterialProviders # Get Dafny