From 25e9d6ab6a972c83c93749be77096931256dcb97 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Thu, 30 Sep 2021 15:10:15 -0700 Subject: [PATCH 1/8] chore: update releaserc to include pom.xml files --- .releaserc | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/.releaserc b/.releaserc index 21b024b2b..afbf8fbf8 100644 --- a/.releaserc +++ b/.releaserc @@ -9,16 +9,21 @@ "presetConfig": { "types": [ {"type": "feat", "section": "Features"}, - {"type": "fix", "section": "Bug Fixes"}, + {"type": "fix", "section": "Fixes"}, {"type": "chore", "section": "Maintenance"}, {"type": "docs", "section": "Maintenance"}, - {"type": "revert", "section": "Bug Fixes"}, + {"type": "revert", "section": "Fixes"}, {"type": "style", "hidden": true}, {"type": "refactor", "hidden": true}, {"type": "perf", "hidden": true}, {"type": "test", "hidden": true} ] - } + }, + "releaseRules": [ + {"type": "docs", "release": "patch"}, + {"type": "revert", "release": "patch"}, + {"type": "chore", "release": "patch"} + ] }], ["@semantic-release/release-notes-generator", { "preset": "conventionalcommits", @@ -28,10 +33,10 @@ "presetConfig": { "types": [ {"type": "feat", "section": "Features"}, - {"type": "fix", "section": "Bug Fixes"}, + {"type": "fix", "section": "Fixes"}, {"type": "chore", "section": "Maintenance"}, {"type": "docs", "section": "Maintenance"}, - {"type": "revert", "section": "Bug Fixes"}, + {"type": "revert", "section": "Fixes"}, {"type": "style", "hidden": true}, {"type": "refactor", "hidden": true}, {"type": "perf", "hidden": true}, @@ -42,8 +47,12 @@ ["@semantic-release/changelog", { "changelogFile": "./CHANGELOG.md" }], + ["@semantic-release/exec", { + "prepareCmd": "mvn versions:set -DnewVersion=${nextRelease/version} \ + -DautoVersionSubmodules=true" + }] ["@semantic-release/git", { - "assets": ["./CHANGELOG.md"], + "assets": ["./CHANGELOG.md", "./pom.xml"], "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}" }], "@semantic-release/github" From ebb3082b1a6a97f7ea3b95a846d51ab05997f40b Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Thu, 30 Sep 2021 15:43:53 -0700 Subject: [PATCH 2/8] chore: update gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 8e92eb021..9dd07bd0c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ target/ ## semantic-release package-lock.json node_modules/ +pom.xml.versionsBackup From 21528a411f747c775503433855a72fe3938d8a88 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Tue, 5 Oct 2021 12:24:25 -0700 Subject: [PATCH 3/8] chore: fixing typo --- .releaserc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.releaserc b/.releaserc index afbf8fbf8..95e4a5409 100644 --- a/.releaserc +++ b/.releaserc @@ -48,7 +48,7 @@ "changelogFile": "./CHANGELOG.md" }], ["@semantic-release/exec", { - "prepareCmd": "mvn versions:set -DnewVersion=${nextRelease/version} \ + "prepareCmd": "mvn versions:set -DnewVersion=${nextRelease.version} \ -DautoVersionSubmodules=true" }] ["@semantic-release/git", { From 9d1c6dd893b8c9de01d1f07fb73694a7a23c9402 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Thu, 14 Oct 2021 01:01:22 -0700 Subject: [PATCH 4/8] chore: updating releaserc to include updating readme and modifying gitignore 'date +%Y-%m-%d' --- .gitignore | 1 + .releaserc | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 9dd07bd0c..da3861280 100644 --- a/.gitignore +++ b/.gitignore @@ -12,5 +12,6 @@ target/ ## semantic-release package-lock.json +package.json node_modules/ pom.xml.versionsBackup diff --git a/.releaserc b/.releaserc index 95e4a5409..211d20ea6 100644 --- a/.releaserc +++ b/.releaserc @@ -1,3 +1,5 @@ +## Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. +## SPDX-License-Identifier: Apache-2.0 { "branches": ["master"], "plugins": [ @@ -49,13 +51,14 @@ }], ["@semantic-release/exec", { "prepareCmd": "mvn versions:set -DnewVersion=${nextRelease.version} \ - -DautoVersionSubmodules=true" - }] + -DautoVersionSubmodules=true && find README.md -type f \ + -exec sed -i '' 's/.*<\\/version>/${nextRelease.version}<\\/version>/g' {} \\;" + }], ["@semantic-release/git", { - "assets": ["./CHANGELOG.md", "./pom.xml"], - "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}" + "assets": ["./CHANGELOG.md", "./pom.xml", "./README.md"], + "message": "AWS Encryption SDK ${nextRelease.version} Release -- 'date +"%Y-%m-%d"' \n\n${nextRelease.notes}" }], - "@semantic-release/github" + #@semantic-release/github" ], - "repositoryUrl": "https://github.com/josecorella/test-semantic-release-pr", + "repositoryUrl": "https://github.com/aws/aws-encryption-sdk-java", } From 952d682a01782a67df96f08207d404d62dfd7d2f Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Thu, 14 Oct 2021 10:30:09 -0700 Subject: [PATCH 5/8] chore: fixing date command 2021-10-14 --- .releaserc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.releaserc b/.releaserc index 211d20ea6..7e3755f2e 100644 --- a/.releaserc +++ b/.releaserc @@ -56,7 +56,7 @@ }], ["@semantic-release/git", { "assets": ["./CHANGELOG.md", "./pom.xml", "./README.md"], - "message": "AWS Encryption SDK ${nextRelease.version} Release -- 'date +"%Y-%m-%d"' \n\n${nextRelease.notes}" + "message": "AWS Encryption SDK ${nextRelease.version} Release -- `date +"%Y-%m-%d"` \n\n${nextRelease.notes}" }], #@semantic-release/github" ], From 003567598d4fd393abaeb1c34513c9fcbe93f9b2 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Thu, 14 Oct 2021 11:15:34 -0700 Subject: [PATCH 6/8] chore: make sure title stays at the top --- .releaserc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.releaserc b/.releaserc index 7e3755f2e..184cd62f5 100644 --- a/.releaserc +++ b/.releaserc @@ -47,7 +47,8 @@ } }], ["@semantic-release/changelog", { - "changelogFile": "./CHANGELOG.md" + "changelogFile": "./CHANGELOG.md", + "changelogTitle": "Changelog" }], ["@semantic-release/exec", { "prepareCmd": "mvn versions:set -DnewVersion=${nextRelease.version} \ From baf461b763213d43a36e8033738c384797208d9f Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Thu, 14 Oct 2021 11:54:14 -0700 Subject: [PATCH 7/8] chore: changlog title now stays on top of file --- .releaserc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.releaserc b/.releaserc index 184cd62f5..b03c40cdc 100644 --- a/.releaserc +++ b/.releaserc @@ -48,7 +48,7 @@ }], ["@semantic-release/changelog", { "changelogFile": "./CHANGELOG.md", - "changelogTitle": "Changelog" + "changelogTitle": "# Changelog" }], ["@semantic-release/exec", { "prepareCmd": "mvn versions:set -DnewVersion=${nextRelease.version} \ @@ -57,7 +57,7 @@ }], ["@semantic-release/git", { "assets": ["./CHANGELOG.md", "./pom.xml", "./README.md"], - "message": "AWS Encryption SDK ${nextRelease.version} Release -- `date +"%Y-%m-%d"` \n\n${nextRelease.notes}" + "message": "AWS Encryption SDK ${nextRelease.version} Release \n\n${nextRelease.notes}" }], #@semantic-release/github" ], From 2b3d315f839f58b32a2d252e3a48ab34099c8e07 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Thu, 14 Oct 2021 12:48:49 -0700 Subject: [PATCH 8/8] chore: reformatting changelog to fit new style --- CHANGELOG.md | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62b8b78e5..9678bf084 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 2.3.3 -- 2021-08-26 +### 2.3.3 -- 2021-08-26 ### Maintenance @@ -23,7 +23,7 @@ * CI: Compilation with OpenJDK11 and validation with other JDKs ([#293](https://github.com/aws/aws-encryption-sdk-java/pull/293)) -## 2.3.2 -- 2021-07-20 +### 2.3.2 -- 2021-07-20 ### Maintenance @@ -47,11 +47,11 @@ * chore: Add support policy ([#274](https://github.com/aws/aws-encryption-sdk-java/pull/274)) -## 2.3.1 -- 2021-06-29 +### 2.3.1 -- 2021-06-29 * fix: read project properties from package's own ClassLoader [(PR #269)](https://github.com/aws/aws-encryption-sdk-java/pull/269) -## 2.3.0 -- 2021-06-16 +### 2.3.0 -- 2021-06-16 * feat: AWS KMS multi-Region Key support @@ -66,14 +66,14 @@ for more details about how the AWS Encryption SDK interoperates with AWS KMS multi-Region keys. -## 2.2.0 -- 2021-05-27 +### 2.2.0 -- 2021-05-27 * feat: Improvements to the message decryption process. See https://github.com/aws/aws-encryption-sdk-java/security/advisories/GHSA-55xh-53m6-936r -## 2.0.0 -- 2020-09-24 +### 2.0.0 -- 2020-09-24 * feat!: Updates to the AWS Encryption SDK. 4678ffa @@ -84,11 +84,11 @@ Key committing suites are now default. CommitmentPolicy requires commitment by d See: https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/migration.html -## 1.7.0 -- 2020-09-24 +### 1.7.0 -- 2020-09-24 * feat: Updates to the AWS Encryption SDK. a6be12a -## 1.6.2 -- 2020-05-26 +### 1.6.2 -- 2020-05-26 ### Patches * Validate final frame length does not exceed the frame size in the message header [PR #166](https://github.com/aws/aws-encryption-sdk-java/pull/166) @@ -98,7 +98,7 @@ See: https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/migration * Update AWS Java SDK version from 1.11.561 to 1.11.704. [PR #186](https://github.com/aws/aws-encryption-sdk-java/pull/186) * Upgrade Bouncy Castle from 1.61 to 1.65 [PR #179](https://github.com/aws/aws-encryption-sdk-java/pull/179) -## 1.6.1 -- 2019-10-29 +### 1.6.1 -- 2019-10-29 ### Deprecation Warnings * Deprecated `AwsCrypto.encryptString()` and `AwsCrypto.decryptString()`. @@ -121,7 +121,7 @@ See: https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/migration [#131](https://github.com/aws/aws-encryption-sdk-java/pull/131), and [#132](https://github.com/aws/aws-encryption-sdk-java/pull/132). -## 1.6.0 -- 2019-05-31 +### 1.6.0 -- 2019-05-31 ### Minor Changes * Remove dependency on Apache Commons Codec 1.12. @@ -129,7 +129,7 @@ See: https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/migration * Introduce and use utility methods for Base64 encoding/decoding so that switching the codec provider needs to be done only in one place next time. -## 1.5.0 -- 2019-05-30 +### 1.5.0 -- 2019-05-30 ### Minor Changes * Added dependency on Apache Commons Codec 1.12. @@ -142,12 +142,12 @@ See: https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/migration * Upgrade Mockito from 2.23.4 to 2.28.1. * Upgrade Apache Commons Lang from 3.4 to 3.9. -## 1.4.1 -- 2019-05-10 +### 1.4.1 -- 2019-05-10 ### Patches * Cast ByteBuffer to Buffer prior to using some methods so that it works properly in Java 8. -## 1.4.0 -- 2019-05-10 +### 1.4.0 -- 2019-05-10 ### Minor Changes * Increased BouncyCastle dependency version to 1.61 @@ -156,7 +156,7 @@ See: https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/migration ### Maintenance * Increased Mockito test dependency version to 2.23.4 -## 1.3.6 -- 2018-12-10 +### 1.3.6 -- 2018-12-10 ### Patches * Fixed typos in Exception messages (excryption -> encryption) #78 @@ -168,7 +168,7 @@ See: https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/migration * Added JML specs in #72 * Ensure that KeyBlob treats field lengths as unsigned shorts #71 -## 1.3.5 +### 1.3.5 ### Minor Changes @@ -178,7 +178,7 @@ See: https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/migration region not servicable by that MKP, the exception will now be thrown on first use of the MK, rather than at getMasterKey time. -## 1.3.4 +### 1.3.4 ### Minor Changes @@ -186,7 +186,7 @@ use of the MK, rather than at getMasterKey time. decrypting certain malformed ciphertexts. This may reduce performance slightly in some scenarios. -## 1.3.3 +### 1.3.3 ### Minor Changes * Move the `aws-encryption-sdk-java` repository from `awslabs` to `aws`. @@ -194,7 +194,7 @@ in some scenarios. * Make `JceMasterKey` case insensitive * Fix bare aliases not using default region -## 1.3.2 +### 1.3.2 ### Minor Changes * Frame size restriction removed again @@ -202,7 +202,7 @@ in some scenarios. * Fix estimateCipherText when used with cached data keys * Do not automatically set a default region in KmsMasterKeyProvider -## 1.3.1 +### 1.3.1 ### Minor changes @@ -210,7 +210,7 @@ in some scenarios. This restriction was relaxed in 1.3.0, but due to compatibility concerns we'll put this restriction back in for the time being. -## 1.3.0 +### 1.3.0 ### Major changes