Migrate to JDK 21

chetangudisagar · chetangudisagar · commit 608910a2c51a · 2025-04-09T00:48:56.000-07:00
diff --git a/.github/workflows/publish-universe-artifacts.yml b/.github/workflows/publish-universe-artifacts.yml
@@ -26,7 +26,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'corretto'
-          java-version: '17'
+          java-version: '21'
           check-latest: true
           cache-dependency-path: '**/pom.xml'
 
diff --git a/.github/workflows/pull_request_benchmarks.yml b/.github/workflows/pull_request_benchmarks.yml
@@ -22,7 +22,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'corretto'
-        java-version: '17'
+        java-version: '21'
         check-latest: true
         cache-dependency-path: '**/pom.xml'
 
diff --git a/.github/workflows/pull_request_universe.yml b/.github/workflows/pull_request_universe.yml
@@ -23,7 +23,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'corretto'
-        java-version: '17'
+        java-version: '21'
         check-latest: true
         cache-dependency-path: '**/pom.xml'
 
diff --git a/.github/workflows/run_benchmarks.yml b/.github/workflows/run_benchmarks.yml
@@ -25,7 +25,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'corretto'
-          java-version: '17'
+          java-version: '21'
           check-latest: true
           cache-dependency-path: '**/pom.xml'
 
diff --git a/benchmarks/Dockerfile b/benchmarks/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-jdk-bullseye
+FROM openjdk:21-bullseye
 
 RUN apt-get update && apt-get install -y iputils-ping
 
diff --git a/cloud/corfu/corfu-client-example/Dockerfile b/cloud/corfu/corfu-client-example/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-jdk-alpine3.8
+FROM openjdk:21-bullseye
 
 ADD ./build/libs/corfu-runtime-client-example.jar /app/
 
diff --git a/cloud/infrastructure/kibana/kibana-tools/Dockerfile b/cloud/infrastructure/kibana/kibana-tools/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-jdk-alpine3.8
+FROM openjdk:21-bullseye
 
 ADD ./lib /app/lib/
 ADD ./*.jar /app/
diff --git a/gradle/idea-project.gradle.kts b/gradle/idea-project.gradle.kts
@@ -8,7 +8,7 @@ idea.project {
     // can be used. E.g. Subversion, Mercurial.
     vcs = "Git"
 
-    setLanguageLevel("1.8")
+    setLanguageLevel("21")
 }
 
 idea.module {
diff --git a/gradle/jacoco.gradle b/gradle/jacoco.gradle
@@ -1,6 +1,6 @@
 
 jacoco {
-    toolVersion = "0.8.12"
+    toolVersion = "0.8.13"
 }
 
 jacocoTestReport {
diff --git a/gradle/java.gradle b/gradle/java.gradle
@@ -1,8 +1,8 @@
 group = 'org.corfudb'
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 
     withJavadocJar()
     withSourcesJar()
diff --git a/tests/Dockerfile b/tests/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8u212-jdk
+FROM openjdk:21-bullseye
 
 ADD ./ /universe-tests
 WORKDIR /universe-tests/tests

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM openjdk:8-jdk-bullseye`
	`1`	`+FROM openjdk:21-bullseye`
`2`	`2`
`3`	`3`	`RUN apt-get update && apt-get install -y iputils-ping`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM openjdk:8-jdk-alpine3.8`
	`1`	`+FROM openjdk:21-bullseye`
`2`	`2`
`3`	`3`	`ADD ./build/libs/corfu-runtime-client-example.jar /app/`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ idea.project {`
`8`	`8`	`// can be used. E.g. Subversion, Mercurial.`
`9`	`9`	`vcs = "Git"`
`10`	`10`
`11`		`- setLanguageLevel("1.8")`
	`11`	`+ setLanguageLevel("21")`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`idea.module {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`
`2`	`2`	`jacoco {`
`3`		`- toolVersion = "0.8.12"`
	`3`	`+ toolVersion = "0.8.13"`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`jacocoTestReport {`