From 11981c4fa7746195cea0c6b0f1a30205fc09950e Mon Sep 17 00:00:00 2001
From: Tony Knapp <tonyknap@amazon.com>
Date: Wed, 30 Jun 2021 13:28:21 -0700
Subject: [PATCH 01/12] ci(CodeBuild): Create release builds that validate on
 all support JDKs

---
 codebuild/release/release-prod.yml     | 88 ++++++++++++++++++++++++
 codebuild/release/release-staging.yml  | 92 ++++++++++++++++++++++++++
 codebuild/release/settings.xml         | 31 +++++++++
 codebuild/release/validate-prod.yml    | 15 +++++
 codebuild/release/validate-staging.yml | 32 +++++++++
 5 files changed, 258 insertions(+)
 create mode 100644 codebuild/release/release-prod.yml
 create mode 100644 codebuild/release/release-staging.yml
 create mode 100644 codebuild/release/settings.xml
 create mode 100644 codebuild/release/validate-prod.yml
 create mode 100644 codebuild/release/validate-staging.yml

diff --git a/codebuild/release/release-prod.yml b/codebuild/release/release-prod.yml
new file mode 100644
index 00000000..22d53c7b
--- /dev/null
+++ b/codebuild/release/release-prod.yml
@@ -0,0 +1,88 @@
+version: 0.2
+# 'release-prod' is an AWS::CodeBuild::Project that Releases from CodeArtifact to Sonatype and then validates the release with 'validate-prod'
+# Command to trigger this codebuild from an authorized command line.
+#  aws codebuild start-build-batch \
+#  --region us-west-2 \
+#  --project-name java-ddb-ec-release \
+#  --environment-variables-override name=VERSION,value=<INSERT_VERSION>,type=PLAINTEXT name=COMMIT_ID,value=<INSERT_COMMIT_ID>,type=PLAINTEXT"
+# TODO: Create Project java-ddb-ec-release
+
+env:
+  secrets-manager:
+    GPG_KEY: Maven-GPG-Keys-Credentials:Keyname
+    GPG_PASS: Maven-GPG-Keys-Credentials:Passphrase
+    SONA_USERNAME: Sonatype-Team-Account:Username 
+    SONA_PASSWORD: Sonatype-Team-Account:Password
+
+phases:
+  install:
+    runtime-versions:
+      java: openjdk8
+  pre_build:
+    commands:
+      - git checkout $COMMIT_ID
+      - FOUND_VERSION=$(grep version pom.xml | head -n 2 | sed -n 's/[ \t]*<version>\(.*\)<\/version>/\1/p')
+      - |
+        if expr ${FOUND_VERSION} != ${VERSION}; then
+          echo "pom.xml version (${FOUND_VERSION}) does not match expected version (${VERSION}), stopping"
+          exit 1;
+        fi
+      - 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
+      - tar -xvf ~/mvn_gpg.tgz -C ~
+  build:
+    commands:
+      - |
+        mvn deploy \
+          -Ppublishing \
+          -Pfast-tests-only \
+          -DperformRelease \
+          -Dgpg.homedir="$HOME/mvn_gpg" \
+          -DautoReleaseAfterClose=true \
+          -Dgpg.keyname="$GPG_KEY" \
+          -Dgpg.passphrase="$GPG_PASS" \
+          -Dsonatype.username="$SONA_USERNAME" \
+          -Dsonatype.password="$SONA_PASSWORD" \
+          -s $SETTINGS_FILE
+
+
+batch:
+  fast-fail: false
+  build-graph:
+    - identifier: release_to_prod
+    - identifier: validate_prod_release_openjdk8
+      depend-on:
+        - release_to_prod
+      buildspec: codebuild/release/validate-prod.yml
+      env:
+        variables:
+          JAVA_ENV_VERSION: openjdk8
+          JAVA_NUMERIC_VERSION: 8
+        image: aws/codebuild/standard:3.0
+    - identifier: validate_prod_release_openjdk11
+      depend-on:
+        - release_to_prod
+      buildspec: codebuild/release/validate-prod.yml
+      env:
+        variables:
+          JAVA_ENV_VERSION: openjdk11
+          JAVA_NUMERIC_VERSION: 11
+        image: aws/codebuild/standard:3.0
+    - identifier: validate_prod_release_corretto8
+      depend-on:
+        - release_to_prod
+      buildspec: codebuild/release/validate-prod.yml
+      env:
+        variables:
+          JAVA_ENV_VERSION: corretto8
+          JAVA_NUMERIC_VERSION: 8
+        image: aws/codebuild/amazonlinux2-x86_64-standard:3.0
+    - identifier: validate_prod_release_corretto11
+      depend-on:
+        - release_to_prod
+      buildspec: codebuild/release/validate-prod.yml
+      env:
+        variables:
+          JAVA_ENV_VERSION: corretto11
+          JAVA_NUMERIC_VERSION: 11
+        image: aws/codebuild/amazonlinux2-x86_64-standard:3.0
diff --git a/codebuild/release/release-staging.yml b/codebuild/release/release-staging.yml
new file mode 100644
index 00000000..15bb52b5
--- /dev/null
+++ b/codebuild/release/release-staging.yml
@@ -0,0 +1,92 @@
+version: 0.2
+# 'release-staging' is an AWS::CodeBuild::Project that Stages a release on CodeArtifact and validates the staging using 'validate-staging'
+# Command to trigger this codebuild from an authorized command line.
+# aws codebuild start-build-batch \
+#         --region us-west-2 \
+#         --project-name java-ddbec-test-release \
+#         --environment-variables-override name=VERSION,value=<INSERT_VERSION>,type=PLAINTEXT name=COMMIT_ID,value=<INSERT_COMMIT_ID>,type=PLAINTEXT
+
+env:
+  variables:
+    REGION: us-east-1
+    DOMAIN: crypto-tools-internal
+    REPOSITORY: java-ddbec-staging
+  parameter-store:
+    ACCOUNT: /CodeBuild/AccountId
+  secrets-manager:
+    GPG_KEY: Maven-GPG-Keys-Credentials:Keyname
+    GPG_PASS: Maven-GPG-Keys-Credentials:Passphrase
+
+phases:
+  install:
+    runtime-versions:
+      java: openjdk8
+  pre_build:
+    commands:
+      - git checkout $COMMIT_ID
+      - FOUND_VERSION=$(grep version pom.xml | head -n 2 | sed -n 's/[ \t]*<version>\(.*\)<\/version>/\1/p')
+      - |
+        if expr ${FOUND_VERSION} != ${VERSION}; then
+          echo "pom.xml version (${FOUND_VERSION}) does not match expected version (${VERSION}), stopping"
+          exit 1;
+        fi
+      - 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
+      - tar -xvf ~/mvn_gpg.tgz -C ~
+  build:
+    commands:
+      - |
+        mvn deploy \
+          -PpublishingCodeArtifact \
+          -Pfast-tests-only \
+          -DperformRelease \
+          -Dgpg.homedir="$HOME/mvn_gpg" \
+          -DautoReleaseAfterClose=true \
+          -Dgpg.keyname="$GPG_KEY" \
+          -Dgpg.passphrase="$GPG_PASS" \
+          -Dcodeartifact.token=$CODEARTIFACT_TOKEN \
+          -DaltDeploymentRepository=codeartifact::default::$CODEARTIFACT_REPO_URL \
+          -s $SETTINGS_FILE
+
+batch:
+  fast-fail: false
+  build-graph:
+    - identifier: release_to_staging
+    - identifier: validate_staging_release_openjdk8
+      depend-on:
+        - release_to_staging
+      buildspec: codebuild/release/validate-staging.yml
+      env:
+        variables:
+          JAVA_ENV_VERSION: openjdk8
+          JAVA_NUMERIC_VERSION: 8
+        image: aws/codebuild/standard:3.0
+    - identifier: validate_staging_release_openjdk11
+      depend-on:
+        - release_to_staging
+      buildspec: codebuild/release/validate-staging.yml
+      env:
+        variables:
+          JAVA_ENV_VERSION: openjdk11
+          JAVA_NUMERIC_VERSION: 11
+        image: aws/codebuild/standard:3.0
+    - identifier: validate_staging_release_corretto8
+      depend-on:
+        - release_to_staging
+      buildspec: codebuild/release/validate-staging.yml
+      env:
+        variables:
+          JAVA_ENV_VERSION: corretto8
+          JAVA_NUMERIC_VERSION: 8
+        image: aws/codebuild/amazonlinux2-x86_64-standard:3.0
+    - identifier: validate_staging_release_corretto11
+      depend-on:
+        - release_to_staging
+      buildspec: codebuild/release/validate-staging.yml
+      env:
+        variables:
+          JAVA_ENV_VERSION: corretto11
+          JAVA_NUMERIC_VERSION: 11
+        image: aws/codebuild/amazonlinux2-x86_64-standard:3.0
diff --git a/codebuild/release/settings.xml b/codebuild/release/settings.xml
new file mode 100644
index 00000000..19587de0
--- /dev/null
+++ b/codebuild/release/settings.xml
@@ -0,0 +1,31 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                                  http://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <servers>
+    <server>
+      <id>codeartifact</id>
+      <username>aws</username>
+      <password>${codeartifact.token}</password>
+    </server>
+    <server>
+      <id>sonatype-nexus-staging</id>
+      <username>${sonatype.username}</username>
+      <password>${sonatype.password}</password>
+    </server>
+  </servers>
+
+  <profiles>
+    <profile>
+      <id>codeartifact</id>
+      <repositories>
+        <repository>
+          <id>codeartifact</id>
+          <name>codeartifact</name>
+          <url>${codeartifact.url}</url> <!-- passed via command line to avoid hardcoding it here -->
+        </repository>
+      </repositories>
+    </profile>
+  </profiles>
+
+</settings>
diff --git a/codebuild/release/validate-prod.yml b/codebuild/release/validate-prod.yml
new file mode 100644
index 00000000..46dd4886
--- /dev/null
+++ b/codebuild/release/validate-prod.yml
@@ -0,0 +1,15 @@
+version: 0.2
+# 'validate-staging' is an AWS::CodeBuild::Project that validates a Sonatype release
+
+phases:
+  install:
+    runtime-versions:
+      java: $JAVA_ENV_VERSION
+  build:
+    commands:
+      - |
+        mvn verify \
+          -Dcheckstyle.skip \
+          -Desdk.version=$VERSION \
+          -Dmaven.compiler.target=$JAVA_NUMERIC_VERSION \
+          -Dmaven.compiler.source=$JAVA_NUMERIC_VERSION
diff --git a/codebuild/release/validate-staging.yml b/codebuild/release/validate-staging.yml
new file mode 100644
index 00000000..d61a5201
--- /dev/null
+++ b/codebuild/release/validate-staging.yml
@@ -0,0 +1,32 @@
+version: 0.2
+# 'validate-staging' is an AWS::CodeBuild::Project that validates a CodeArtifact staging before a sonatype release
+
+env:
+  variables:
+    REGION: us-east-1
+    DOMAIN: crypto-tools-internal
+    REPOSITORY: java-ddbec-staging
+  parameter-store:
+    ACCOUNT: /CodeBuild/AccountId
+
+phases:
+    runtime-versions:
+      java: $JAVA_ENV_VERSION
+  pre_build:
+    commands:
+      - 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}
+  build:
+    commands:
+      - |
+        mvn verify \
+          -Pcodeartifact \
+          -Dcheckstyle.skip \
+          -Desdk.version=$VERSION \
+          -Dmaven.compiler.target=$JAVA_NUMERIC_VERSION \
+          -Dmaven.compiler.source=$JAVA_NUMERIC_VERSION \
+          -Dcodeartifact.token=$CODEARTIFACT_TOKEN \
+          -Dcodeartifact.url=$CODEARTIFACT_REPO_URL \
+          -s $SETTINGS_FILE
+

