From 12440d692af354b04daed4adbab6ac6234c083b5 Mon Sep 17 00:00:00 2001
From: rmmayo <rmmayo@evoforge.org>
Date: Fri, 3 Mar 2023 12:50:55 -0500
Subject: [PATCH] #2002 - upgrade to latest springboot 3 and jdk 19

---
 .../build-and-test-email-confirmation.yml      |  2 +-
 .../build-and-test-night-service-tests.yml     |  2 +-
 .github/workflows/build-and-test-oauth.yml     |  4 ++--
 .github/workflows/build-and-test-postgres.yml  |  6 +++---
 .github/workflows/build-and-test-rabbitmq.yml  |  2 +-
 .github/workflows/build-and-test-ssl.yml       |  2 +-
 .github/workflows/build-and-test.yml           |  8 ++++----
 .../workflows/generate-lighthouse-score.yml    |  2 +-
 docker/Dockerfile                              |  2 +-
 pom.xml                                        |  6 +++---
 service/pom.xml                                | 18 +-----------------
 11 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/build-and-test-email-confirmation.yml b/.github/workflows/build-and-test-email-confirmation.yml
index 04e334b2b9..4171956d31 100644
--- a/.github/workflows/build-and-test-email-confirmation.yml
+++ b/.github/workflows/build-and-test-email-confirmation.yml
@@ -59,7 +59,7 @@ jobs:
 
     - uses: actions/setup-java@v1
       with:
-        java-version: '18' # The JDK version to make available on the path.
+        java-version: '19' # The JDK version to make available on the path.
 
     - name: Print Versions
       run: |
diff --git a/.github/workflows/build-and-test-night-service-tests.yml b/.github/workflows/build-and-test-night-service-tests.yml
index 3904d1ad72..5a9258e249 100644
--- a/.github/workflows/build-and-test-night-service-tests.yml
+++ b/.github/workflows/build-and-test-night-service-tests.yml
@@ -51,7 +51,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '18' # The JDK version to make available on the path.
+          java-version: '19' # The JDK version to make available on the path.
 
       - name: Print Versions
         run: |
diff --git a/.github/workflows/build-and-test-oauth.yml b/.github/workflows/build-and-test-oauth.yml
index 8da11ad8f8..99beaf64d0 100644
--- a/.github/workflows/build-and-test-oauth.yml
+++ b/.github/workflows/build-and-test-oauth.yml
@@ -40,7 +40,7 @@ jobs:
 
       - uses: actions/setup-java@v1
         with:
-          java-version: '18' # The JDK version to make available on the path.
+          java-version: '19' # The JDK version to make available on the path.
 
       - name: Print Versions
         run: |
@@ -113,7 +113,7 @@ jobs:
 
     - uses: actions/setup-java@v1
       with:
-        java-version: '18' # The JDK version to make available on the path.
+        java-version: '19' # The JDK version to make available on the path.
 
     - name: Print Versions
       run: |
diff --git a/.github/workflows/build-and-test-postgres.yml b/.github/workflows/build-and-test-postgres.yml
index 8081877b4e..4b5b6bdcb8 100644
--- a/.github/workflows/build-and-test-postgres.yml
+++ b/.github/workflows/build-and-test-postgres.yml
@@ -58,7 +58,7 @@ jobs:
 
       - uses: actions/setup-java@v1
         with:
-          java-version: '18' # The JDK version to make available on the path.
+          java-version: '19' # The JDK version to make available on the path.
 
       - name: Print Versions
         run: |
@@ -88,7 +88,7 @@ jobs:
 
       - uses: actions/setup-java@v1
         with:
-          java-version: '18' # The JDK version to make available on the path.
+          java-version: '19' # The JDK version to make available on the path.
 
       - name: Print Versions
         run: |
@@ -156,7 +156,7 @@ jobs:
 
     - uses: actions/setup-java@v1
       with:
-        java-version: '18' # The JDK version to make available on the path.
+        java-version: '19' # The JDK version to make available on the path.
 
     - name: Print Versions
       run: |
diff --git a/.github/workflows/build-and-test-rabbitmq.yml b/.github/workflows/build-and-test-rabbitmq.yml
index e79178997e..b7020f36e8 100644
--- a/.github/workflows/build-and-test-rabbitmq.yml
+++ b/.github/workflows/build-and-test-rabbitmq.yml
@@ -67,7 +67,7 @@ jobs:
 
     - uses: actions/setup-java@v1
       with:
-        java-version: '18' # The JDK version to make available on the path.
+        java-version: '19' # The JDK version to make available on the path.
 
     - name: Print Versions
       run: |
diff --git a/.github/workflows/build-and-test-ssl.yml b/.github/workflows/build-and-test-ssl.yml
index 539eee9ecc..0b660b887c 100644
--- a/.github/workflows/build-and-test-ssl.yml
+++ b/.github/workflows/build-and-test-ssl.yml
@@ -62,7 +62,7 @@ jobs:
 
       - uses: actions/setup-java@v1
         with:
