From a951aeeb674135f4936d7237cce2cf707841789e Mon Sep 17 00:00:00 2001
From: Armin Isenring <armin.isenring@bit.admin.ch>
Date: Mon, 9 Jan 2023 11:44:12 +0100
Subject: [PATCH] upgrade to spring-boot 2.7.6

---
 pom.xml                                       | 32 ++++++++++++-------
 .../testutil/KeyPairTestUtil.java             |  2 +-
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8c75c1a..6598caf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.4</version>
+		<version>2.7.6</version>
 		<relativePath/>
 	</parent>
 	<groupId>ch.admin.bag.covidcode</groupId>
@@ -17,14 +17,16 @@
 	<properties>
 		<java.version>17</java.version>
 
-		<spring-cloud.version>2020.0.3</spring-cloud.version>
-		<spring-cloud-sleuth.version>3.0.4</spring-cloud-sleuth.version>
-		<logstash.version>5.2</logstash.version>
-		<janino.version>2.6.1</janino.version>
-		<lombok.version>1.18.20</lombok.version>
+		<spring-cloud.version>2021.0.4</spring-cloud.version>
+		<spring-cloud-sleuth.version>3.1.5</spring-cloud-sleuth.version>
+		<logstash.version>7.2</logstash.version>
+		<janino.version>3.1.9</janino.version>
+		<jsonwebtoken.version>0.11.5</jsonwebtoken.version>
+		<snakeyaml.version>1.33</snakeyaml.version>
+<!--		<lombok.version>1.18.20</lombok.version>-->
 
-		<springdoc.version>1.3.6</springdoc.version>
-		<jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
+		<springdoc.version>1.6.14</springdoc.version>
+		<jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
 		<reproducible-build-maven-plugin.version>0.12</reproducible-build-maven-plugin.version>
 
 		<maven.javadoc.skip>true</maven.javadoc.skip>
@@ -146,27 +148,33 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>${lombok.version}</version>
+<!--			<version>${lombok.version}</version>-->
 		</dependency>
 
 		<dependency>
 			<groupId>io.jsonwebtoken</groupId>
 			<artifactId>jjwt-api</artifactId>
-			<version>0.11.1</version>
+			<version>${jsonwebtoken.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>io.jsonwebtoken</groupId>
 			<artifactId>jjwt-impl</artifactId>
-			<version>0.11.1</version>
+			<version>${jsonwebtoken.version}</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>io.jsonwebtoken</groupId>
 			<artifactId>jjwt-jackson</artifactId>
-			<version>0.11.1</version>
+			<version>${jsonwebtoken.version}</version>
 			<scope>runtime</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.yaml</groupId>
+			<artifactId>snakeyaml</artifactId>
+			<version>${snakeyaml.version}</version>
+		</dependency>
+
 		<!-- test Dependencies -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/src/test/java/ch/admin/bag/covidcode/authcodegeneration/testutil/KeyPairTestUtil.java b/src/test/java/ch/admin/bag/covidcode/authcodegeneration/testutil/KeyPairTestUtil.java
index e3d4c74..ebccfd4 100644
--- a/src/test/java/ch/admin/bag/covidcode/authcodegeneration/testutil/KeyPairTestUtil.java
+++ b/src/test/java/ch/admin/bag/covidcode/authcodegeneration/testutil/KeyPairTestUtil.java
@@ -42,7 +42,7 @@ public String getJwks() throws NoSuchAlgorithmException, InvalidKeySpecException
                 .keyUse(KeyUse.SIGNATURE)
                 .algorithm(JWSAlgorithm.RS256)
                 .keyID(KEY_ID);
-        return new JWKSet(builder.build()).toJSONObject().toJSONString();
+        return new JWKSet(builder.build()).toString();
     }
 
     private KeyPair getKeyPair() throws NoSuchAlgorithmException {