From 9ca1763a33375b34e0abcb42cdbc5e23263552fd Mon Sep 17 00:00:00 2001 From: rishav-karanjit Date: Thu, 15 Jan 2026 11:18:36 -0800 Subject: [PATCH 1/8] m --- .github/workflows/run-codebuild-ci.yml | 6 +++++- codebuild/corretto.yml | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 codebuild/corretto.yml diff --git a/.github/workflows/run-codebuild-ci.yml b/.github/workflows/run-codebuild-ci.yml index d581ce27..c3d307d4 100644 --- a/.github/workflows/run-codebuild-ci.yml +++ b/.github/workflows/run-codebuild-ci.yml @@ -49,5 +49,9 @@ jobs: timeout-minutes: 60 with: project-name: java-ddb-ec - buildspec-override: codebuild/${{ matrix.platform.distribution }}${{ matrix.version }}.yml + buildspec-override: codebuild/corretto.yml image-override: ${{ matrix.platform.image }} + env-vars-for-codebuild: | + JAVA_VERSION + env: + JAVA_VERSION: ${{ matrix.version }} diff --git a/codebuild/corretto.yml b/codebuild/corretto.yml new file mode 100644 index 00000000..547d0640 --- /dev/null +++ b/codebuild/corretto.yml @@ -0,0 +1,9 @@ +version: 0.2 + +phases: + install: + runtime-versions: + java: corretto$JAVA_VERSION + build: + commands: + - mvn install From f3b285b9912960b7e74231df1ec7a59013ab3560 Mon Sep 17 00:00:00 2001 From: rishav-karanjit Date: Thu, 15 Jan 2026 11:23:10 -0800 Subject: [PATCH 2/8] m --- codebuild/corretto11.yml | 9 --------- codebuild/corretto8.yml | 9 --------- codebuild/openjdk11.yml | 9 --------- codebuild/openjdk8.yml | 9 --------- 4 files changed, 36 deletions(-) delete mode 100644 codebuild/corretto11.yml delete mode 100644 codebuild/corretto8.yml delete mode 100644 codebuild/openjdk11.yml delete mode 100644 codebuild/openjdk8.yml diff --git a/codebuild/corretto11.yml b/codebuild/corretto11.yml deleted file mode 100644 index 6c394676..00000000 --- a/codebuild/corretto11.yml +++ /dev/null @@ -1,9 +0,0 @@ -version: 0.2 - -phases: - install: - runtime-versions: - java: corretto11 - build: - commands: - - mvn install diff --git a/codebuild/corretto8.yml b/codebuild/corretto8.yml deleted file mode 100644 index 3c14db6e..00000000 --- a/codebuild/corretto8.yml +++ /dev/null @@ -1,9 +0,0 @@ -version: 0.2 - -phases: - install: - runtime-versions: - java: corretto8 - build: - commands: - - mvn install diff --git a/codebuild/openjdk11.yml b/codebuild/openjdk11.yml deleted file mode 100644 index 9e184d25..00000000 --- a/codebuild/openjdk11.yml +++ /dev/null @@ -1,9 +0,0 @@ -version: 0.2 - -phases: - install: - runtime-versions: - java: openjdk11 - build: - commands: - - mvn install diff --git a/codebuild/openjdk8.yml b/codebuild/openjdk8.yml deleted file mode 100644 index 2157de50..00000000 --- a/codebuild/openjdk8.yml +++ /dev/null @@ -1,9 +0,0 @@ -version: 0.2 - -phases: - install: - runtime-versions: - java: openjdk8 - build: - commands: - - mvn install From 09ccbf3d15788e0654074bbe02969980e14e6a69 Mon Sep 17 00:00:00 2001 From: rishav-karanjit Date: Thu, 15 Jan 2026 11:27:41 -0800 Subject: [PATCH 3/8] m --- .github/workflows/run-codebuild-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-codebuild-ci.yml b/.github/workflows/run-codebuild-ci.yml index c3d307d4..d777a0f6 100644 --- a/.github/workflows/run-codebuild-ci.yml +++ b/.github/workflows/run-codebuild-ci.yml @@ -36,7 +36,7 @@ jobs: platform: - distribution: corretto image: "aws/codebuild/standard:7.0" - version: [ 8, 11 ] + version: [ 8, 11, 17, 21 ] steps: - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v3 From 65be139004a78259085e4fb5bc6bde4815aac374 Mon Sep 17 00:00:00 2001 From: rishav-karanjit Date: Thu, 15 Jan 2026 12:12:50 -0800 Subject: [PATCH 4/8] m --- sdk1/pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sdk1/pom.xml b/sdk1/pom.xml index 26db9089..e9fa3d7d 100644 --- a/sdk1/pom.xml +++ b/sdk1/pom.xml @@ -260,6 +260,13 @@ 4.13.2 test + + + org.mockito + mockito-inline + 4.11.0 + test + From 91cb8a3577eb21c4d6ddac9a9b890d0ef05e2397 Mon Sep 17 00:00:00 2001 From: rishav-karanjit Date: Thu, 15 Jan 2026 12:19:12 -0800 Subject: [PATCH 5/8] m --- sdk1/pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sdk1/pom.xml b/sdk1/pom.xml index e9fa3d7d..c6ae38a0 100644 --- a/sdk1/pom.xml +++ b/sdk1/pom.xml @@ -153,6 +153,12 @@ pom import + + org.mockito + mockito-core + 4.11.0 + test + @@ -261,6 +267,12 @@ test + + org.mockito + mockito-core + test + + org.mockito mockito-inline From 6a1f58d2b845c3f205e48a2e9d1aaf74bfbe069e Mon Sep 17 00:00:00 2001 From: rishav-karanjit Date: Thu, 15 Jan 2026 13:29:04 -0800 Subject: [PATCH 6/8] m --- .../services/dynamodbv2/datamodeling/internal/TTLCacheTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk1/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/internal/TTLCacheTest.java b/sdk1/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/internal/TTLCacheTest.java index 5bb7bcb7..2dc3ea88 100644 --- a/sdk1/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/internal/TTLCacheTest.java +++ b/sdk1/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/internal/TTLCacheTest.java @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 package com.amazonaws.services.dynamodbv2.datamodeling.internal; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; From 60ecb529a0d9ecfe7133577094c7d00a298f06df Mon Sep 17 00:00:00 2001 From: rishav-karanjit Date: Thu, 15 Jan 2026 14:29:15 -0800 Subject: [PATCH 7/8] m --- sdk1/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk1/pom.xml b/sdk1/pom.xml index c6ae38a0..d280a9ac 100644 --- a/sdk1/pom.xml +++ b/sdk1/pom.xml @@ -156,7 +156,7 @@ org.mockito mockito-core - 4.11.0 + 5.14.2 test @@ -276,7 +276,7 @@ org.mockito mockito-inline - 4.11.0 + 5.2.0 test From c16839644f681a8a6414914868067bece29c4dde Mon Sep 17 00:00:00 2001 From: rishav-karanjit Date: Thu, 15 Jan 2026 14:35:51 -0800 Subject: [PATCH 8/8] m --- sdk1/pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sdk1/pom.xml b/sdk1/pom.xml index d280a9ac..d6e81977 100644 --- a/sdk1/pom.xml +++ b/sdk1/pom.xml @@ -156,7 +156,7 @@ org.mockito mockito-core - 5.14.2 + 4.11.0 test @@ -276,7 +276,7 @@ org.mockito mockito-inline - 5.2.0 + 4.11.0 test @@ -352,6 +352,7 @@ ${maven-surefire-plugin.version} false + -Dnet.bytebuddy.experimental=true **/Test*.java **/*Test.java