From 20fafe0aea9f5b8224a21ce9befad79376f74c5d Mon Sep 17 00:00:00 2001
From: Benjamin Prud'homme <bprudhomme@gradcenter.cuny.edu>
Date: Wed, 16 Oct 2024 19:16:10 -0400
Subject: [PATCH 1/3] Upgrade to Java 21

---
 hazelcast-parent/pom.xml                             | 12 ++++++------
 .../console/testjob-with-hazelcast-codebase/pom.xml  |  2 +-
 .../console/testjob-with-jet-bootstrap/pom.xml       |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hazelcast-parent/pom.xml b/hazelcast-parent/pom.xml
index 546cfa985b410..43b5ef74e12d7 100644
--- a/hazelcast-parent/pom.xml
+++ b/hazelcast-parent/pom.xml
@@ -64,7 +64,7 @@
     </licenses>
 
     <properties>
-        <jdk.version>17</jdk.version>
+        <jdk.version>21</jdk.version>
         <hazelcast.module.name>com.hazelcast.core</hazelcast.module.name>
         <relocation.root>com.hazelcast.shaded</relocation.root>
         <relocation.dir>com/hazelcast/shaded</relocation.dir>
@@ -89,7 +89,7 @@
         <new.debezium.version>2.7.3.Final</new.debezium.version>
         <grpc.version>1.66.0</grpc.version>
         <hadoop.version>3.4.0</hadoop.version>
-        <jackson.mapper.asl.version>1.9.14.jdk17-redhat-00001</jackson.mapper.asl.version>
+        <jackson.mapper.asl.version>2.18.0</jackson.mapper.asl.version>
         <jline.version>3.27.0</jline.version>
         <jms.api.version>3.1.0</jms.api.version>
         <json-surfer.version>0.12</json-surfer.version>
@@ -490,13 +490,13 @@
                 <version>4.13.2</version>
             </dependency>
             <dependency>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-mapper-asl</artifactId>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
                 <version>${jackson.mapper.asl.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-core-asl</artifactId>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-core</artifactId>
                 <version>${jackson.mapper.asl.version}</version>
             </dependency>
             <dependency>
diff --git a/hazelcast/src/test/resources/com/hazelcast/client/console/testjob-with-hazelcast-codebase/pom.xml b/hazelcast/src/test/resources/com/hazelcast/client/console/testjob-with-hazelcast-codebase/pom.xml
index d2167a8808f46..7b40a94d53ff8 100644
--- a/hazelcast/src/test/resources/com/hazelcast/client/console/testjob-with-hazelcast-codebase/pom.xml
+++ b/hazelcast/src/test/resources/com/hazelcast/client/console/testjob-with-hazelcast-codebase/pom.xml
@@ -35,7 +35,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <release>17</release>
+                    <release>21</release>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/hazelcast/src/test/resources/com/hazelcast/client/console/testjob-with-jet-bootstrap/pom.xml b/hazelcast/src/test/resources/com/hazelcast/client/console/testjob-with-jet-bootstrap/pom.xml
index 1bea385382bc8..64838809def6d 100644
--- a/hazelcast/src/test/resources/com/hazelcast/client/console/testjob-with-jet-bootstrap/pom.xml
+++ b/hazelcast/src/test/resources/com/hazelcast/client/console/testjob-with-jet-bootstrap/pom.xml
@@ -35,7 +35,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <release>17</release>
+                    <release>21</release>
                 </configuration>
             </plugin>
 

From 3c0fb26598e9f4e8602d9e547ba8e43a1d59f50d Mon Sep 17 00:00:00 2001
From: Benjamin Prud'homme <139664105+bgprudhomme@users.noreply.github.com>
Date: Wed, 16 Oct 2024 19:30:53 -0400
Subject: [PATCH 2/3] Update codeql-analysis.yml

---
 .github/workflows/codeql-analysis.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 744cf163b6dda..b46e11a5a9116 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -31,6 +31,12 @@ jobs:
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
 
     steps:
+    - name: Set up JDK 21
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: '21'
+        
     - name: Checkout repository
       uses: actions/checkout@v4
       with:

From acfaa9efc652c57063b71d0cede4a4708fe8a770 Mon Sep 17 00:00:00 2001
From: Benjamin Prud'homme <139664105+bgprudhomme@users.noreply.github.com>
Date: Mon, 4 Nov 2024 14:35:19 -0500
Subject: [PATCH 3/3] Update README.md

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index c9c568a243108..e1a1649658c63 100755
--- a/README.md
+++ b/README.md
@@ -131,6 +131,9 @@ When developing a PR it is sufficient to run your new tests and some
 related subset of tests locally. Our PR builder will take care of running
 the full test suite.
 
+## Additional JMH tests (in java21_jmh_additional and fibers_jmh_additional)
+To run the JMH benchmarks, it works to run `mvn clean package -DskipTests` from the root directory, followed by `mvn exec:exec@run-benchmarks` from the hazelcast directory.
+
 ## License
 
 Source code in this repository is covered by one of two licenses: