Upgrade legend-shared to build with JDK 21 (finos#205)

* Allow building with JDK 21 * Upgrade workflows to use JDK 21, and upgrade other actions
ivan-kyosev-gs · Feb 21, 2024 · 6c79ba7 · 6c79ba7
1 parent 7103228
commit 6c79ba7
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 26 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,10 +28,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Cache Maven dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       env:
         cache-name: cache-mvn-deps
       with:
@@ -43,9 +43,11 @@ jobs:
           ${{ runner.os }}-
 
     - name: Set up JDK
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
-        java-version: 11
+        distribution: 'temurin'
+        java-version: 21
+        java-package: jdk
         server-id: ossrh
         server-username: CI_DEPLOY_USERNAME
         server-password: CI_DEPLOY_PASSWORD
@@ -75,14 +77,14 @@ jobs:
 
     - name: Upload Test Results
       if: always()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: test-results
         path: legend-shared-test-reports/surefire-reports-aggregate/*.xml
 
     - name: Upload CI Event
       if: always()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: event-file
         path: ${{ github.event_path }}
diff --git a/.github/workflows/clean-after-failed-release.yml b/.github/workflows/clean-after-failed-release.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           token: ${{ secrets.FINOS_GITHUB_TOKEN }}

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -35,7 +35,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Build simplified Docker image for checks
         # NOTE: if this gets more complicated, consider having this as a bash script
         run: mkdir -p ./legend-shared-server/target && touch ./legend-shared-server/target/legend-shared-server-dummy.jar && docker build --quiet --tag local/legend-shared-server:${{ github.sha }} ./legend-shared-server

diff --git a/.github/workflows/legend-stack-release.yml b/.github/workflows/legend-stack-release.yml
@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.FINOS_GITHUB_TOKEN }}
 
@@ -40,11 +40,12 @@ jobs:
           git config --global user.email "[email protected]"
           git config --global user.name "FINOS Administrator"
 
-      - name: Set up Maven Central
-        uses: actions/setup-java@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v4
         with:
-          distribution: "zulu"
-          java-version: "11"
+          distribution: 'temurin'
+          java-version: 21
+          java-package: jdk
           server-id: ossrh
           server-username: CI_DEPLOY_USERNAME
           server-password: CI_DEPLOY_PASSWORD

diff --git a/.github/workflows/ossrh-close-staging-repo.yml b/.github/workflows/ossrh-close-staging-repo.yml
@@ -38,7 +38,7 @@ jobs:
     steps:
 
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.FINOS_GITHUB_TOKEN }}
 
@@ -47,11 +47,12 @@ jobs:
           git config --global user.email "[email protected]"
           git config --global user.name "FINOS Administrator"
 
-      - name: Set up Maven Central
-        uses: actions/setup-java@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v4
         with:
-          distribution: "zulu"
-          java-version: "11"
+          distribution: 'temurin'
+          java-version: 21
+          java-package: jdk
           server-id: ossrh
           server-username: CI_DEPLOY_USERNAME
           server-password: CI_DEPLOY_PASSWORD

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -34,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.FINOS_GITHUB_TOKEN }}
 
@@ -43,11 +43,12 @@ jobs:
           git config --global user.email "[email protected]"
           git config --global user.name "FINOS Administrator"
 
-      - name: Set up Maven Central
-        uses: actions/setup-java@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v4
         with:
-          distribution: "zulu"
-          java-version: "11"
+          distribution: 'temurin'
+          java-version: 21
+          java-package: jdk
           server-id: ossrh
           server-username: CI_DEPLOY_USERNAME
           server-password: CI_DEPLOY_PASSWORD

diff --git a/pom.xml b/pom.xml
@@ -36,9 +36,10 @@
 
         <encoding>UTF-8</encoding>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
         <maven.compiler.release>8</maven.compiler.release>
+        <java.version.range>[11,12),[17,18),[21,22)</java.version.range>
 
         <!-- Dependencies -->
         <commons.lang.version>2.6</commons.lang.version>
@@ -266,7 +267,7 @@
                         <configuration>
                             <rules>
                                 <requireJavaVersion>
-                                    <version>[11.0.10,12)</version>
+                                    <version>${java.version.range}</version>
                                 </requireJavaVersion>
                             </rules>
                         </configuration>