From 2bf366da9e21ddf4fa39696a87ca7d589613f30b Mon Sep 17 00:00:00 2001
From: Tony Knapp <tonyknap@amazon.com>
Date: Wed, 30 Jun 2021 13:33:21 -0700
Subject: [PATCH 02/12] fix: drop TODO

---
 codebuild/release/release-prod.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/codebuild/release/release-prod.yml b/codebuild/release/release-prod.yml
index 22d53c7b..b8574b06 100644
--- a/codebuild/release/release-prod.yml
+++ b/codebuild/release/release-prod.yml
@@ -5,7 +5,6 @@ version: 0.2
 #  --region us-west-2 \
 #  --project-name java-ddb-ec-release \
 #  --environment-variables-override name=VERSION,value=<INSERT_VERSION>,type=PLAINTEXT name=COMMIT_ID,value=<INSERT_COMMIT_ID>,type=PLAINTEXT"
-# TODO: Create Project java-ddb-ec-release
 
 env:
   secrets-manager:

From 12f587be6a61b384c8bfc8fe96e695dd25d70d77 Mon Sep 17 00:00:00 2001
From: Tony Knapp <5892063+texastony@users.noreply.github.com>
Date: Wed, 30 Jun 2021 15:09:43 -0700
Subject: [PATCH 03/12] fix: typo

