From 1188d9d5543a322b87fcf31ce86f416d9c6eb26f Mon Sep 17 00:00:00 2001
From: Bert Scholten <bscholten@dat.nl>
Date: Wed, 29 Jan 2025 17:34:05 +0100
Subject: [PATCH 1/3] Updating dependencies

Also switched to java 21. Not sure if this holds for the client library, might have to switch target to 17 there if we want to use it in 'older' projects, but lets go for 21 first.
---
 source/Dockerfile                 |  4 ++--
 source/file-server-client/pom.xml |  2 ++
 source/pom.xml                    | 11 ++++-------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/source/Dockerfile b/source/Dockerfile
index 065d208..2789a4e 100644
--- a/source/Dockerfile
+++ b/source/Dockerfile
@@ -1,5 +1,5 @@
 # Builder part for maven packaging.
-FROM maven:3-eclipse-temurin-17 as builder
+FROM maven:3-eclipse-temurin-21 as builder
 
 WORKDIR /app
 
@@ -17,7 +17,7 @@ FROM debian:bullseye
 
 # Get java from eclipse-temurin image (could perhaps do something with jlink later on)
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME
 ENV PATH "${JAVA_HOME}/bin:${PATH}"
 
 # Set defaults
diff --git a/source/file-server-client/pom.xml b/source/file-server-client/pom.xml
index 7f3466a..f79d402 100644
--- a/source/file-server-client/pom.xml
+++ b/source/file-server-client/pom.xml
@@ -50,11 +50,13 @@
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
+      <version>${okhttp.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>mockwebserver</artifactId>
+      <version>${okhttp.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/source/pom.xml b/source/pom.xml
index 780bf79..0bc0bd8 100644
--- a/source/pom.xml
+++ b/source/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>nl.aerius</groupId>
     <artifactId>aerius-root-pom</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath /> <!-- lookup parent from repository -->
   </parent>
   <packaging>pom</packaging>
@@ -35,15 +35,12 @@
   <description>The file server Parent</description>
 
   <properties>
-    <java.version>17</java.version>
+    <java.version>21</java.version>
 
-    <amazons3.version>2.20.56</amazons3.version>
+    <amazons3.version>2.30.7</amazons3.version>
+    <okhttp.version>4.12.0</okhttp.version>
 
     <sonar.projectKey>aerius_file-server</sonar.projectKey>
-    <sonar.moduleKey>${project.artifactId}</sonar.moduleKey>
-    <sonar.organization>aerius</sonar.organization>
-    <sonar.host.url>https://sonarcloud.io</sonar.host.url>
-    <sonar.java.pmd.reportPaths>${project.build.directory}/dependency-check-report-pmd.xml</sonar.java.pmd.reportPaths>
   </properties>
 
   <repositories>

From 3f8898f0b5f5a5c26977ebd4cad1e192c38fb6c2 Mon Sep 17 00:00:00 2001
From: Bert Scholten <bscholten@dat.nl>
Date: Fri, 31 Jan 2025 12:22:49 +0100
Subject: [PATCH 2/3] Adding dependency-check profile

---
 source/pom.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/source/pom.xml b/source/pom.xml
index 0bc0bd8..fb3dbf3 100644
--- a/source/pom.xml
+++ b/source/pom.xml
@@ -77,4 +77,19 @@
     <module>file-server</module>
     <module>file-server-client</module>
   </modules>
+  
+  <profiles>
+    <profile>
+      <id>dependency-check</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.owasp</groupId>
+            <artifactId>dependency-check-maven</artifactId>
+            <inherited>false</inherited>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>

From c7b6228095318adcaa09d4fd376c76e08b5a4093 Mon Sep 17 00:00:00 2001
From: Bert Scholten <bscholten@dat.nl>
Date: Fri, 31 Jan 2025 13:42:38 +0100
Subject: [PATCH 3/3] Removed java.version property

This is already defined in root pom with the exact same value, so not much point in declaring it again.
---
 source/pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/source/pom.xml b/source/pom.xml
index fb3dbf3..4fa839c 100644
--- a/source/pom.xml
+++ b/source/pom.xml
@@ -35,8 +35,6 @@
   <description>The file server Parent</description>
 
   <properties>
-    <java.version>21</java.version>
-
     <amazons3.version>2.30.7</amazons3.version>
     <okhttp.version>4.12.0</okhttp.version>