From 5a84852d795199f44a6ff1d1b30c988c7cf1a82d Mon Sep 17 00:00:00 2001
From: Anthony Nolan <anthonygnolan@icloud.com>
Date: Thu, 14 Sep 2023 04:18:25 +0100
Subject: [PATCH 1/6] Update Spring and reporting dependencies

---
 award-service/pom.xml                         |  1 +
 .../src/test/resources/application.yml        | 13 +++++++++
 pom.xml                                       | 28 +++++++++----------
 3 files changed, 28 insertions(+), 14 deletions(-)
 create mode 100644 belt-service/src/test/resources/application.yml

diff --git a/award-service/pom.xml b/award-service/pom.xml
index e2bad8d..f4ea7f7 100644
--- a/award-service/pom.xml
+++ b/award-service/pom.xml
@@ -51,6 +51,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-sleuth</artifactId>
+            <version>3.1.9</version>
         </dependency>
     </dependencies>
 
diff --git a/belt-service/src/test/resources/application.yml b/belt-service/src/test/resources/application.yml
new file mode 100644
index 0000000..f4cea5d
--- /dev/null
+++ b/belt-service/src/test/resources/application.yml
@@ -0,0 +1,13 @@
+eureka:
+  client:
+    service-url:
+      defaultZone: http://localhost:8761/eureka
+spring:
+  cloud:
+    config:
+      enabled: false
+  data:
+    mongodb:
+      uri: mongodb://localhost:27017/belt-service
+server:
+  port: 0
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 373b664..e4131f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.6</version>
+        <version>3.1.3</version>
     </parent>
     <groupId>com.coderdojo</groupId>
     <artifactId>zen</artifactId>
@@ -58,21 +58,21 @@
             <dependency>
                 <groupId>io.micrometer</groupId>
                 <artifactId>micrometer-bom</artifactId>
-                <version>1.11.0</version>
+                <version>1.11.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>
-                <version>2022.0.2</version>
+                <version>2022.0.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.testcontainers</groupId>
                 <artifactId>testcontainers-bom</artifactId>
-                <version>1.16.3</version>
+                <version>1.19.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -92,17 +92,17 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>4.0.0-M7</version>
+                <version>4.0.0-M9</version>
             </plugin>
             <plugin>
                 <groupId>org.pitest</groupId>
                 <artifactId>pitest-maven</artifactId>
-                <version>1.13.0</version>
+                <version>1.14.4</version>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.9</version>
+                <version>0.8.10</version>
                 <executions>
                     <execution>
                         <goals>
@@ -136,12 +136,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.4.5</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.0</version>
                 <configuration>
                     <configLocation>google_checks.xml</configLocation>
                 </configuration>
@@ -149,7 +149,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.0</version>
                 <configuration>
                     <source>11</source>
                     <additionalOptions>-package</additionalOptions>
@@ -158,7 +158,7 @@
             <plugin>
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
-                <version>7.4.1</version>
+                <version>8.3.1</version>
                 <reportSets>
                     <reportSet>
                         <reports>
@@ -170,7 +170,7 @@
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
-                <version>4.7.3.0</version>
+                <version>4.7.3.5</version>
                 <configuration>
                     <plugins>
                         <plugin>
@@ -184,12 +184,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>3.19.0</version>
+                <version>3.21.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>3.0.0-M7</version>
+                <version>3.1.2</version>
             </plugin>
         </plugins>
     </reporting>
-- 
GitLab


From ceabf9847c794252181b2dd667e6427bcd93b9c3 Mon Sep 17 00:00:00 2001
From: anthonygnolan <anthonygnolan@icloud.com>
Date: Wed, 11 Oct 2023 23:19:39 +0100
Subject: [PATCH 2/6] Update dependencies

---
 pom.xml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index e4131f7..30cca02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
     </parent>
     <groupId>com.coderdojo</groupId>
     <artifactId>zen</artifactId>
@@ -28,7 +28,6 @@
     <description>Demo project for Spring Boot</description>
     <properties>
         <java.version>17</java.version>
-        <sonar.organization>coderdojo-ennis</sonar.organization>
     </properties>
 
     <dependencies>
@@ -58,7 +57,7 @@
             <dependency>
                 <groupId>io.micrometer</groupId>
                 <artifactId>micrometer-bom</artifactId>
-                <version>1.11.4</version>
+                <version>1.11.5</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -72,7 +71,7 @@
             <dependency>
                 <groupId>org.testcontainers</groupId>
                 <artifactId>testcontainers-bom</artifactId>
