From e92b06e027f970c9b09f10b624481f6dbc40f308 Mon Sep 17 00:00:00 2001
From: Alexander Suter <alexander.suter@axonivy.com>
Date: Wed, 1 Nov 2023 22:06:58 +0100
Subject: [PATCH 1/3] Upgrade to maven 3.9.5

---
 Dockerfile           | 2 +-
 docker-entrypoint.sh | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)
 delete mode 100644 docker-entrypoint.sh

diff --git a/Dockerfile b/Dockerfile
index dfd5e9f86..4ccf7ae07 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM maven:3.8.6-eclipse-temurin-17
+FROM maven:3.9.5-eclipse-temurin-17
 
 # add an user with 1000 for the build in jenkins
 RUN addgroup --gid 1000 build && adduser --uid 1000 --gid 1000 --disabled-password --gecos "" build
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
deleted file mode 100644
index d37738d5a..000000000
--- a/docker-entrypoint.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-/opt/bin/start-xvfb.sh & exec "$@"

From 14cc4a1fc3bb34bf55230068b4ba3522c7f89383 Mon Sep 17 00:00:00 2001
From: Alexander Suter <alexander.suter@axonivy.com>
Date: Wed, 1 Nov 2023 23:04:05 +0100
Subject: [PATCH 2/3] Use latest commons-lang3 to have no clashes with dep
 hierarchy

---
 connectivity/connectivity-demos-test/pom.xml | 10 ++++++++++
 workflow/workflow-demos-test/pom.xml         | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/connectivity/connectivity-demos-test/pom.xml b/connectivity/connectivity-demos-test/pom.xml
index ab111f895..ee3fe1f90 100644
--- a/connectivity/connectivity-demos-test/pom.xml
+++ b/connectivity/connectivity-demos-test/pom.xml
@@ -93,6 +93,16 @@
       <version>4.2.0</version>
       <scope>test</scope>
     </dependency>
+
+    <!-- fix this version. because axon ivy engine is using commons.text 1.11.0 which
+        requires commons.lang3 3.13.0. but this maven dependency hierarchy includes an older
+        version -->
+    <dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.13.0</version>
+      <scope>test</scope>
+		</dependency>
   </dependencies>
 
   <build>
diff --git a/workflow/workflow-demos-test/pom.xml b/workflow/workflow-demos-test/pom.xml
index 5e61c9120..f41f3c0b3 100644
--- a/workflow/workflow-demos-test/pom.xml
+++ b/workflow/workflow-demos-test/pom.xml
@@ -37,6 +37,16 @@
       <version>${web.tester.version}</version>
       <scope>test</scope>
     </dependency>
+
+    <!-- fix this version. because axon ivy engine is using commons.text 1.11.0 which
+        requires commons.lang3 3.13.0. but this maven dependency hierarchy includes an older
+        version -->
+    <dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.13.0</version>
+      <scope>test</scope>
+		</dependency>
   </dependencies>
 
   <build>

From 48fbc0ecd2fb379ede1ba9b427f641bea47251ab Mon Sep 17 00:00:00 2001
From: Alexander Suter <alexander.suter@axonivy.com>
Date: Wed, 1 Nov 2023 23:12:48 +0100
Subject: [PATCH 3/3] Fix formatting

---
 connectivity/connectivity-demos-test/pom.xml | 8 ++++----
 workflow/workflow-demos-test/pom.xml         | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/connectivity/connectivity-demos-test/pom.xml b/connectivity/connectivity-demos-test/pom.xml
index ee3fe1f90..1fc38f53d 100644
--- a/connectivity/connectivity-demos-test/pom.xml
+++ b/connectivity/connectivity-demos-test/pom.xml
@@ -98,11 +98,11 @@
         requires commons.lang3 3.13.0. but this maven dependency hierarchy includes an older
         version -->
     <dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>3.13.0</version>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.13.0</version>
       <scope>test</scope>
-		</dependency>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/workflow/workflow-demos-test/pom.xml b/workflow/workflow-demos-test/pom.xml
index f41f3c0b3..0f2a6b7d8 100644
--- a/workflow/workflow-demos-test/pom.xml
+++ b/workflow/workflow-demos-test/pom.xml
@@ -42,11 +42,11 @@
         requires commons.lang3 3.13.0. but this maven dependency hierarchy includes an older
         version -->
     <dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>3.13.0</version>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.13.0</version>
       <scope>test</scope>
-		</dependency>
+    </dependency>
   </dependencies>
 
   <build>