---
 codebuild/release/validate-prod.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/codebuild/release/validate-prod.yml b/codebuild/release/validate-prod.yml
index 46dd4886..b91837b8 100644
--- a/codebuild/release/validate-prod.yml
+++ b/codebuild/release/validate-prod.yml
@@ -1,5 +1,5 @@
 version: 0.2
-# 'validate-staging' is an AWS::CodeBuild::Project that validates a Sonatype release
+# 'validate-prod' is an AWS::CodeBuild::Project that validates a Sonatype release
 
 phases:
   install:

From a00e837ab395cb22efd33848e9f6905476b74185 Mon Sep 17 00:00:00 2001
From: Tony Knapp <5892063+texastony@users.noreply.github.com>
Date: Wed, 30 Jun 2021 16:20:51 -0700
Subject: [PATCH 04/12] fix: typo

---
 codebuild/release/release-staging.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/codebuild/release/release-staging.yml b/codebuild/release/release-staging.yml
index 15bb52b5..e9cdf0ef 100644
--- a/codebuild/release/release-staging.yml
+++ b/codebuild/release/release-staging.yml
@@ -3,7 +3,7 @@ version: 0.2
 # Command to trigger this codebuild from an authorized command line.
 # aws codebuild start-build-batch \
 #         --region us-west-2 \