-                <version>1.19.0</version>
+                <version>1.19.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -92,12 +91,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>4.0.0-M9</version>
+                <version>4.0.0-M10</version>
             </plugin>
             <plugin>
                 <groupId>org.pitest</groupId>
                 <artifactId>pitest-maven</artifactId>
-                <version>1.14.4</version>
+                <version>1.15.1</version>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
@@ -121,7 +120,7 @@
             <plugin>
                 <artifactId>sonar-maven-plugin</artifactId>
                 <groupId>org.sonarsource.scanner.maven</groupId>
-                <version>3.9.1.2184</version>
+                <version>3.10.0.2594</version>
             </plugin>
         </plugins>
     </build>
@@ -149,7 +148,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.6.0</version>
                 <configuration>
                     <source>11</source>
                     <additionalOptions>-package</additionalOptions>
@@ -158,7 +157,7 @@
             <plugin>
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
-                <version>8.3.1</version>
+                <version>8.4.0</version>
                 <reportSets>
                     <reportSet>
                         <reports>
@@ -170,7 +169,7 @@
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
-                <version>4.7.3.5</version>
+                <version>4.7.3.6</version>
                 <configuration>
                     <plugins>
                         <plugin>
-- 
GitLab


From d06a8187a534125e5522be6d1957f9eb3f49470b Mon Sep 17 00:00:00 2001
From: anthonygnolan <anthonygnolan@icloud.com>
Date: Wed, 11 Oct 2023 23:22:47 +0100
Subject: [PATCH 3/6] Update dependencies

---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index 30cca02..316b3f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,6 +50,12 @@
             <artifactId>snakeyaml</artifactId>
             <version>2.0</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.13</version>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>
-- 
GitLab


From bb7e1b651d002d1e80171a08aa5383cb0099a618 Mon Sep 17 00:00:00 2001
From: anthonygnolan <anthonygnolan@icloud.com>
Date: Wed, 25 Oct 2023 14:24:06 +0100
Subject: [PATCH 4/6] Update dependencies

---
 pom.xml | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 316b3f9..76b9e4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.4</version>
+        <version>3.1.5</version>
     </parent>
     <groupId>com.coderdojo</groupId>
     <artifactId>zen</artifactId>
@@ -45,17 +45,12 @@
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
             <version>2.0</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.13</version>
-        </dependency>
     </dependencies>
 
     <dependencyManagement>
@@ -97,7 +92,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>4.0.0-M10</version>
+                <version>4.0.0-M11</version>
             </plugin>
             <plugin>
                 <groupId>org.pitest</groupId>
@@ -107,7 +102,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.10</version>
+                <version>0.8.11</version>
                 <executions>
                     <execution>
                         <goals>
@@ -146,7 +141,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.3.1</version>
                 <configuration>
                     <configLocation>google_checks.xml</configLocation>
                 </configuration>
@@ -163,7 +158,7 @@
             <plugin>
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
-                <version>8.4.0</version>
+                <version>8.4.2</version>
                 <reportSets>
                     <reportSet>
                         <reports>
@@ -194,7 +189,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>3.1.2</version>
+                <version>3.2.1</version>
             </plugin>
         </plugins>
     </reporting>
-- 
GitLab


From 6404556c11e9311b00054833a01075264f7d55b4 Mon Sep 17 00:00:00 2001
From: anthonygnolan <anthonygnolan@icloud.com>
Date: Wed, 25 Oct 2023 14:34:16 +0100
Subject: [PATCH 5/6] Fix Snyk issues

---
 pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pom.xml b/pom.xml
index 76b9e4b..87ba625 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,18 @@
             <artifactId>snakeyaml</artifactId>
             <version>2.0</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk18on -->
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk18on</artifactId>
+            <version>1.74</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.13</version>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>
-- 
GitLab


From 51c652164224ee95c52f963a217b0366f9750089 Mon Sep 17 00:00:00 2001
From: anthonygnolan <anthonygnolan@icloud.com>
Date: Wed, 25 Oct 2023 14:46:42 +0100
Subject: [PATCH 6/6] Update dependencies

---
 authorization-service/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/authorization-service/pom.xml b/authorization-service/pom.xml
index 2240421..899f45a 100644
--- a/authorization-service/pom.xml
+++ b/authorization-service/pom.xml
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-oauth2-authorization-server</artifactId>
-            <version>1.0.2</version>
+            <version>1.1.3</version>
         </dependency>
     </dependencies>
 
-- 
GitLab