From fca643c63566ab5b1233947d3eb622d5f2845162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Corella?= <39066999+josecorella@users.noreply.github.com> Date: Fri, 29 Oct 2021 09:11:13 -0700 Subject: [PATCH 01/32] enable permissions (#393) --- look_4_version.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 look_4_version.sh diff --git a/look_4_version.sh b/look_4_version.sh old mode 100644 new mode 100755 From cf2c87394b67a487058c854c5b6695067256daff Mon Sep 17 00:00:00 2001 From: Ben Farley <47006790+farleyb-amazon@users.noreply.github.com> Date: Tue, 9 Nov 2021 15:43:05 -0700 Subject: [PATCH 02/32] chore: Add CODEOWNERS file (#407) --- .github/CODEOWNERS | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 000000000..806891736 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,5 @@ +# Each line is a file pattern followed by one or more owners. +# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners + +# Default code owner for everything is our aws-crypto-tools group +* @aws/aws-crypto-tools From dfefa62833027d619d76322904dfe724cdee7e40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Corella?= <39066999+josecorella@users.noreply.github.com> Date: Fri, 12 Nov 2021 10:27:14 -0800 Subject: [PATCH 03/32] chore: update mainline-1.x cd (#413) --- .releaserc | 4 ++-- README.md | 2 +- codebuild/release/artifact-hunt.yml | 20 ++++++++++++++++++++ codebuild/release/release-prod.yml | 1 - codebuild/release/release.yml | 16 ++++++++++++---- codebuild/release/upload_artifacts.yml | 15 ++++++++++----- codebuild/release/version.yml | 2 +- 7 files changed, 46 insertions(+), 14 deletions(-) create mode 100644 codebuild/release/artifact-hunt.yml diff --git a/.releaserc b/.releaserc index eaff720af..8f5dd99ba 100644 --- a/.releaserc +++ b/.releaserc @@ -53,11 +53,11 @@ ["@semantic-release/exec", { "prepareCmd": "mvn versions:set -DnewVersion=${nextRelease.version} \ -DautoVersionSubmodules=true && find README.md -type f \ - -exec sed -i '' 's/.*<\\/version>/${nextRelease.version}<\\/version>/g' {} \\;" + -exec sed -i 's/.*<\\/version>/${nextRelease.version}<\\/version>/g' {} \\;" }], ["@semantic-release/git", { "assets": ["./CHANGELOG.md", "./pom.xml", "./README.md"], - "message": "AWS Encryption SDK ${nextRelease.version} Release \n\n${nextRelease.notes}" + "message": "AWS Encryption SDK ${nextRelease.version} Release -- $(date +%Y-%m-%d) \n\n${nextRelease.notes}" }], ], "repositoryUrl": "https://github.com/aws/aws-encryption-sdk-java", diff --git a/README.md b/README.md index 7c71b5f8e..fa1b13dca 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ You can get the latest release from Maven: com.amazonaws aws-encryption-sdk-java - 1.9.0 + 1.9.1 ``` diff --git a/codebuild/release/artifact-hunt.yml b/codebuild/release/artifact-hunt.yml new file mode 100644 index 000000000..a5a7beeda --- /dev/null +++ b/codebuild/release/artifact-hunt.yml @@ -0,0 +1,20 @@ +## Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. +## SPDX-License-Identifier: Apache-2.0 + +version: 0.2 + +env: + variables: + BRANCH: "mainline-1.x" + +phases: + install: + runtime-versions: + java: corretto11 + pre_build: + commands: + - git checkout $BRANCH + - export VERSION=$(grep version pom.xml | head -n 1 | sed -n 's/[ \t]*\(.*\)<\/version>/\1/p') + build: + commands: + - ./look_4_version.sh $VERSION diff --git a/codebuild/release/release-prod.yml b/codebuild/release/release-prod.yml index 4fff1e2d2..d97df4778 100644 --- a/codebuild/release/release-prod.yml +++ b/codebuild/release/release-prod.yml @@ -38,4 +38,3 @@ phases: -Dsonatype.password="$SONA_PASSWORD" \ --no-transfer-progress \ -s $SETTINGS_FILE - - ./look_4_version.sh $VERSION diff --git a/codebuild/release/release.yml b/codebuild/release/release.yml index 3f6dbc252..a123e65a0 100644 --- a/codebuild/release/release.yml +++ b/codebuild/release/release.yml @@ -70,10 +70,18 @@ batch: - version buildspec: codebuild/release/release-prod.yml +# Wait for artifacts to be available + - identifier: availability + depend-on: + - version + buildspec: codebuild/release/artifact-hunt.yml + env: + image: aws/codebuild/standard:5.0 + # Validate Maven Central with supported JDK and Corretto - identifier: validate_prod_release_openjdk8 depend-on: - - publish + - availability buildspec: codebuild/release/validate-prod.yml env: variables: @@ -83,7 +91,7 @@ batch: - identifier: validate_prod_release_openjdk11 depend-on: - - publish + - availability buildspec: codebuild/release/validate-prod.yml env: variables: @@ -93,7 +101,7 @@ batch: - identifier: validate_prod_release_corretto8 depend-on: - - publish + - availability buildspec: codebuild/release/validate-prod.yml env: variables: @@ -103,7 +111,7 @@ batch: - identifier: validate_prod_release_corretto11 depend-on: - - publish + - availability buildspec: codebuild/release/validate-prod.yml env: variables: diff --git a/codebuild/release/upload_artifacts.yml b/codebuild/release/upload_artifacts.yml index ce3261bbf..0712e2d65 100644 --- a/codebuild/release/upload_artifacts.yml +++ b/codebuild/release/upload_artifacts.yml @@ -5,26 +5,31 @@ version: 0.2 env: variables: - BRANCH: "mainline-1.x" + BRANCH: "master" git-credential-helper: yes secrets-manager: - GH_TOKEN: Github/aws-crypto-tools-ci-bot:personal\ access\ token + GH_TOKEN: Github/aws-crypto-tools-ci-bot:ESDK Release Token phases: pre_build: commands: - - git checkout $BRANCH # get new project version - export VERSION=$(grep version pom.xml | head -n 1 | sed -n 's/[ \t]*\(.*\)<\/version>/\1/p') + - git config --global user.name "aws-crypto-tools-ci-bot" + - git config --global user.email "no-reply@noemail.local" + - echo $GH_TOKEN > token.txt + - export GH_TOKEN= # install gh cli in order to upload artifacts - curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | gpg --dearmor -o /usr/share/keyrings/githubcli-archive-keyring.gpg - echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null - apt update - apt install gh + - git checkout $BRANCH build: commands: - gh version - - gh auth login --with-token < $GH_TOKEN + - gh auth login --with-token < token.txt + - gh auth status - | mvn org.apache.maven.plugins:maven-dependency-plugin:3.1.2:get \ -DrepoUrl=https://aws.oss.sonatype.org \ @@ -37,4 +42,4 @@ phases: mvn org.apache.maven.plugins:maven-dependency-plugin:3.1.2:get \ -DrepoUrl=https://aws.oss.sonatype.org \ -Dartifact=com.amazonaws:aws-encryption-sdk-java:${VERSION}:jar:javadoc - - gh release upload v${VERSION} ~/.m2/repository/com/amazonaws/aws-encryption-sdk-java/${VERSION}/*.jar + - gh release create v${VERSION} ~/.m2/repository/com/amazonaws/aws-encryption-sdk-java/${VERSION}/*.jar -d -F CHANGELOG.md -t "AWS Encryption SDK ${VERSION} Release -- $(date +%Y-%m-%d)" diff --git a/codebuild/release/version.yml b/codebuild/release/version.yml index 79b1bab41..560b34b25 100644 --- a/codebuild/release/version.yml +++ b/codebuild/release/version.yml @@ -26,5 +26,5 @@ phases: - git checkout $BRANCH build: commands: - - npx semantic-release --branches $BRANCH --no-ci + - npx semantic-release --branches $BRANCH --no-ci From 9dd4ccdb311363dfae0b64fa9e829b9ecd2ba80a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Dec 2021 11:15:41 -0800 Subject: [PATCH 04/32] chore(deps): bump fmt-maven-plugin from 2.12 to 2.13 (#445) Bumps [fmt-maven-plugin](https://github.com/coveooss/fmt-maven-plugin) from 2.12 to 2.13. - [Release notes](https://github.com/coveooss/fmt-maven-plugin/releases) - [Commits](https://github.com/coveooss/fmt-maven-plugin/compare/2.12.0...2.13.0) --- updated-dependencies: - dependency-name: com.coveo:fmt-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 48e90bf4c..fcbf5215f 100644 --- a/pom.xml +++ b/pom.xml @@ -142,7 +142,7 @@ com.coveo fmt-maven-plugin - 2.12 + 2.13 From e9b190cbb3c865f669ba25dc263c1e86764f5c91 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Dec 2021 11:43:00 -0800 Subject: [PATCH 05/32] chore(deps): bump bcprov-ext-jdk15on from 1.67 to 1.70 (#444) Bumps [bcprov-ext-jdk15on](https://github.com/bcgit/bc-java) from 1.67 to 1.70. - [Release notes](https://github.com/bcgit/bc-java/releases) - [Changelog](https://github.com/bcgit/bc-java/blob/master/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) --- updated-dependencies: - dependency-name: org.bouncycastle:bcprov-ext-jdk15on dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fcbf5215f..469e3decf 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ org.bouncycastle bcprov-ext-jdk15on - 1.67 + 1.70 From 625a044ef64a7bf4789d52ab679cacfe1978f5ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Dec 2021 12:17:36 -0800 Subject: [PATCH 06/32] chore(deps): bump maven-compiler-plugin from 3.8.0 to 3.8.1 (#449) Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.8.0 to 3.8.1. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.8.0...maven-compiler-plugin-3.8.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 469e3decf..28827b125 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + 3.8.1 1.8 1.8 From 6f77980a8fbd24ae612d51006ab178ea12865296 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Dec 2021 12:37:53 -0800 Subject: [PATCH 07/32] chore(deps): bump build-helper-maven-plugin from 3.0.0 to 3.2.0 (#448) Bumps [build-helper-maven-plugin](https://github.com/mojohaus/build-helper-maven-plugin) from 3.0.0 to 3.2.0. - [Release notes](https://github.com/mojohaus/build-helper-maven-plugin/releases) - [Commits](https://github.com/mojohaus/build-helper-maven-plugin/compare/build-helper-maven-plugin-3.0.0...build-helper-maven-plugin-3.2.0) --- updated-dependencies: - dependency-name: org.codehaus.mojo:build-helper-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 28827b125..8887d7b76 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.2.0 add-test-source From 83d7546b9f6e48003ba3d04115ddef1a2f0214f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Dec 2021 15:08:36 -0800 Subject: [PATCH 08/32] chore(deps): bump commons-lang3 from 3.9 to 3.12.0 (#451) Bumps commons-lang3 from 3.9 to 3.12.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-lang3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8887d7b76..9441b6258 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ org.apache.commons commons-lang3 - 3.9 + 3.12.0 From 19564f041a2b888746549ad7db47dc7c13029686 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Dec 2021 12:04:39 -0800 Subject: [PATCH 09/32] chore(deps): bump aws-java-sdk from 1.11.704 to 1.12.129 (#452) Bumps [aws-java-sdk](https://github.com/aws/aws-sdk-java) from 1.11.704 to 1.12.129. - [Release notes](https://github.com/aws/aws-sdk-java/releases) - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-java/compare/1.11.704...1.12.129) --- updated-dependencies: - dependency-name: com.amazonaws:aws-java-sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9441b6258..819d2d4bb 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ com.amazonaws aws-java-sdk - 1.11.704 + 1.12.129 true From 53576d7e3e4e6f241bd975b7ffddadcf9f1a7186 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Dec 2021 13:12:15 -0800 Subject: [PATCH 10/32] chore(deps): bump nexus-staging-maven-plugin from 1.6.3 to 1.6.8 (#453) Bumps nexus-staging-maven-plugin from 1.6.3 to 1.6.8. --- updated-dependencies: - dependency-name: org.sonatype.plugins:nexus-staging-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 819d2d4bb..b5b139a48 100644 --- a/pom.xml +++ b/pom.xml @@ -236,7 +236,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.3 + 1.6.8 true sonatype-nexus-staging From 916cd0b43443c61c3dc91be3b904f1c6752b4133 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Dec 2021 13:36:34 -0800 Subject: [PATCH 11/32] chore(deps): bump annotations from 3.0.1 to 3.0.1u2 (#443) Bumps [annotations](https://github.com/findbugsproject/findbugs) from 3.0.1 to 3.0.1u2. - [Release notes](https://github.com/findbugsproject/findbugs/releases) - [Commits](https://github.com/findbugsproject/findbugs/commits) --- updated-dependencies: - dependency-name: com.google.code.findbugs:annotations dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b5b139a48..b53d0d8c1 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ com.google.code.findbugs annotations - 3.0.1 + 3.0.1u2 provided From 7007923eaf59de67897e26f1330e123fa89888e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Dec 2021 15:49:45 -0800 Subject: [PATCH 12/32] chore(deps): bump maven-javadoc-plugin from 3.0.1 to 3.3.1 (#456) Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.0.1 to 3.3.1. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.0.1...maven-javadoc-plugin-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b53d0d8c1..134d0bfef 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.0.1 + 3.3.1 128m 1024m From f579c8b6f1ec022e51a0b6f9ce7179e593cd393c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Dec 2021 16:34:16 -0800 Subject: [PATCH 13/32] chore(deps): bump maven-gpg-plugin from 1.6 to 3.0.1 (#450) Bumps [maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 1.6 to 3.0.1. - [Release notes](https://github.com/apache/maven-gpg-plugin/releases) - [Commits](https://github.com/apache/maven-gpg-plugin/compare/maven-gpg-plugin-1.6...maven-gpg-plugin-3.0.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-gpg-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 134d0bfef..7d348f452 100644 --- a/pom.xml +++ b/pom.xml @@ -179,7 +179,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.0.1 sign-artifacts @@ -215,7 +215,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.0.1 sign-artifacts From a3702710dc9b483524996ccc7c93c7a98fd35da6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Dec 2021 17:16:09 -0800 Subject: [PATCH 14/32] chore(deps): bump maven-surefire-plugin from 2.22.0 to 2.22.2 (#442) Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire) from 2.22.0 to 2.22.2. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-2.22.0...surefire-2.22.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7d348f452..80a48532d 100644 --- a/pom.xml +++ b/pom.xml @@ -257,7 +257,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.0 + 2.22.2 **/AllTestsSuite.java @@ -278,7 +278,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.0 + 2.22.2 **/FastTestsOnlySuite.java From 9342875ad495abcfc7b612db4233588b52504ca4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Dec 2021 17:43:57 -0800 Subject: [PATCH 15/32] chore(deps-dev): bump junit-vintage-engine from 5.7.1 to 5.8.2 (#455) Bumps [junit-vintage-engine](https://github.com/junit-team/junit5) from 5.7.1 to 5.8.2. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.7.1...r5.8.2) --- updated-dependencies: - dependency-name: org.junit.vintage:junit-vintage-engine dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 80a48532d..ddf127ecd 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ org.junit.vintage junit-vintage-engine - 5.7.1 + 5.8.2 test From a251a2240557388c3b0061e00295b6684ff1af6a Mon Sep 17 00:00:00 2001 From: lavaleri <49660121+lavaleri@users.noreply.github.com> Date: Fri, 17 Dec 2021 08:58:40 -0800 Subject: [PATCH 16/32] chore: Upgrade mockito to 4.2.0 (#457) --- pom.xml | 2 +- .../amazonaws/encryptionsdk/kms/KmsMasterKeyProviderTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index ddf127ecd..7187fe9eb 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ org.mockito mockito-core - 2.28.1 + 4.2.0 test diff --git a/src/test/java/com/amazonaws/encryptionsdk/kms/KmsMasterKeyProviderTest.java b/src/test/java/com/amazonaws/encryptionsdk/kms/KmsMasterKeyProviderTest.java index 854ecaa10..2b1a7eae1 100644 --- a/src/test/java/com/amazonaws/encryptionsdk/kms/KmsMasterKeyProviderTest.java +++ b/src/test/java/com/amazonaws/encryptionsdk/kms/KmsMasterKeyProviderTest.java @@ -17,8 +17,8 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import com.amazonaws.AmazonServiceException; @@ -402,7 +402,7 @@ public void testDecrypt() throws Exception { () -> mkp.decryptDataKey(ALGORITHM_SUITE, inputEDKs, ENCRYPTION_CONTEXT)); ArgumentCaptor decrypt = ArgumentCaptor.forClass(DecryptRequest.class); - verifyZeroInteractions(client); + verifyNoInteractions(client); return; } From f9b3df1aaa0cdfddad7bd9158d744e162c872dd9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Dec 2021 14:54:49 -0800 Subject: [PATCH 17/32] chore(deps): bump aws-java-sdk from 1.12.129 to 1.12.131 (#462) Bumps [aws-java-sdk](https://github.com/aws/aws-sdk-java) from 1.12.129 to 1.12.131. - [Release notes](https://github.com/aws/aws-sdk-java/releases) - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.129...1.12.131) --- updated-dependencies: - dependency-name: com.amazonaws:aws-java-sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7187fe9eb..b88842757 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ com.amazonaws aws-java-sdk - 1.12.129 + 1.12.131 true From f93ddad74dab944fc9106f09f99dd259999f0c64 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Feb 2022 16:23:20 -0800 Subject: [PATCH 18/32] chore(deps): bump aws-java-sdk from 1.12.131 to 1.12.150 (#509) Bumps [aws-java-sdk](https://github.com/aws/aws-sdk-java) from 1.12.131 to 1.12.150. - [Release notes](https://github.com/aws/aws-sdk-java/releases) - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.131...1.12.150) --- updated-dependencies: - dependency-name: com.amazonaws:aws-java-sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b88842757..f40d17456 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ com.amazonaws aws-java-sdk - 1.12.131 + 1.12.150 true From cae0fe1c28c90f56af1a2f1ee98332f6a43dc1ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Feb 2022 16:16:49 -0800 Subject: [PATCH 19/32] chore(deps-dev): bump mockito-core from 4.2.0 to 4.3.1 (#503) Bumps [mockito-core](https://github.com/mockito/mockito) from 4.2.0 to 4.3.1. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.2.0...v4.3.1) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f40d17456..8e670d0c2 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ org.mockito mockito-core - 4.2.0 + 4.3.1 test From 8064de716d3d350b71340a51c573cd4f9bd70336 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Feb 2022 17:04:18 -0800 Subject: [PATCH 20/32] chore(deps): bump maven-compiler-plugin from 3.8.1 to 3.9.0 (#482) Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.8.1 to 3.9.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.8.1...maven-compiler-plugin-3.9.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8e670d0c2..9821ccd2e 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.9.0 1.8 1.8 From 2398e07f70093042f6954feb30f99d0628716aac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Feb 2022 17:31:47 -0800 Subject: [PATCH 21/32] chore(deps): bump build-helper-maven-plugin from 3.2.0 to 3.3.0 (#475) Bumps [build-helper-maven-plugin](https://github.com/mojohaus/build-helper-maven-plugin) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/mojohaus/build-helper-maven-plugin/releases) - [Commits](https://github.com/mojohaus/build-helper-maven-plugin/compare/build-helper-maven-plugin-3.2.0...build-helper-maven-plugin-3.3.0) --- updated-dependencies: - dependency-name: org.codehaus.mojo:build-helper-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9821ccd2e..906c156ea 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.2.0 + 3.3.0 add-test-source From edd4633b068c409a17e190fa809a414681c8745e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Feb 2022 09:41:46 -0800 Subject: [PATCH 22/32] chore(deps): bump aws-java-sdk from 1.12.150 to 1.12.151 (#511) Bumps [aws-java-sdk](https://github.com/aws/aws-sdk-java) from 1.12.150 to 1.12.151. - [Release notes](https://github.com/aws/aws-sdk-java/releases) - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.150...1.12.151) --- updated-dependencies: - dependency-name: com.amazonaws:aws-java-sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 906c156ea..c53cc209d 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ com.amazonaws aws-java-sdk - 1.12.150 + 1.12.151 true From ac37804071feeb487133d89f53c2b9a95d7164ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Feb 2022 16:12:46 -0800 Subject: [PATCH 23/32] chore(deps): bump aws-java-sdk from 1.12.151 to 1.12.156 (#522) Bumps [aws-java-sdk](https://github.com/aws/aws-sdk-java) from 1.12.151 to 1.12.156. - [Release notes](https://github.com/aws/aws-sdk-java/releases) - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.151...1.12.156) --- updated-dependencies: - dependency-name: com.amazonaws:aws-java-sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c53cc209d..bef2a1a84 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ com.amazonaws aws-java-sdk - 1.12.151 + 1.12.156 true From 2e03746ad0b2707a1aa3479502ba9de1b3b730cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Feb 2022 09:36:50 -0700 Subject: [PATCH 24/32] chore(deps): bump aws-java-sdk from 1.12.156 to 1.12.162 (#542) Bumps [aws-java-sdk](https://github.com/aws/aws-sdk-java) from 1.12.156 to 1.12.162. - [Release notes](https://github.com/aws/aws-sdk-java/releases) - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.156...1.12.162) --- updated-dependencies: - dependency-name: com.amazonaws:aws-java-sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bef2a1a84..3bd9b242f 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ com.amazonaws aws-java-sdk - 1.12.156 + 1.12.162 true From ad514b2befe7e07bcadee1b32b714313dac0846f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Feb 2022 12:17:40 -0700 Subject: [PATCH 25/32] chore(deps): bump nexus-staging-maven-plugin from 1.6.8 to 1.6.11 (#536) Bumps nexus-staging-maven-plugin from 1.6.8 to 1.6.11. --- updated-dependencies: - dependency-name: org.sonatype.plugins:nexus-staging-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3bd9b242f..4c2cab626 100644 --- a/pom.xml +++ b/pom.xml @@ -236,7 +236,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 + 1.6.11 true sonatype-nexus-staging From 66ecef27ccfec66bca834e154769bb29724f5ddb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Mar 2022 13:44:09 -0600 Subject: [PATCH 26/32] chore(deps): bump nexus-staging-maven-plugin from 1.6.11 to 1.6.12 (#548) Bumps nexus-staging-maven-plugin from 1.6.11 to 1.6.12. --- updated-dependencies: - dependency-name: org.sonatype.plugins:nexus-staging-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4c2cab626..a8d9e86da 100644 --- a/pom.xml +++ b/pom.xml @@ -236,7 +236,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.11 + 1.6.12 true sonatype-nexus-staging From 348fa460c2ffe80f8144f4440bb234e21b1ae7b5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Mar 2022 12:13:44 -0700 Subject: [PATCH 27/32] chore(deps): bump maven-javadoc-plugin from 3.3.1 to 3.3.2 (#530) Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.3.1 to 3.3.2. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.3.1...maven-javadoc-plugin-3.3.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a8d9e86da..6cd506917 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.1 + 3.3.2 128m 1024m From 379d9e7fb397914dcae58d21fe9638e3c01e3a51 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Mar 2022 15:17:28 -0700 Subject: [PATCH 28/32] chore(deps-dev): bump mockito-core from 4.3.1 to 4.4.0 (#574) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [mockito-core](https://github.com/mockito/mockito) from 4.3.1 to 4.4.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.3.1...v4.4.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: José Corella <39066999+josecorella@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6cd506917..c9a3f4ed4 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ org.mockito mockito-core - 4.3.1 + 4.4.0 test From 803c64f894902b03b382e955f5afed62bd22d9db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Corella?= <39066999+josecorella@users.noreply.github.com> Date: Thu, 25 Aug 2022 15:23:44 -0700 Subject: [PATCH 29/32] fix(ci): add correcting signing keys for ci and release process on 1.x (#1027) --- codebuild/ci/release-ci.yml | 6 +++--- codebuild/release/release-prod.yml | 6 +++--- codebuild/release/release-staging.yml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/codebuild/ci/release-ci.yml b/codebuild/ci/release-ci.yml index 2e41ffd91..6c4fe2e7e 100644 --- a/codebuild/ci/release-ci.yml +++ b/codebuild/ci/release-ci.yml @@ -12,8 +12,8 @@ env: parameter-store: ACCOUNT: /CodeBuild/AccountIdentity secrets-manager: - GPG_KEY: Maven-GPG-Keys-Credentials:Keyname - GPG_PASS: Maven-GPG-Keys-Credentials:Passphrase + GPG_KEY: Maven-GPG-Keys-CI-Credentials:Keyname + GPG_PASS: Maven-GPG-Keys-CI-Credentials:Passphrase phases: install: @@ -24,7 +24,7 @@ phases: - export SETTINGS_FILE=$(pwd)/codebuild/release/settings.xml - export CODEARTIFACT_TOKEN=$(aws codeartifact get-authorization-token --domain $DOMAIN --domain-owner $ACCOUNT --query authorizationToken --output text --region ${REGION}) - export CODEARTIFACT_REPO_URL=https://${DOMAIN}-${ACCOUNT}.d.codeartifact.${REGION}.amazonaws.com/maven/${REPOSITORY} - - aws secretsmanager get-secret-value --region us-west-2 --secret-id Maven-GPG-Keys --query SecretBinary --output text | base64 -d > ~/mvn_gpg.tgz + - aws secretsmanager get-secret-value --region us-west-2 --secret-id Maven-GPG-Keys-CI --query SecretBinary --output text | base64 -d > ~/mvn_gpg.tgz - tar -xvf ~/mvn_gpg.tgz -C ~ build: commands: diff --git a/codebuild/release/release-prod.yml b/codebuild/release/release-prod.yml index d97df4778..d67d70122 100644 --- a/codebuild/release/release-prod.yml +++ b/codebuild/release/release-prod.yml @@ -7,8 +7,8 @@ env: variables: BRANCH: "mainline-1.x" secrets-manager: - GPG_KEY: Maven-GPG-Keys-Credentials:Keyname - GPG_PASS: Maven-GPG-Keys-Credentials:Passphrase + GPG_KEY: Maven-GPG-Keys-Release-Credentials:Keyname + GPG_PASS: Maven-GPG-Keys-Release-Credentials:Passphrase SONA_USERNAME: Sonatype-Team-Account:Username SONA_PASSWORD: Sonatype-Team-Account:Password @@ -21,7 +21,7 @@ phases: - git checkout $BRANCH - export VERSION=$(grep version pom.xml | head -n 1 | sed -n 's/[ \t]*\(.*\)<\/version>/\1/p') - export SETTINGS_FILE=$(pwd)/codebuild/release/settings.xml - - aws secretsmanager get-secret-value --region us-west-2 --secret-id Maven-GPG-Keys --query SecretBinary --output text | base64 -d > ~/mvn_gpg.tgz + - aws secretsmanager get-secret-value --region us-west-2 --secret-id Maven-GPG-Keys-Release --query SecretBinary --output text | base64 -d > ~/mvn_gpg.tgz - tar -xvf ~/mvn_gpg.tgz -C ~ build: commands: diff --git a/codebuild/release/release-staging.yml b/codebuild/release/release-staging.yml index 08951c3f5..63fafc424 100644 --- a/codebuild/release/release-staging.yml +++ b/codebuild/release/release-staging.yml @@ -12,8 +12,8 @@ env: parameter-store: ACCOUNT: /CodeBuild/AccountId secrets-manager: - GPG_KEY: Maven-GPG-Keys-Credentials:Keyname - GPG_PASS: Maven-GPG-Keys-Credentials:Passphrase + GPG_KEY: Maven-GPG-Keys-Release-Credentials:Keyname + GPG_PASS: Maven-GPG-Keys-Release-Credentials:Passphrase phases: install: @@ -25,7 +25,7 @@ phases: - export SETTINGS_FILE=$(pwd)/codebuild/release/settings.xml - export CODEARTIFACT_TOKEN=$(aws codeartifact get-authorization-token --domain $DOMAIN --domain-owner $ACCOUNT --query authorizationToken --output text --region ${REGION}) - export CODEARTIFACT_REPO_URL=https://${DOMAIN}-${ACCOUNT}.d.codeartifact.${REGION}.amazonaws.com/maven/${REPOSITORY} - - aws secretsmanager get-secret-value --region us-west-2 --secret-id Maven-GPG-Keys --query SecretBinary --output text | base64 -d > ~/mvn_gpg.tgz + - aws secretsmanager get-secret-value --region us-west-2 --secret-id Maven-GPG-Keys-Release --query SecretBinary --output text | base64 -d > ~/mvn_gpg.tgz - tar -xvf ~/mvn_gpg.tgz -C ~ build: commands: From 8bb7b28c8e277b303f6830f194fd0da351d7985b Mon Sep 17 00:00:00 2001 From: Tony Knapp <5892063+texastony@users.noreply.github.com> Date: Thu, 25 Aug 2022 16:51:35 -0700 Subject: [PATCH 30/32] chore: Mark 1.x as End-of-Support (#1025) --- SUPPORT_POLICY.rst | 33 +++++++++++++++++++ .../amazonaws/encryptionsdk/AwsCrypto.java | 11 +++++++ 2 files changed, 44 insertions(+) create mode 100644 SUPPORT_POLICY.rst diff --git a/SUPPORT_POLICY.rst b/SUPPORT_POLICY.rst new file mode 100644 index 000000000..42dd3c360 --- /dev/null +++ b/SUPPORT_POLICY.rst @@ -0,0 +1,33 @@ +Overview +======== +This page describes the support policy for the AWS Encryption SDK. We regularly provide the AWS Encryption SDK with updates that may contain support for new or updated APIs, new features, enhancements, bug fixes, security patches, or documentation updates. Updates may also address changes with dependencies, language runtimes, and operating systems. + +We recommend users to stay up-to-date with Encryption SDK releases to keep up with the latest features, security updates, and underlying dependencies. Continued use of an unsupported SDK version is not recommended and is done at the user’s discretion + + +Major Version Lifecycle +======================== +The AWS Encryption SDK follows the same major version lifecycle as the AWS SDK. For details on this lifecycle, see `AWS SDKs and Tools Maintenance Policy`_. + +Version Support Matrix +====================== +This table describes the current support status of each major version of the AWS Encryption SDK for Java. It also shows the next status each major version will transition to, and the date at which that transition will happen. + +.. list-table:: + :widths: 30 50 50 50 + :header-rows: 1 + + * - Major version + - Current status + - Next status + - Next status date + * - 1.x + - End of Support + - + - + * - 2.x + - Generally Available + - + - + +.. _AWS SDKs and Tools Maintenance Policy: https://docs.aws.amazon.com/sdkref/latest/guide/maint-policy.html#version-life-cycle diff --git a/src/main/java/com/amazonaws/encryptionsdk/AwsCrypto.java b/src/main/java/com/amazonaws/encryptionsdk/AwsCrypto.java index 7ba6af698..72f5913e3 100644 --- a/src/main/java/com/amazonaws/encryptionsdk/AwsCrypto.java +++ b/src/main/java/com/amazonaws/encryptionsdk/AwsCrypto.java @@ -14,6 +14,7 @@ import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.Map; +import java.util.logging.Logger; /** * Provides the primary entry-point to the AWS Encryption SDK. All encryption and decryption @@ -65,6 +66,7 @@ */ @SuppressWarnings("WeakerAccess") // this is a public API public class AwsCrypto { + private static final Logger LOGGER = Logger.getLogger(AwsCrypto.class.getName()); private static final Map EMPTY_MAP = Collections.emptyMap(); // These are volatile because we allow unsynchronized writes via our setters, @@ -83,6 +85,13 @@ public class AwsCrypto { */ private final int maxEncryptedDataKeys_; + private static void warn_end_of_support() { + LOGGER.warning( + "This major version (1.x) of the AWS Encryption SDK for Java has reached End-of-Support.\n" + + "It will no longer receive security updates or bug fixes.\n" + + "Consider updating to the latest version of the AWS Encryption SDK."); + } + /** * @deprecated This constructor implicitly configures the Aws Crypto client with a commitment * policy that allows reading encrypted messages without commitment values. Use {@link @@ -91,11 +100,13 @@ public class AwsCrypto { */ @Deprecated public AwsCrypto() { + warn_end_of_support(); commitmentPolicy_ = CommitmentPolicy.ForbidEncryptAllowDecrypt; maxEncryptedDataKeys_ = CiphertextHeaders.NO_MAX_ENCRYPTED_DATA_KEYS; } private AwsCrypto(Builder builder) { + warn_end_of_support(); if (builder.commitmentPolicy_ == null) { throw new IllegalArgumentException("Must specify a commitment policy on the client."); } From dfcae5055ec0212f7f4baa759f9c721df54c2b57 Mon Sep 17 00:00:00 2001 From: Tony Knapp <5892063+texastony@users.noreply.github.com> Date: Tue, 30 Aug 2022 09:25:23 -0700 Subject: [PATCH 31/32] fix: correct branch in upload_artifacts (#1031) --- codebuild/release/upload_artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codebuild/release/upload_artifacts.yml b/codebuild/release/upload_artifacts.yml index 0712e2d65..ee39edcd1 100644 --- a/codebuild/release/upload_artifacts.yml +++ b/codebuild/release/upload_artifacts.yml @@ -5,7 +5,7 @@ version: 0.2 env: variables: - BRANCH: "master" + BRANCH: "mainline-1.x" git-credential-helper: yes secrets-manager: GH_TOKEN: Github/aws-crypto-tools-ci-bot:ESDK Release Token From 1e6b1cf07225d56e5c6bc9de9b5167733e2f066e Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 30 Aug 2022 11:06:06 -0700 Subject: [PATCH 32/32] AWS Encryption SDK 1.9.2 Release -- $(date +%Y-%m-%d) ### [1.9.2](https://github.com/josecorella/aws-encryption-sdk-java/compare/v1.9.1...v1.9.2) (2022-08-30) ### Maintenance * Add CODEOWNERS file ([#407](https://github.com/josecorella/aws-encryption-sdk-java/issues/407)) ([cf2c873](https://github.com/josecorella/aws-encryption-sdk-java/commit/cf2c87394b67a487058c854c5b6695067256daff)) * **deps-dev:** bump junit-vintage-engine from 5.7.1 to 5.8.2 ([#455](https://github.com/josecorella/aws-encryption-sdk-java/issues/455)) ([9342875](https://github.com/josecorella/aws-encryption-sdk-java/commit/9342875ad495abcfc7b612db4233588b52504ca4)) * **deps-dev:** bump mockito-core from 4.2.0 to 4.3.1 ([#503](https://github.com/josecorella/aws-encryption-sdk-java/issues/503)) ([cae0fe1](https://github.com/josecorella/aws-encryption-sdk-java/commit/cae0fe1c28c90f56af1a2f1ee98332f6a43dc1ac)) * **deps-dev:** bump mockito-core from 4.3.1 to 4.4.0 ([#574](https://github.com/josecorella/aws-encryption-sdk-java/issues/574)) ([379d9e7](https://github.com/josecorella/aws-encryption-sdk-java/commit/379d9e7fb397914dcae58d21fe9638e3c01e3a51)) * **deps:** bump annotations from 3.0.1 to 3.0.1u2 ([#443](https://github.com/josecorella/aws-encryption-sdk-java/issues/443)) ([916cd0b](https://github.com/josecorella/aws-encryption-sdk-java/commit/916cd0b43443c61c3dc91be3b904f1c6752b4133)) * **deps:** bump aws-java-sdk from 1.11.704 to 1.12.129 ([#452](https://github.com/josecorella/aws-encryption-sdk-java/issues/452)) ([19564f0](https://github.com/josecorella/aws-encryption-sdk-java/commit/19564f041a2b888746549ad7db47dc7c13029686)) * **deps:** bump aws-java-sdk from 1.12.129 to 1.12.131 ([#462](https://github.com/josecorella/aws-encryption-sdk-java/issues/462)) ([f9b3df1](https://github.com/josecorella/aws-encryption-sdk-java/commit/f9b3df1aaa0cdfddad7bd9158d744e162c872dd9)) * **deps:** bump aws-java-sdk from 1.12.131 to 1.12.150 ([#509](https://github.com/josecorella/aws-encryption-sdk-java/issues/509)) ([f93ddad](https://github.com/josecorella/aws-encryption-sdk-java/commit/f93ddad74dab944fc9106f09f99dd259999f0c64)) * **deps:** bump aws-java-sdk from 1.12.150 to 1.12.151 ([#511](https://github.com/josecorella/aws-encryption-sdk-java/issues/511)) ([edd4633](https://github.com/josecorella/aws-encryption-sdk-java/commit/edd4633b068c409a17e190fa809a414681c8745e)) * **deps:** bump aws-java-sdk from 1.12.151 to 1.12.156 ([#522](https://github.com/josecorella/aws-encryption-sdk-java/issues/522)) ([ac37804](https://github.com/josecorella/aws-encryption-sdk-java/commit/ac37804071feeb487133d89f53c2b9a95d7164ef)) * **deps:** bump aws-java-sdk from 1.12.156 to 1.12.162 ([#542](https://github.com/josecorella/aws-encryption-sdk-java/issues/542)) ([2e03746](https://github.com/josecorella/aws-encryption-sdk-java/commit/2e03746ad0b2707a1aa3479502ba9de1b3b730cf)) * **deps:** bump bcprov-ext-jdk15on from 1.67 to 1.70 ([#444](https://github.com/josecorella/aws-encryption-sdk-java/issues/444)) ([e9b190c](https://github.com/josecorella/aws-encryption-sdk-java/commit/e9b190cbb3c865f669ba25dc263c1e86764f5c91)) * **deps:** bump build-helper-maven-plugin from 3.0.0 to 3.2.0 ([#448](https://github.com/josecorella/aws-encryption-sdk-java/issues/448)) ([6f77980](https://github.com/josecorella/aws-encryption-sdk-java/commit/6f77980a8fbd24ae612d51006ab178ea12865296)) * **deps:** bump build-helper-maven-plugin from 3.2.0 to 3.3.0 ([#475](https://github.com/josecorella/aws-encryption-sdk-java/issues/475)) ([2398e07](https://github.com/josecorella/aws-encryption-sdk-java/commit/2398e07f70093042f6954feb30f99d0628716aac)) * **deps:** bump commons-lang3 from 3.9 to 3.12.0 ([#451](https://github.com/josecorella/aws-encryption-sdk-java/issues/451)) ([83d7546](https://github.com/josecorella/aws-encryption-sdk-java/commit/83d7546b9f6e48003ba3d04115ddef1a2f0214f9)) * **deps:** bump fmt-maven-plugin from 2.12 to 2.13 ([#445](https://github.com/josecorella/aws-encryption-sdk-java/issues/445)) ([9dd4ccd](https://github.com/josecorella/aws-encryption-sdk-java/commit/9dd4ccdb311363dfae0b64fa9e829b9ecd2ba80a)) * **deps:** bump maven-compiler-plugin from 3.8.0 to 3.8.1 ([#449](https://github.com/josecorella/aws-encryption-sdk-java/issues/449)) ([625a044](https://github.com/josecorella/aws-encryption-sdk-java/commit/625a044ef64a7bf4789d52ab679cacfe1978f5ae)) * **deps:** bump maven-compiler-plugin from 3.8.1 to 3.9.0 ([#482](https://github.com/josecorella/aws-encryption-sdk-java/issues/482)) ([8064de7](https://github.com/josecorella/aws-encryption-sdk-java/commit/8064de716d3d350b71340a51c573cd4f9bd70336)) * **deps:** bump maven-gpg-plugin from 1.6 to 3.0.1 ([#450](https://github.com/josecorella/aws-encryption-sdk-java/issues/450)) ([f579c8b](https://github.com/josecorella/aws-encryption-sdk-java/commit/f579c8b6f1ec022e51a0b6f9ce7179e593cd393c)) * **deps:** bump maven-javadoc-plugin from 3.0.1 to 3.3.1 ([#456](https://github.com/josecorella/aws-encryption-sdk-java/issues/456)) ([7007923](https://github.com/josecorella/aws-encryption-sdk-java/commit/7007923eaf59de67897e26f1330e123fa89888e0)) * **deps:** bump maven-javadoc-plugin from 3.3.1 to 3.3.2 ([#530](https://github.com/josecorella/aws-encryption-sdk-java/issues/530)) ([348fa46](https://github.com/josecorella/aws-encryption-sdk-java/commit/348fa460c2ffe80f8144f4440bb234e21b1ae7b5)) * **deps:** bump maven-surefire-plugin from 2.22.0 to 2.22.2 ([#442](https://github.com/josecorella/aws-encryption-sdk-java/issues/442)) ([a370271](https://github.com/josecorella/aws-encryption-sdk-java/commit/a3702710dc9b483524996ccc7c93c7a98fd35da6)) * **deps:** bump nexus-staging-maven-plugin from 1.6.11 to 1.6.12 ([#548](https://github.com/josecorella/aws-encryption-sdk-java/issues/548)) ([66ecef2](https://github.com/josecorella/aws-encryption-sdk-java/commit/66ecef27ccfec66bca834e154769bb29724f5ddb)) * **deps:** bump nexus-staging-maven-plugin from 1.6.3 to 1.6.8 ([#453](https://github.com/josecorella/aws-encryption-sdk-java/issues/453)) ([53576d7](https://github.com/josecorella/aws-encryption-sdk-java/commit/53576d7e3e4e6f241bd975b7ffddadcf9f1a7186)) * **deps:** bump nexus-staging-maven-plugin from 1.6.8 to 1.6.11 ([#536](https://github.com/josecorella/aws-encryption-sdk-java/issues/536)) ([ad514b2](https://github.com/josecorella/aws-encryption-sdk-java/commit/ad514b2befe7e07bcadee1b32b714313dac0846f)) * Mark 1.x as End-of-Support ([#1025](https://github.com/josecorella/aws-encryption-sdk-java/issues/1025)) ([8bb7b28](https://github.com/josecorella/aws-encryption-sdk-java/commit/8bb7b28c8e277b303f6830f194fd0da351d7985b)) * update mainline-1.x cd ([#413](https://github.com/josecorella/aws-encryption-sdk-java/issues/413)) ([dfefa62](https://github.com/josecorella/aws-encryption-sdk-java/commit/dfefa62833027d619d76322904dfe724cdee7e40)) * Upgrade mockito to 4.2.0 ([#457](https://github.com/josecorella/aws-encryption-sdk-java/issues/457)) ([a251a22](https://github.com/josecorella/aws-encryption-sdk-java/commit/a251a2240557388c3b0061e00295b6684ff1af6a)) ### Fixes * **ci:** add correcting signing keys for ci and release process on 1.x ([#1027](https://github.com/josecorella/aws-encryption-sdk-java/issues/1027)) ([803c64f](https://github.com/josecorella/aws-encryption-sdk-java/commit/803c64f894902b03b382e955f5afed62bd22d9db)) * correct branch in upload_artifacts ([#1031](https://github.com/josecorella/aws-encryption-sdk-java/issues/1031)) ([dfcae50](https://github.com/josecorella/aws-encryption-sdk-java/commit/dfcae5055ec0212f7f4baa759f9c721df54c2b57)) --- CHANGELOG.md | 40 ++++++++++++++++++++++++++++++++++++++++ pom.xml | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d6e1f5e9..f6583e06c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,45 @@ # Changelog +### [1.9.2](https://github.com/josecorella/aws-encryption-sdk-java/compare/v1.9.1...v1.9.2) (2022-08-30) + + +### Maintenance + +* Add CODEOWNERS file ([#407](https://github.com/josecorella/aws-encryption-sdk-java/issues/407)) ([cf2c873](https://github.com/josecorella/aws-encryption-sdk-java/commit/cf2c87394b67a487058c854c5b6695067256daff)) +* **deps-dev:** bump junit-vintage-engine from 5.7.1 to 5.8.2 ([#455](https://github.com/josecorella/aws-encryption-sdk-java/issues/455)) ([9342875](https://github.com/josecorella/aws-encryption-sdk-java/commit/9342875ad495abcfc7b612db4233588b52504ca4)) +* **deps-dev:** bump mockito-core from 4.2.0 to 4.3.1 ([#503](https://github.com/josecorella/aws-encryption-sdk-java/issues/503)) ([cae0fe1](https://github.com/josecorella/aws-encryption-sdk-java/commit/cae0fe1c28c90f56af1a2f1ee98332f6a43dc1ac)) +* **deps-dev:** bump mockito-core from 4.3.1 to 4.4.0 ([#574](https://github.com/josecorella/aws-encryption-sdk-java/issues/574)) ([379d9e7](https://github.com/josecorella/aws-encryption-sdk-java/commit/379d9e7fb397914dcae58d21fe9638e3c01e3a51)) +* **deps:** bump annotations from 3.0.1 to 3.0.1u2 ([#443](https://github.com/josecorella/aws-encryption-sdk-java/issues/443)) ([916cd0b](https://github.com/josecorella/aws-encryption-sdk-java/commit/916cd0b43443c61c3dc91be3b904f1c6752b4133)) +* **deps:** bump aws-java-sdk from 1.11.704 to 1.12.129 ([#452](https://github.com/josecorella/aws-encryption-sdk-java/issues/452)) ([19564f0](https://github.com/josecorella/aws-encryption-sdk-java/commit/19564f041a2b888746549ad7db47dc7c13029686)) +* **deps:** bump aws-java-sdk from 1.12.129 to 1.12.131 ([#462](https://github.com/josecorella/aws-encryption-sdk-java/issues/462)) ([f9b3df1](https://github.com/josecorella/aws-encryption-sdk-java/commit/f9b3df1aaa0cdfddad7bd9158d744e162c872dd9)) +* **deps:** bump aws-java-sdk from 1.12.131 to 1.12.150 ([#509](https://github.com/josecorella/aws-encryption-sdk-java/issues/509)) ([f93ddad](https://github.com/josecorella/aws-encryption-sdk-java/commit/f93ddad74dab944fc9106f09f99dd259999f0c64)) +* **deps:** bump aws-java-sdk from 1.12.150 to 1.12.151 ([#511](https://github.com/josecorella/aws-encryption-sdk-java/issues/511)) ([edd4633](https://github.com/josecorella/aws-encryption-sdk-java/commit/edd4633b068c409a17e190fa809a414681c8745e)) +* **deps:** bump aws-java-sdk from 1.12.151 to 1.12.156 ([#522](https://github.com/josecorella/aws-encryption-sdk-java/issues/522)) ([ac37804](https://github.com/josecorella/aws-encryption-sdk-java/commit/ac37804071feeb487133d89f53c2b9a95d7164ef)) +* **deps:** bump aws-java-sdk from 1.12.156 to 1.12.162 ([#542](https://github.com/josecorella/aws-encryption-sdk-java/issues/542)) ([2e03746](https://github.com/josecorella/aws-encryption-sdk-java/commit/2e03746ad0b2707a1aa3479502ba9de1b3b730cf)) +* **deps:** bump bcprov-ext-jdk15on from 1.67 to 1.70 ([#444](https://github.com/josecorella/aws-encryption-sdk-java/issues/444)) ([e9b190c](https://github.com/josecorella/aws-encryption-sdk-java/commit/e9b190cbb3c865f669ba25dc263c1e86764f5c91)) +* **deps:** bump build-helper-maven-plugin from 3.0.0 to 3.2.0 ([#448](https://github.com/josecorella/aws-encryption-sdk-java/issues/448)) ([6f77980](https://github.com/josecorella/aws-encryption-sdk-java/commit/6f77980a8fbd24ae612d51006ab178ea12865296)) +* **deps:** bump build-helper-maven-plugin from 3.2.0 to 3.3.0 ([#475](https://github.com/josecorella/aws-encryption-sdk-java/issues/475)) ([2398e07](https://github.com/josecorella/aws-encryption-sdk-java/commit/2398e07f70093042f6954feb30f99d0628716aac)) +* **deps:** bump commons-lang3 from 3.9 to 3.12.0 ([#451](https://github.com/josecorella/aws-encryption-sdk-java/issues/451)) ([83d7546](https://github.com/josecorella/aws-encryption-sdk-java/commit/83d7546b9f6e48003ba3d04115ddef1a2f0214f9)) +* **deps:** bump fmt-maven-plugin from 2.12 to 2.13 ([#445](https://github.com/josecorella/aws-encryption-sdk-java/issues/445)) ([9dd4ccd](https://github.com/josecorella/aws-encryption-sdk-java/commit/9dd4ccdb311363dfae0b64fa9e829b9ecd2ba80a)) +* **deps:** bump maven-compiler-plugin from 3.8.0 to 3.8.1 ([#449](https://github.com/josecorella/aws-encryption-sdk-java/issues/449)) ([625a044](https://github.com/josecorella/aws-encryption-sdk-java/commit/625a044ef64a7bf4789d52ab679cacfe1978f5ae)) +* **deps:** bump maven-compiler-plugin from 3.8.1 to 3.9.0 ([#482](https://github.com/josecorella/aws-encryption-sdk-java/issues/482)) ([8064de7](https://github.com/josecorella/aws-encryption-sdk-java/commit/8064de716d3d350b71340a51c573cd4f9bd70336)) +* **deps:** bump maven-gpg-plugin from 1.6 to 3.0.1 ([#450](https://github.com/josecorella/aws-encryption-sdk-java/issues/450)) ([f579c8b](https://github.com/josecorella/aws-encryption-sdk-java/commit/f579c8b6f1ec022e51a0b6f9ce7179e593cd393c)) +* **deps:** bump maven-javadoc-plugin from 3.0.1 to 3.3.1 ([#456](https://github.com/josecorella/aws-encryption-sdk-java/issues/456)) ([7007923](https://github.com/josecorella/aws-encryption-sdk-java/commit/7007923eaf59de67897e26f1330e123fa89888e0)) +* **deps:** bump maven-javadoc-plugin from 3.3.1 to 3.3.2 ([#530](https://github.com/josecorella/aws-encryption-sdk-java/issues/530)) ([348fa46](https://github.com/josecorella/aws-encryption-sdk-java/commit/348fa460c2ffe80f8144f4440bb234e21b1ae7b5)) +* **deps:** bump maven-surefire-plugin from 2.22.0 to 2.22.2 ([#442](https://github.com/josecorella/aws-encryption-sdk-java/issues/442)) ([a370271](https://github.com/josecorella/aws-encryption-sdk-java/commit/a3702710dc9b483524996ccc7c93c7a98fd35da6)) +* **deps:** bump nexus-staging-maven-plugin from 1.6.11 to 1.6.12 ([#548](https://github.com/josecorella/aws-encryption-sdk-java/issues/548)) ([66ecef2](https://github.com/josecorella/aws-encryption-sdk-java/commit/66ecef27ccfec66bca834e154769bb29724f5ddb)) +* **deps:** bump nexus-staging-maven-plugin from 1.6.3 to 1.6.8 ([#453](https://github.com/josecorella/aws-encryption-sdk-java/issues/453)) ([53576d7](https://github.com/josecorella/aws-encryption-sdk-java/commit/53576d7e3e4e6f241bd975b7ffddadcf9f1a7186)) +* **deps:** bump nexus-staging-maven-plugin from 1.6.8 to 1.6.11 ([#536](https://github.com/josecorella/aws-encryption-sdk-java/issues/536)) ([ad514b2](https://github.com/josecorella/aws-encryption-sdk-java/commit/ad514b2befe7e07bcadee1b32b714313dac0846f)) +* Mark 1.x as End-of-Support ([#1025](https://github.com/josecorella/aws-encryption-sdk-java/issues/1025)) ([8bb7b28](https://github.com/josecorella/aws-encryption-sdk-java/commit/8bb7b28c8e277b303f6830f194fd0da351d7985b)) +* update mainline-1.x cd ([#413](https://github.com/josecorella/aws-encryption-sdk-java/issues/413)) ([dfefa62](https://github.com/josecorella/aws-encryption-sdk-java/commit/dfefa62833027d619d76322904dfe724cdee7e40)) +* Upgrade mockito to 4.2.0 ([#457](https://github.com/josecorella/aws-encryption-sdk-java/issues/457)) ([a251a22](https://github.com/josecorella/aws-encryption-sdk-java/commit/a251a2240557388c3b0061e00295b6684ff1af6a)) + + +### Fixes + +* **ci:** add correcting signing keys for ci and release process on 1.x ([#1027](https://github.com/josecorella/aws-encryption-sdk-java/issues/1027)) ([803c64f](https://github.com/josecorella/aws-encryption-sdk-java/commit/803c64f894902b03b382e955f5afed62bd22d9db)) +* correct branch in upload_artifacts ([#1031](https://github.com/josecorella/aws-encryption-sdk-java/issues/1031)) ([dfcae50](https://github.com/josecorella/aws-encryption-sdk-java/commit/dfcae5055ec0212f7f4baa759f9c721df54c2b57)) + ### [1.9.1](https://github.com/aws/aws-encryption-sdk-java/compare/v1.9.0...v1.9.1) (2021-10-28) diff --git a/pom.xml b/pom.xml index c9a3f4ed4..babeb0b33 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.amazonaws aws-encryption-sdk-java - 1.9.1 + 1.9.2 jar aws-encryption-sdk-java