-#         --project-name java-ddbec-test-release \
+#         --project-name java-ddb-ec-test-release \
 #         --environment-variables-override name=VERSION,value=<INSERT_VERSION>,type=PLAINTEXT name=COMMIT_ID,value=<INSERT_COMMIT_ID>,type=PLAINTEXT
 
 env:

From ced1740f90af71d4cd3ac4fcd0917a8adddf8172 Mon Sep 17 00:00:00 2001
From: Tony Knapp <tonyknap@amazon.com>
Date: Thu, 15 Jul 2021 13:50:21 -0700
Subject: [PATCH 05/12] ci(examples): enable specifying Java version and DDBEC
 version

---
 examples/pom.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/examples/pom.xml b/examples/pom.xml
index ed2d7775..fd7bc487 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -21,13 +21,16 @@
         <sqlite4java.version>1.0.392</sqlite4java.version>
         <maven-failsafe-plugin.version>3.0.0-M3</maven-failsafe-plugin.version>
         <maven-surefire-plugin.version>3.0.0-M3</maven-surefire-plugin.version>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <ddbec.version>2.0.1</ddbec.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-dynamodb-encryption-java</artifactId>
-            <version>2.0.1</version>
+            <version>${ddbec.version}</version>
         </dependency>
 
         <dependency>

From cc7605efd1ed2cd954b5fd27fe4aec5f3d8d4c52 Mon Sep 17 00:00:00 2001
From: Tony Knapp <tonyknap@amazon.com>
Date: Thu, 15 Jul 2021 13:51:16 -0700
Subject: [PATCH 06/12] ci(codebuild): correct version grep

