Skip to content

chore: correct version numbers in README #2173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ajewellamz wants to merge 8 commits into
base: master
Choose a base branch
from
Open

chore: correct version numbers in README #2173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ec59c83
chore: correct version numbers in README
ajewellamz Dec 8, 2025
fdab2d1
m
ajewellamz Dec 8, 2025
e2db270
m
ajewellamz Dec 8, 2025
7b45cc2
m
ajewellamz Dec 8, 2025
c66728b
m
ajewellamz Dec 8, 2025
fdc3f7b
m
ajewellamz Dec 8, 2025
f68ec3f
m
ajewellamz Dec 8, 2025
2119f2a
m
ajewellamz Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 31 additions & 18 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -36,9 +36,11 @@ jobs:
matrix:
platform:
- distribution: openjdk
image: "aws/codebuild/standard:3.0"
runtime: corretto
image: "aws/codebuild/standard:7.0"
- distribution: corretto
image: "aws/codebuild/amazonlinux2-x86_64-standard:3.0" # Corretto only runs on AL2
runtime: corretto
image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2
version: [ 8, 11 ]
steps:
- name: Configure AWS Credentials
Expand All @@ -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
Expand All @@ -66,9 +68,11 @@ jobs:
matrix:
platform:
- distribution: openjdk
image: "aws/codebuild/standard:3.0"
runtime: corretto
image: "aws/codebuild/standard:7.0"
- distribution: corretto
image: "aws/codebuild/amazonlinux2-x86_64-standard:3.0" # Corretto only runs on AL2
runtime: corretto
image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2
version: [ 8, 11 ]
steps:
- name: Configure AWS Credentials
Expand All @@ -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
Expand All @@ -96,9 +100,11 @@ jobs:
matrix:
platform:
- distribution: openjdk
image: "aws/codebuild/standard:3.0"
runtime: corretto
image: "aws/codebuild/standard:7.0"
- distribution: corretto
image: "aws/codebuild/amazonlinux2-x86_64-standard:3.0" # Corretto only runs on AL2
runtime: corretto
image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2
version: [ 8, 11 ]
steps:
- name: Configure AWS Credentials
Expand All @@ -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
Expand All @@ -127,9 +133,11 @@ jobs:
matrix:
platform:
- distribution: openjdk
image: "aws/codebuild/standard:3.0"
runtime: corretto
image: "aws/codebuild/standard:7.0"
- distribution: corretto
image: "aws/codebuild/amazonlinux2-x86_64-standard:3.0" # Corretto only runs on AL2
runtime: corretto
image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2
version: [ 8, 11 ]
steps:
- name: Configure AWS Credentials
Expand All @@ -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
Expand All @@ -166,10 +174,13 @@ 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
env-vars-for-codebuild: GITHUB_EVENT_NAME
image-override: aws/codebuild/standard:7.0
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
Expand All @@ -179,9 +190,11 @@ jobs:
matrix:
platform:
- distribution: openjdk
image: "aws/codebuild/standard:3.0"
runtime: corretto
image: "aws/codebuild/standard:7.0"
- distribution: corretto
image: "aws/codebuild/amazonlinux2-x86_64-standard:3.0" # Corretto only runs on AL2
runtime: corretto
image: "aws/codebuild/amazonlinux2-x86_64-standard:5.0" # Corretto only runs on AL2
version: [ 8, 11 ]
steps:
- name: Configure AWS Credentials
Expand All @@ -203,6 +216,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
12 changes: 6 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ To use the AWS Encryption SDK for Java you must have:
<dependency>
<groupId>software.amazon.cryptography</groupId>
<artifactId>aws-cryptographic-material-providers</artifactId>
<version>3.0.2</version>
<version>1.11.0</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
Expand All @@ -69,7 +69,7 @@ To use the AWS Encryption SDK for Java you must have:
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId>
<version>3.0.2</version>
<version>1.12.794</version>
<optional>true</optional>
</dependency>
</dependencies>
Expand All @@ -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**
Expand Down
2 changes: 1 addition & 1 deletion codebuild/ci/release-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:
phases:
install:
runtime-versions:
java: openjdk11
java: $JAVA_ENV_VERSION
commands:
- git submodule update --init submodules/MaterialProviders
# Get Dafny
Expand Down
Loading