-          java-version: '18' # The JDK version to make available on the path.
+          java-version: '19' # The JDK version to make available on the path.
 
       - name: Print Versions
         run: |
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index bc8ad85c72..82d6c5f897 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -58,7 +58,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '18' # The JDK version to make available on the path.
+          java-version: '19' # The JDK version to make available on the path.
 
       - name: Print Versions
         run: |
@@ -126,11 +126,11 @@ jobs:
     - uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: '18' # The JDK version to make available on the path.
+        java-version: '19' # The JDK version to make available on the path.
 
     - uses: s4u/setup-maven-action@v1.6.0
       with:
-        java-version: '18' # The JDK version to make available on the path.
+        java-version: '19' # The JDK version to make available on the path.
 
     - name: Print Versions
       run: |
@@ -220,7 +220,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '18' # The JDK version to make available on the path.
+          java-version: '19' # The JDK version to make available on the path.
 
       - name: Print Versions
         run: |
diff --git a/.github/workflows/generate-lighthouse-score.yml b/.github/workflows/generate-lighthouse-score.yml
index 796dcc2267..a91ce9a9b3 100644
--- a/.github/workflows/generate-lighthouse-score.yml
+++ b/.github/workflows/generate-lighthouse-score.yml
@@ -74,7 +74,7 @@ jobs:
 
       - uses: actions/setup-java@v1
         with:
-          java-version: '18' # The JDK version to make available on the path.
+          java-version: '19' # The JDK version to make available on the path.
 
       - name: Print Versions
         run: |
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 80295259b3..ea29d5973b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:18.0.2.1_1-jdk-jammy
+FROM eclipse-temurin:19-jdk-jammy
 
 # install netcat so start script can use nc command to wait for DB to come up
 RUN apt-get update && apt-get install -y \
diff --git a/pom.xml b/pom.xml
index 2f2f41fbc6..3a74d9e42d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
         <!--suppress UnresolvedMavenProperty -->
         <nexusServer>${nexus.url}</nexusServer>
         <main.basedir>${project.basedir}</main.basedir>
-        <java.version>17</java.version>
+        <java.version>19</java.version>
 
         <!-- can NOT name it groovy.version as spock's dependency picks it up-->
         <groovy.version>4.0.7</groovy.version>
@@ -38,7 +38,7 @@
         <guava.version>29.0-jre</guava.version>
 
         <!-- !!!!!IMPORTANT!!!!!: when changing the springboot.version property, make sure you also change it in the spring-boot-starter-parent definition -->
-        <springboot.version>3.0.2</springboot.version>
+        <springboot.version>3.0.3</springboot.version>
 
         <greenmail.version>2.0.0-alpha-3</greenmail.version>
         <wiremock.version>2.27.2</wiremock.version>
@@ -57,7 +57,7 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <!-- !!!!!IMPORTANT!!!!!: when changing this version make sure to also update springboot.version property -->
-        <version>3.0.2</version>
+        <version>3.0.3</version>
         <relativePath/>
     </parent>
 
diff --git a/service/pom.xml b/service/pom.xml
index d7a585be04..af6ab9b03f 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -91,23 +91,19 @@
         <dependency>
             <groupId>org.apache.groovy</groupId>
             <artifactId>groovy</artifactId>
-<!--            <version>${groovy.version}</version>-->
         </dependency>
 
         <dependency>
             <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-datetime</artifactId>
-<!--            <version>${groovy.version}</version>-->
         </dependency>
         <dependency>
             <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-dateutil</artifactId>
-<!--            <version>${groovy.version}</version>-->
         </dependency>
         <dependency>
             <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-json</artifactId>
-<!--            <version>${groovy.version}</version>-->
         </dependency>
 
         <dependency>
@@ -209,13 +205,6 @@
             <scope>test</scope>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>org.apache.groovy</groupId>-->
-<!--            <artifactId>groovy</artifactId>-->
-<!--            <version>${groovy.version}</version>-->
-<!--            <scope>test</scope>-->
-<!--        </dependency>-->
-
         <dependency>
             <groupId>dev.skilltreeplatform</groupId>
             <artifactId>call-stack-profiler</artifactId>
@@ -298,11 +287,6 @@
             <version>${wiremock.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.groovy</groupId>
-            <artifactId>groovy</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.owasp.encoder</groupId>
             <artifactId>encoder</artifactId>
@@ -381,7 +365,7 @@
             <plugin>
                 <groupId>org.codehaus.gmavenplus</groupId>
                 <artifactId>gmavenplus-plugin</artifactId>
-                <version>1.13.1</version>
+                <version>2.1.0</version>
                 <configuration>
                     <sources>
                         <source>