---
 codebuild/release/release-prod.yml    | 4 ++--
 codebuild/release/release-staging.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/codebuild/release/release-prod.yml b/codebuild/release/release-prod.yml
index b8574b06..bc7fbac8 100644
--- a/codebuild/release/release-prod.yml
+++ b/codebuild/release/release-prod.yml
@@ -1,5 +1,5 @@
 version: 0.2
-# 'release-prod' is an AWS::CodeBuild::Project that Releases from CodeArtifact to Sonatype and then validates the release with 'validate-prod'
+# 'release-prod' is an AWS::CodeBuild::Project that Releases to Sonatype and then validates the release with 'validate-prod'
 # Command to trigger this codebuild from an authorized command line.
 #  aws codebuild start-build-batch \
 #  --region us-west-2 \
@@ -20,7 +20,7 @@ phases:
   pre_build:
     commands:
       - git checkout $COMMIT_ID
-      - FOUND_VERSION=$(grep version pom.xml | head -n 2 | sed -n 's/[ \t]*<version>\(.*\)<\/version>/\1/p')
+      - FOUND_VERSION=$(grep version sdk1/pom.xml | head -n 2 | sed -n 's/[ \t]*<version>\(.*\)<\/version>/\1/p')
       - |
         if expr ${FOUND_VERSION} != ${VERSION}; then
           echo "pom.xml version (${FOUND_VERSION}) does not match expected version (${VERSION}), stopping"
diff --git a/codebuild/release/release-staging.yml b/codebuild/release/release-staging.yml
index e9cdf0ef..1987cffb 100644
--- a/codebuild/release/release-staging.yml
+++ b/codebuild/release/release-staging.yml
@@ -24,7 +24,7 @@ phases:
   pre_build:
     commands:
       - git checkout $COMMIT_ID
-      - FOUND_VERSION=$(grep version pom.xml | head -n 2 | sed -n 's/[ \t]*<version>\(.*\)<\/version>/\1/p')
+      - FOUND_VERSION=$(grep version sdk1/pom.xml | head -n 2 | sed -n 's/[ \t]*<version>\(.*\)<\/version>/\1/p')
       - |
         if expr ${FOUND_VERSION} != ${VERSION}; then
           echo "pom.xml version (${FOUND_VERSION}) does not match expected version (${VERSION}), stopping"

From c289b0c0f35479cd08fef81f4653fe21242dcc0c Mon Sep 17 00:00:00 2001
From: Tony Knapp <tonyknap@amazon.com>
Date: Thu, 15 Jul 2021 13:53:30 -0700
Subject: [PATCH 07/12] ci(codebuild): pass ddbec version and validate against
 examples instead of all tests

---
 codebuild/release/validate-prod.yml    | 7 +++++--
 codebuild/release/validate-staging.yml | 6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/codebuild/release/validate-prod.yml b/codebuild/release/validate-prod.yml
index b91837b8..7d649169 100644
--- a/codebuild/release/validate-prod.yml
+++ b/codebuild/release/validate-prod.yml
@@ -1,15 +1,18 @@
 version: 0.2
-# 'validate-prod' is an AWS::CodeBuild::Project that validates a Sonatype release
+# 'validate-prod' is an AWS::CodeBuild::Project that validates a Sonatype release against the examples
 
 phases:
   install:
     runtime-versions:
       java: $JAVA_ENV_VERSION
+  pre_build:
+    commands:
+      - cd examples
   build:
     commands:
       - |
         mvn verify \
           -Dcheckstyle.skip \
-          -Desdk.version=$VERSION \
+          -Dddbec.version=$VERSION \
           -Dmaven.compiler.target=$JAVA_NUMERIC_VERSION \
           -Dmaven.compiler.source=$JAVA_NUMERIC_VERSION
