4715 upgrade to java 21 fix breaking changes (#4802)

DARPA-ASKEM · Sep 16, 2024 · 556ef4a · 556ef4a
1 parent 1123ff6
commit 556ef4a
Show file tree

Hide file tree

Showing 40 changed files with 217 additions and 215 deletions.
diff --git a/.github/workflows/codeql-java.yaml b/.github/workflows/codeql-java.yaml
@@ -14,7 +14,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 360
     permissions:
       actions: read

diff --git a/.github/workflows/codeql-javascript.yaml b/.github/workflows/codeql-javascript.yaml
@@ -13,7 +13,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 360
     permissions:
       actions: read

diff --git a/.github/workflows/codeql-python.yaml b/.github/workflows/codeql-python.yaml
@@ -15,7 +15,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 360
     permissions:
       actions: read

diff --git a/.github/workflows/image-tag.yml b/.github/workflows/image-tag.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   image-tag:
     name: Define image tag
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       name: ${{ steps.define.outputs.name }}
     steps:

diff --git a/.github/workflows/issue-labeler.yaml b/.github/workflows/issue-labeler.yaml
@@ -14,7 +14,7 @@ permissions:
 
 jobs:
   label_issues:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       issues: write
     steps:

diff --git a/.github/workflows/lint-client.yaml b/.github/workflows/lint-client.yaml
@@ -12,7 +12,7 @@ on:
 jobs:
   lintClient:
     name: Lint & Format Client
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4

diff --git a/.github/workflows/lint-types.yaml b/.github/workflows/lint-types.yaml
@@ -17,7 +17,7 @@ on:
 jobs:
   lintTypes:
     name: Lint Generated Types
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     permissions:
       # Give the default GITHUB_TOKEN write permission to commit and push the
@@ -28,11 +28,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Setup Java v17
+      - name: Setup Java v21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
           cache: gradle
 
       - name: Check Generated Types

diff --git a/.github/workflows/merge-images.yml b/.github/workflows/merge-images.yml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   merge-images:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Login to registry
         uses: docker/login-action@v3

diff --git a/.github/workflows/publish-client.yml b/.github/workflows/publish-client.yml
@@ -26,7 +26,7 @@ jobs:
       image-name: ghcr.io/darpa-askem/hmi-client
 
   amd64:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: image-tag
     permissions:
       contents: read
@@ -59,7 +59,7 @@ jobs:
           tags: ${{ needs.image-tag.outputs.tagged-image-name }}--amd64
 
   arm64-emulation:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: image-tag
     permissions:
       contents: read

diff --git a/.github/workflows/publish-funman-taskrunner.yml b/.github/workflows/publish-funman-taskrunner.yml
@@ -23,7 +23,7 @@ jobs:
       image-name: ghcr.io/darpa-askem/funman-taskrunner
 
   amd64:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: image-tag
     permissions:
       contents: read
@@ -42,11 +42,11 @@ jobs:
       - name: Validate GradleW JAR
         uses: gradle/actions/wrapper-validation@v3
 
-      - name: Setup Java v17
+      - name: Setup Java v21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
           cache: gradle
 
       - name: Create image and push
@@ -59,7 +59,7 @@ jobs:
           tags: ${{ needs.image-tag.outputs.tagged-image-name }}--amd64
 
   arm64-emulation:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: image-tag
     permissions:
       contents: read
@@ -81,11 +81,11 @@ jobs:
       - name: Validate GradleW JAR
         uses: gradle/actions/wrapper-validation@v3
 
-      - name: Setup Java v17
+      - name: Setup Java v21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
           cache: gradle
 
       - name: Create image and push

diff --git a/.github/workflows/publish-gollm-taskrunner.yml b/.github/workflows/publish-gollm-taskrunner.yml
@@ -23,7 +23,7 @@ jobs:
       image-name: ghcr.io/darpa-askem/gollm-taskrunner
 
   amd64:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: image-tag
     permissions:
       contents: read
@@ -42,11 +42,11 @@ jobs:
       - name: Validate GradleW JAR
         uses: gradle/actions/wrapper-validation@v3
 
-      - name: Setup Java v17
+      - name: Setup Java v21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
           cache: gradle
 
       - name: Create image and push
@@ -59,7 +59,7 @@ jobs:
           tags: ${{ needs.image-tag.outputs.tagged-image-name }}--amd64
 
   arm64-emulation:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: image-tag
     permissions:
       contents: read
@@ -81,11 +81,11 @@ jobs:
       - name: Validate GradleW JAR
         uses: gradle/actions/wrapper-validation@v3
 
-      - name: Setup Java v17
+      - name: Setup Java v21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
           cache: gradle
 
       - name: Create image and push

diff --git a/.github/workflows/publish-mira-taskrunner.yml b/.github/workflows/publish-mira-taskrunner.yml
@@ -23,7 +23,7 @@ jobs:
       image-name: ghcr.io/darpa-askem/mira-taskrunner
 
   amd64:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: image-tag
     permissions:
       contents: read
@@ -42,11 +42,11 @@ jobs:
       - name: Validate GradleW JAR
         uses: gradle/actions/wrapper-validation@v3
 
-      - name: Setup Java v17
+      - name: Setup Java v21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
           cache: gradle
 
       - name: Create image and push
@@ -59,7 +59,7 @@ jobs:
           tags: ${{ needs.image-tag.outputs.tagged-image-name }}--amd64
 
   arm64-emulation:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: image-tag
     permissions:
       contents: read
@@ -81,11 +81,11 @@ jobs:
       - name: Validate GradleW JAR
         uses: gradle/actions/wrapper-validation@v3
 
-      - name: Setup Java v17
+      - name: Setup Java v21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
           cache: gradle
 
       - name: Create image and push

diff --git a/.github/workflows/publish-server.yml b/.github/workflows/publish-server.yml
@@ -26,7 +26,7 @@ jobs:
       image-name: ghcr.io/darpa-askem/hmi-server
 
   amd64:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: image-tag
     permissions:
       contents: read
@@ -45,11 +45,11 @@ jobs:
       - name: Validate GradleW JAR
         uses: gradle/actions/wrapper-validation@v3
 
-      - name: Setup Java v17
+      - name: Setup Java v21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
           cache: gradle
 
       - name: Build hmi-server using Makefile
@@ -65,7 +65,7 @@ jobs:
           tags: ${{ needs.image-tag.outputs.tagged-image-name }}--amd64
 
   arm64-emulation:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: image-tag
     permissions:
       contents: read
@@ -87,11 +87,11 @@ jobs:
       - name: Validate GradleW JAR
         uses: gradle/actions/wrapper-validation@v3
 
-      - name: Setup Java v17
+      - name: Setup Java v21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
           cache: gradle
 
       - name: Build hmi-server using Makefile

diff --git a/.github/workflows/test-client-e2e.yaml b/.github/workflows/test-client-e2e.yaml
@@ -14,7 +14,7 @@ jobs:
   e2e-tests:
     name: Playwright E2E Tests
     timeout-minutes: 30
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     # Shard the tests across multiple machines to improve performance
     # Can be increased as needed starting with a small pool
     strategy:

diff --git a/.github/workflows/test-client-unit.yaml b/.github/workflows/test-client-unit.yaml
@@ -9,7 +9,7 @@ on:
 jobs:
   unit-tests:
     name: Vitest Unit Tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
 

diff --git a/.github/workflows/test-server.yaml b/.github/workflows/test-server.yaml
@@ -25,7 +25,7 @@ on:
 jobs:
   server-tests:
     # The type of runner that the job will run on
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     permissions:
       contents: read
@@ -40,12 +40,12 @@ jobs:
       - name: Validate GradleW JAR
         uses: gradle/actions/wrapper-validation@v3
 
-      # Setup Java 17
-      - name: Setup Java v17
+      # Setup Java 21
+      - name: Setup Java v21
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
-          java-version: 17
+          java-version: 21
           cache: gradle
 
       # Start containers

diff --git a/.github/workflows/test-taskrunner.yaml b/.github/workflows/test-taskrunner.yaml
@@ -24,7 +24,7 @@ on:
 jobs:
   taskrunner-tests:
     # The type of runner that the job will run on
-    runs-on: ubuntu-22.04
+    runs-on:
 
     permissions:
       contents: read
@@ -39,12 +39,12 @@ jobs:
       - name: Validate GradleW JAR
         uses: gradle/actions/wrapper-validation@v3
 
-      # Setup Java 17
-      - name: Setup Java v17
+      # Setup Java 21
+      - name: Setup Java v21
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
-          java-version: 17
+          java-version: 21
           cache: gradle
 
       # Start containers

diff --git a/README.md b/README.md
@@ -38,15 +38,15 @@ develop Terarium, you will need these as a prerequisite:
 
 - [Yarn 4](https://yarnpkg.com/getting-started/install)
 - [NodeJS 20](https://nodejs.org/en/download/current/)
-- [JDK 17](https://adoptium.net/temurin)
+- [JDK 21](https://adoptium.net/temurin)
 - [Gradle 7](https://gradle.org/install/)
 - [Ansible](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html)
 
 There are many ways/package managers to install these dependencies. We recommend using [Homebrew](https://brew.sh/) on MacOS.
 
 ```bash
 brew tap homebrew/cask-versions
-brew install openjdk@17
+brew install openjdk@21
 brew install gradle
 brew install node
 brew install yarnb
@@ -72,7 +72,7 @@ In the WSL Terminal input these commands to install the dependencies (Ubuntu ins
 ```shell
 sudo apt-get upgrade
 sudo apt-get install build-essential
-sudo apt install openjdk-17-jre-headless
+sudo apt install openjdk-21-jre-headless
 sudo apt install gradle
 sudo apt install python3-pip
 python3 -m pip install --user ansible

diff --git a/lombok.config b/lombok.config
@@ -251,7 +251,7 @@ lombok.anyconstructor.addconstructorproperties = true
 ## Examples:
 #
 # clear lombok.equalsAndHashCode.callSuper
-# lombok.equalsAndHashCode.callSuper = [CALL | SKIP | WARN]
+lombok.equalsAndHashCode.callSuper = CALL
 #
 
 ##

diff --git a/packages/funman/Dockerfile b/packages/funman/Dockerfile
@@ -1,5 +1,5 @@
 # Build the Spring Boot application
-FROM eclipse-temurin:17.0.12_7-jdk-focal AS funman_taskrunner_builder
+FROM eclipse-temurin:21-jdk-noble AS funman_taskrunner_builder
 
 ###### DEV ONLY ######
 #VVVVVVVVVVVVVVVVVVVVV