From 88c1e12c56a092a8d9cb10f465ad651633988f76 Mon Sep 17 00:00:00 2001
From: Nils Ove Tendenes <nils.ove@tendenes.com>
Date: Wed, 4 Sep 2024 12:42:44 +0200
Subject: [PATCH] chore: update dependencies

---
 Dockerfile                                    |  2 +-
 pom.xml                                       | 30 +++++++++----------
 .../dataset/preview/service/PreviewService.kt |  8 ++++-
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6a3c172..cf0f001 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ COPY src ./src
 RUN mvn clean package --no-transfer-progress -DskipTests
 RUN mvn versions:display-dependency-updates --no-transfer-progress
 
-FROM eclipse-temurin:17-jre
+FROM eclipse-temurin:17-jre-jammy
 ENV TZ=Europe/Oslo
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 WORKDIR /app
diff --git a/pom.xml b/pom.xml
index 5eb409b..d5c138f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.2.3</version>
+        <version>3.3.3</version>
         <relativePath/>
     </parent>
 
@@ -24,9 +24,9 @@
         <maven.compiler.source>${java.release}</maven.compiler.source>
         <maven.compiler.target>${java.release}</maven.compiler.target>
 
-        <kotlin.version>1.9.23</kotlin.version>
-        <jena.version>4.9.0</jena.version>
-        <jackson.version>2.17.0</jackson.version>
+        <kotlin.version>2.0.20</kotlin.version>
+        <jena.version>5.1.0</jena.version>
+        <jackson.version>2.17.2</jackson.version>
     </properties>
 
     <dependencies>
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>net.logstash.logback</groupId>
             <artifactId>logstash-logback-encoder</artifactId>
-            <version>7.4</version>
+            <version>8.0</version>
         </dependency>
 
         <dependency>
@@ -95,25 +95,25 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-csv</artifactId>
-            <version>1.10.0</version>
+            <version>1.11.0</version>
         </dependency>
 
         <!-- Excel -->
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>5.2.3</version>
+            <version>5.3.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>5.2.3</version>
+            <version>5.3.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-core</artifactId>
-            <version>2.9.1</version>
+            <version>2.9.2</version>
         </dependency>
 
         <!-- Test -->
@@ -131,13 +131,13 @@
         <dependency>
             <groupId>org.mockito.kotlin</groupId>
             <artifactId>mockito-kotlin</artifactId>
-            <version>5.1.0</version>
+            <version>5.4.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.wiremock</groupId>
             <artifactId>wiremock-standalone</artifactId>
-            <version>3.4.2</version>
+            <version>3.9.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -155,7 +155,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.13.0</version>
+            <version>2.16.1</version>
             <scope>compile</scope>
         </dependency>
 
@@ -172,7 +172,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>3.6.0</version>
                 <executions>
                     <execution>
                         <id>add-source</id>
@@ -224,7 +224,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.1.2</version>
+                <version>3.5.0</version>
                 <configuration>
                     <useSystemClassLoader>false</useSystemClassLoader>
                     <groups>unit</groups>
@@ -237,7 +237,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.1.2</version>
+                <version>3.5.0</version>
                 <configuration>
                     <groups>integration</groups>
                     <excludedGroups>unit</excludedGroups>
diff --git a/src/main/kotlin/no/fdk/dataset/preview/service/PreviewService.kt b/src/main/kotlin/no/fdk/dataset/preview/service/PreviewService.kt
index 4c5d12d..9ecbf8c 100644
--- a/src/main/kotlin/no/fdk/dataset/preview/service/PreviewService.kt
+++ b/src/main/kotlin/no/fdk/dataset/preview/service/PreviewService.kt
@@ -16,6 +16,7 @@ import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
+import java.io.IOException
 import java.io.InputStream
 import java.io.InputStreamReader
 import java.nio.charset.Charset
@@ -157,7 +158,12 @@ class PreviewService(
                 zipEntry = zis.nextEntry
             }
         } finally {
-            zis.closeEntry()
+            try {
+                zis.closeEntry()
+            } catch (ex: IOException) {
+                // Ignore if reason is already closed zipEntry-stream
+                if (ex.message != "Stream closed") throw ex
+            }
             zis.close()
         }