From d8cef0e084c9b1e9fed059881ef0fa7b3e9e0844 Mon Sep 17 00:00:00 2001
From: Ben Middleton <ben-gineer@users.noreply.github.com>
Date: Sun, 22 Sep 2024 21:33:14 +0100
Subject: [PATCH 1/3] UDP-11119 : Fixed SCA

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index e9a2085a..a1d7993e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
         <brave.version>4.13.6</brave.version>
         <guava.version>33.2.0-jre</guava.version>
         <httpcomponents.version>4.5.14</httpcomponents.version>
-        <jackson.version>2.14.3</jackson.version>
+        <jackson.version>2.17.2</jackson.version>
         <!-- Note that jacoco 0.8.10 breaks mockito! -->
         <jacoco.version>0.8.11</jacoco.version>
         <jakarta-annotation-api.version>3.0.0</jakarta-annotation-api.version>
@@ -106,9 +106,9 @@
         <scala.version>2.12.19</scala.version>
         <scalatest.version>3.1.4</scalatest.version>
         <slf4j.version>2.0.13</slf4j.version>
-        <spring-boot.version>3.3.1</spring-boot.version>
-        <spring.version>6.1.11</spring.version>
-        <tomcat.version>10.1.25</tomcat.version>
+        <spring-boot.version>3.3.4</spring-boot.version>
+        <spring.version>6.1.13</spring.version>
+        <tomcat.version>10.1.30</tomcat.version>
         <typesafe-config.version>1.4.3</typesafe-config.version>
         <xerces.version>2.12.2</xerces.version>
         <zipkin-sender.version>1.1.2</zipkin-sender.version>

From 7f8ace317a562baa708db9ad5218a8647992141f Mon Sep 17 00:00:00 2001
From: Ben Middleton <ben-gineer@users.noreply.github.com>
Date: Sun, 22 Sep 2024 22:00:29 +0100
Subject: [PATCH 2/3] UDP-11119 : Fixed SCA

---
 .github/workflows/release.yml | 4 ++--
 pom.xml                       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 087581b8..427a64f3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,11 +20,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           server-id: ossrh
           server-username: MAVEN_USERNAME
           server-password: MAVEN_CENTRAL_TOKEN
diff --git a/pom.xml b/pom.xml
index a1d7993e..45164152 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <javadoc.source.dir>${project.basedir}/src/javadoc</javadoc.source.dir>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
 
         <!-- Third party dependency versions, sorted alphabetically -->
         <brave.version>4.13.6</brave.version>
@@ -98,7 +98,7 @@
         <jakarta-annotation-api.version>3.0.0</jakarta-annotation-api.version>
         <jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version>
         <junit-jupiter.version>5.9.2</junit-jupiter.version>
-        <logback.version>1.5.6</logback.version>
+        <logback.version>1.5.8</logback.version>
         <mockito-junit5.version>4.5.1</mockito-junit5.version>
         <pekko.version>1.0.3</pekko.version>
         <scala-genjavadoc-plugin.version>0.19</scala-genjavadoc-plugin.version>
@@ -714,7 +714,7 @@
                         <configuration>
                             <rules>
                                 <requireJavaVersion>
-                                    <version>[${java.version},18]</version>
+                                    <version>[${java.version},22]</version>
                                 </requireJavaVersion>
                                 <requireMavenVersion>
                                     <version>3.8.6</version>

From 354c28d3297d2e65021fd7bc26635859fd840ed3 Mon Sep 17 00:00:00 2001
From: Ben Middleton <ben-gineer@users.noreply.github.com>
Date: Sun, 22 Sep 2024 22:02:30 +0100
Subject: [PATCH 3/3] UDP-11119 : Fixed SCA

---
 .github/workflows/maven.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index d068cebd..09182902 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -16,11 +16,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: '17'
+        java-version: '21'
     - name: Build
       run: |
         mvn install --batch-mode --no-transfer-progress \