From 03fe33ee0b9022453a1afca1375a33ef98b98f02 Mon Sep 17 00:00:00 2001
From: Robert Lu <robert.lyb@alibaba-inc.com>
Date: Tue, 20 Feb 2024 06:58:15 -0600
Subject: [PATCH] Support run test at jdk21 (#3344)

Adjust the test logic, build with jdk17, and run with jdk21 (and the original 8, 11, 17)
---
 .github/workflows/ci.yml              |  2 +-
 .github/workflows/codeql-analysis.yml |  1 +
 pom.xml                               | 14 ++++++++++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 71fafc00..8c2758c8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11, 17]
+        java: [8, 11, 17, 21]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index cb5cc7b1..00d0bbea 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -53,6 +53,7 @@ jobs:
       with:
         java-version: 17
         distribution: 'temurin'
+        cache: 'maven'
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
diff --git a/pom.xml b/pom.xml
index 23596e56..7cc01ca7 100755
--- a/pom.xml
+++ b/pom.xml
@@ -46,10 +46,10 @@
 
         <!-- Test libs -->
         <junit.version>4.12</junit.version>
-        <mockito.version>3.12.4</mockito.version>
+        <mockito.version>4.11.0</mockito.version>
+        <byte-buddy.version>1.14.10</byte-buddy.version>
         <assertj.version>3.12.1</assertj.version>
         <awaitility.version>3.1.5</awaitility.version>
-        <powermock.version>2.0.0</powermock.version>
 
         <!-- Build -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -195,6 +195,16 @@
                 <version>${mockito.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${byte-buddy.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy-agent</artifactId>
+                <version>${byte-buddy.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.assertj</groupId>
                 <artifactId>assertj-core</artifactId>