From 89b1a111cec951a5ccf9c74d1a5bcd56966cdb1c Mon Sep 17 00:00:00 2001
From: Sam Leeflang <sam.leeflang@naturalis.nl>
Date: Fri, 1 Dec 2023 10:41:17 +0100
Subject: [PATCH] Upgrade spring boot and fix trivy issues

---
 .github/workflows/.trivyignore | 10 ----------
 Dockerfile                     |  2 +-
 pom.xml                        | 17 ++---------------
 3 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/.trivyignore b/.github/workflows/.trivyignore
index b069b15..e69de29 100644
--- a/.github/workflows/.trivyignore
+++ b/.github/workflows/.trivyignore
@@ -1,10 +0,0 @@
-# Nov 22
-# Netty issue. Wait for Spring to fix
-CVE-2023-34062
-
-# Nov 22
-# OpenSSL Issues - need to upgrade alpine
-CVE-2023-5363
-CVE-2023-5678
-CVE-2023-5363
-CVE-2023-5678
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index c6312d6..f0e77a9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,4 +16,4 @@ RUN true
 COPY --chown=java:java --from=builder application/application/ ./
 USER 1000
 
-ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
+ENTRYPOINT ["java", "org.springframework.boot.loader.launch.JarLauncher"]
diff --git a/pom.xml b/pom.xml
index 8caad70..8fc2f3e 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.5</version>
+    <version>3.2.0</version>
     <relativePath/> <!-- lookup parent from repository -->
   </parent>
   <groupId>eu.dissco.core</groupId>
@@ -21,7 +21,7 @@
     <jaxb2-maven-plugin.version>3.1.0</jaxb2-maven-plugin.version>
     <jakarta.activation-api.version>2.1.2</jakarta.activation-api.version>
     <jakarta.xml.bind-api.version>4.0.1</jakarta.xml.bind-api.version>
-    <snappy-java.version>1.1.10.5</snappy-java.version>
+    <logback.version>1.4.12</logback.version>
     <mockito-inline.version>5.2.0</mockito-inline.version>
     <testcontainers.version>1.19.0</testcontainers.version>
     <sonar.organization>dissco</sonar.organization>
@@ -52,12 +52,6 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.yaml</groupId>
-          <artifactId>snakeyaml</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
@@ -80,12 +74,6 @@
       <groupId>org.springframework.kafka</groupId>
       <artifactId>spring-kafka</artifactId>
     </dependency>
-    <!-- Overwrite kafka client snappy version as it contains high prio security issues (02-10-2023) -->
-    <dependency>
-      <groupId>org.xerial.snappy</groupId>
-      <artifactId>snappy-java</artifactId>
-      <version>${snappy-java.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-configuration-processor</artifactId>
@@ -165,7 +153,6 @@
       <artifactId>flyway-core</artifactId>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
 
   <build>