diff --git a/codebuild/release/validate-staging.yml b/codebuild/release/validate-staging.yml
index d61a5201..bc1f7e7c 100644
--- a/codebuild/release/validate-staging.yml
+++ b/codebuild/release/validate-staging.yml
@@ -1,5 +1,5 @@
 version: 0.2
-# 'validate-staging' is an AWS::CodeBuild::Project that validates a CodeArtifact staging before a sonatype release
+# 'validate-staging' is an AWS::CodeBuild::Project that validates artifacts from CodeArtifact against the examples
 
 env:
   variables:
@@ -17,16 +17,16 @@ 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}
+      - cd examples
   build:
     commands:
       - |
         mvn verify \
           -Pcodeartifact \
           -Dcheckstyle.skip \
-          -Desdk.version=$VERSION \
+          -Dddbec.version=$VERSION \
           -Dmaven.compiler.target=$JAVA_NUMERIC_VERSION \
           -Dmaven.compiler.source=$JAVA_NUMERIC_VERSION \
           -Dcodeartifact.token=$CODEARTIFACT_TOKEN \
           -Dcodeartifact.url=$CODEARTIFACT_REPO_URL \
           -s $SETTINGS_FILE
-

From 5e89c833fc8e5132cd4c9d7399d036fe2ce300a8 Mon Sep 17 00:00:00 2001
From: Tony Knapp <5892063+texastony@users.noreply.github.com>
Date: Thu, 15 Jul 2021 15:35:58 -0700
Subject: [PATCH 08/12] fix: members of codebuild/ are buildSpecs, not projects

---
 codebuild/release/release-prod.yml     | 2 +-
 codebuild/release/release-staging.yml  | 2 +-
 codebuild/release/validate-prod.yml    | 2 +-
 codebuild/release/validate-staging.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/codebuild/release/release-prod.yml b/codebuild/release/release-prod.yml
index bc7fbac8..05f01a4f 100644
--- a/codebuild/release/release-prod.yml
+++ b/codebuild/release/release-prod.yml
@@ -1,5 +1,5 @@
 version: 0.2
-# 'release-prod' is an AWS::CodeBuild::Project that Releases to Sonatype and then validates the release with 'validate-prod'
+# 'release-prod' is an AWS::CodeBuild::BuildSpec that Releases to Sonatype and then validates the release with 'validate-prod'
 # Command to trigger this codebuild from an authorized command line.
 #  aws codebuild start-build-batch \
 #  --region us-west-2 \
diff --git a/codebuild/release/release-staging.yml b/codebuild/release/release-staging.yml
index 1987cffb..7dbff813 100644
--- a/codebuild/release/release-staging.yml
+++ b/codebuild/release/release-staging.yml
@@ -1,5 +1,5 @@
 version: 0.2
-# 'release-staging' is an AWS::CodeBuild::Project that Stages a release on CodeArtifact and validates the staging using 'validate-staging'
+# 'release-staging' is an AWS::CodeBuild::BuildSpec that Stages a release on CodeArtifact and validates the staging using 'validate-staging'
 # Command to trigger this codebuild from an authorized command line.
 # aws codebuild start-build-batch \
 #         --region us-west-2 \
diff --git a/codebuild/release/validate-prod.yml b/codebuild/release/validate-prod.yml
index 7d649169..b43a2638 100644
--- a/codebuild/release/validate-prod.yml
+++ b/codebuild/release/validate-prod.yml
@@ -1,5 +1,5 @@
 version: 0.2
-# 'validate-prod' is an AWS::CodeBuild::Project that validates a Sonatype release against the examples
+# 'validate-prod' is an AWS::CodeBuild::BuildSpec that validates a Sonatype release against the examples
 
 phases:
   install:
diff --git a/codebuild/release/validate-staging.yml b/codebuild/release/validate-staging.yml
index bc1f7e7c..d992497a 100644
--- a/codebuild/release/validate-staging.yml
+++ b/codebuild/release/validate-staging.yml
@@ -1,5 +1,5 @@
 version: 0.2
-# 'validate-staging' is an AWS::CodeBuild::Project that validates artifacts from CodeArtifact against the examples
+# 'validate-staging' is an AWS::CodeBuild::BuildSpec that validates artifacts from CodeArtifact against the examples
 
 env:
   variables:

