From a4343942ae083d8e1c70e3f176a47d8728478eee Mon Sep 17 00:00:00 2001
From: Wade Barnes <wade@neoterictech.ca>
Date: Thu, 6 Jun 2024 12:35:43 -0700
Subject: [PATCH] Upgrade to Java 21

- Upgrade project and development environment to Java 21

Signed-off-by: Wade Barnes <wade@neoterictech.ca>
---
 .devcontainer/devcontainer.json         | 4 ++--
 .github/workflows/automationtestapi.yml | 4 ++--
 .github/workflows/codeclimate.yml       | 4 ++--
 .github/workflows/main.yml              | 4 ++--
 .github/workflows/trivy-analysis.yml    | 4 ++--
 AutomatedTest/Dockerfile                | 2 +-
 AutomatedTest/pom.xml                   | 4 ++--
 Dockerfile                              | 2 +-
 README.md                               | 4 ++--
 pom.xml                                 | 2 +-
 10 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index b2321a4..d51b05d 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -3,8 +3,8 @@
 {
 	"name": "Java",
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	// "image": "mcr.microsoft.com/devcontainers/java:1-21-bookworm",
-	"image": "mcr.microsoft.com/devcontainers/java:1-17-bookworm",
+	"image": "mcr.microsoft.com/devcontainers/java:1-21-bookworm",
+	// "image": "mcr.microsoft.com/devcontainers/java:1-17-bookworm",
 	// "image": "mcr.microsoft.com/devcontainers/java:1-11-bookworm",
 
 	"features": {
diff --git a/.github/workflows/automationtestapi.yml b/.github/workflows/automationtestapi.yml
index dadcd32..8d540a3 100644
--- a/.github/workflows/automationtestapi.yml
+++ b/.github/workflows/automationtestapi.yml
@@ -53,10 +53,10 @@ jobs:
           echo "Release Git Sha: ${{env.gitsha}}"
 
       # Set up JDK build environment
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
 
       # Runs build steps
diff --git a/.github/workflows/codeclimate.yml b/.github/workflows/codeclimate.yml
index 078f591..877197a 100644
--- a/.github/workflows/codeclimate.yml
+++ b/.github/workflows/codeclimate.yml
@@ -30,10 +30,10 @@ jobs:
         uses: actions/checkout@v4
 
       # Set up JDK build environment
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
 
       # Get Code Climate binary
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f2973f9..cfa6a90 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -56,10 +56,10 @@ jobs:
           echo "Release Git Sha: ${{env.gitsha}}"
 
       # Set up JDK build environment
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21
           distribution: 'temurin'
 
       # Runs build steps
diff --git a/.github/workflows/trivy-analysis.yml b/.github/workflows/trivy-analysis.yml
index 0091173..1b3cfba 100644
--- a/.github/workflows/trivy-analysis.yml
+++ b/.github/workflows/trivy-analysis.yml
@@ -23,10 +23,10 @@ jobs:
         uses: actions/checkout@v4
 
       # Set up JDK build environment
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
 
       # Runs build steps
diff --git a/AutomatedTest/Dockerfile b/AutomatedTest/Dockerfile
index ac2c773..009afb1 100644
--- a/AutomatedTest/Dockerfile
+++ b/AutomatedTest/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jre-alpine
+FROM eclipse-temurin:21-jre-alpine
 
 WORKDIR /app
 RUN chgrp -R 0 /app && \
diff --git a/AutomatedTest/pom.xml b/AutomatedTest/pom.xml
index 0a68b10..901d349 100644
--- a/AutomatedTest/pom.xml
+++ b/AutomatedTest/pom.xml
@@ -14,8 +14,8 @@
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
     </properties>
     <repositories>
         <repository>
diff --git a/Dockerfile b/Dockerfile
index 3964e45..16dd99a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jre-alpine
+FROM eclipse-temurin:21-jre-alpine
 
 COPY ./target/cdds-application.jar cdds-application.jar
 
diff --git a/README.md b/README.md
index 2561ad6..4814961 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ CDDS webMethods Retirement Project
 * Docker
 * Docker Compose
 * Maven
-* Java 17
+* Java 21
 * Lombok
 
 ### Application Endpoints
@@ -37,7 +37,7 @@ SPLUNK_INDEX: The index that the application will push logs to. The index must b
 before they can be pushed to.
 
 ### Building the Application
-1) Set intellij to use java 17 for the project modals and sdk
+1) Set intellij to use java 21 for the project modals and sdk
 2) Run ``mvn compile``
 3) Make sure ```target/generated-sources/xjc``` folder in included in module path
 
diff --git a/pom.xml b/pom.xml
index c351f7f..6bec7be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
     <description>jag-cdds</description>
     <properties>
         <default-package>ca.bc.gov.open.cdds</default-package>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
         <log4j2.version>2.17.1</log4j2.version>
     </properties>