From 03f929fe8febccddc4977e4a2af594828284064a Mon Sep 17 00:00:00 2001
From: Tony Knapp <tonyknap@amazon.com>
Date: Thu, 15 Jul 2021 15:54:43 -0700
Subject: [PATCH 09/12] ci(pom): eliminate redundant/conflicting compiler
 source & target variables

---
 examples/pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/examples/pom.xml b/examples/pom.xml
index fd7bc487..4f8bc3c9 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -94,10 +94,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.0</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
             </plugin>
 
             <plugin>

From 7f3f51edd611057b73a31c8c40418279b371abe5 Mon Sep 17 00:00:00 2001
From: Tony Knapp <tonyknap@amazon.com>
Date: Tue, 20 Jul 2021 10:38:49 -0700
Subject: [PATCH 10/12] ci(CodeBuild): remove missing test target

---
 codebuild/release/release-prod.yml    | 1 -
 codebuild/release/release-staging.yml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/codebuild/release/release-prod.yml b/codebuild/release/release-prod.yml
index 05f01a4f..bc25225b 100644
--- a/codebuild/release/release-prod.yml
+++ b/codebuild/release/release-prod.yml
@@ -34,7 +34,6 @@ phases:
       - |
         mvn deploy \
           -Ppublishing \
-          -Pfast-tests-only \
           -DperformRelease \
           -Dgpg.homedir="$HOME/mvn_gpg" \
           -DautoReleaseAfterClose=true \
diff --git a/codebuild/release/release-staging.yml b/codebuild/release/release-staging.yml
index 7dbff813..be1f68e2 100644
--- a/codebuild/release/release-staging.yml
+++ b/codebuild/release/release-staging.yml
@@ -40,7 +40,6 @@ phases:
       - |
         mvn deploy \
           -PpublishingCodeArtifact \
-          -Pfast-tests-only \
           -DperformRelease \
           -Dgpg.homedir="$HOME/mvn_gpg" \
           -DautoReleaseAfterClose=true \

From 606d70ce88e334815183246faab269c53739f6ef Mon Sep 17 00:00:00 2001
From: Tony Knapp <tonyknap@amazon.com>
Date: Tue, 20 Jul 2021 16:40:47 -0700
Subject: [PATCH 11/12] infra: correct yaml spacing error

---
 codebuild/release/validate-staging.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/codebuild/release/validate-staging.yml b/codebuild/release/validate-staging.yml
index d992497a..7544e2d0 100644
--- a/codebuild/release/validate-staging.yml
+++ b/codebuild/release/validate-staging.yml
@@ -10,8 +10,8 @@ env:
     ACCOUNT: /CodeBuild/AccountId
 
 phases:
-    runtime-versions:
-      java: $JAVA_ENV_VERSION
+  runtime-versions:
+    java: $JAVA_ENV_VERSION
   pre_build:
     commands:
       - export SETTINGS_FILE=$(pwd)/codebuild/release/settings.xml

From a0ae62c1a195f3bf964c3e8629c4e4c17f065bc3 Mon Sep 17 00:00:00 2001
From: Tony Knapp <tonyknap@amazon.com>
Date: Tue, 20 Jul 2021 16:53:09 -0700
Subject: [PATCH 12/12] ci: correct install phase

---
 codebuild/release/validate-staging.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/codebuild/release/validate-staging.yml b/codebuild/release/validate-staging.yml
index 7544e2d0..f967acf5 100644
--- a/codebuild/release/validate-staging.yml
+++ b/codebuild/release/validate-staging.yml
@@ -10,8 +10,11 @@ env:
     ACCOUNT: /CodeBuild/AccountId
 
 phases:
-  runtime-versions:
-    java: $JAVA_ENV_VERSION
+  install:
+    commands:
+      - pip install awscli
+    runtime-versions:
+      java: $JAVA_ENV_VERSION
   pre_build:
     commands:
       - export SETTINGS_FILE=$(pwd)/codebuild/release/settings.xml