From 2246ea06cdc7da1e940bffc34991f16fb97b5828 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Mon, 1 Jan 2024 10:53:38 +0100
Subject: [PATCH 1/4] Upgrades Mockito to ver 5.8.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a3c5154ef..624b853f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -921,7 +921,7 @@
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
-                <version>4.3.1</version>
+                <version>5.8.0</version>
                 <scope>test</scope>
             </dependency>
 

From 91fd7d0f209978f9bfeb310aea2b70c3379410e4 Mon Sep 17 00:00:00 2001
From: Kusal Kithul-Godage <git@kusal.io>
Date: Tue, 2 Jan 2024 18:19:02 +1100
Subject: [PATCH 2/4] Dependency manage byte-buddy

---
 pom.xml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 624b853f3..d0af609c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,6 +122,8 @@
         <freemarker.version>2.3.32</freemarker.version>
         <sitemesh.version>2.5.0</sitemesh.version>
         <velocity-tools.version>3.1</velocity-tools.version>
+        <mockito.version>5.8.0</mockito.version>
+        <byte-buddy.version>1.14.11</byte-buddy.version>
 
         <!-- Site generation -->
         <fluido-skin.version>1.9</fluido-skin.version>
@@ -921,7 +923,19 @@
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
-                <version>5.8.0</version>
+                <version>${mockito.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${byte-buddy.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy-agent</artifactId>
+                <version>${byte-buddy.version}</version>
                 <scope>test</scope>
             </dependency>
 

From 59992ba015459dc8acf3c5f159a23c426165b7be Mon Sep 17 00:00:00 2001
From: Kusal Kithul-Godage <git@kusal.io>
Date: Tue, 2 Jan 2024 19:16:30 +1100
Subject: [PATCH 3/4] Alphabetise dependency version props

---
 pom.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index d0af609c9..0e7ce73df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,20 +110,20 @@
 
         <!-- dependency versions in alphanumeric order -->
         <asm.version>9.6</asm.version>
+        <byte-buddy.version>1.14.11</byte-buddy.version>
+        <freemarker.version>2.3.32</freemarker.version>
+        <hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
         <jackson.version>2.16.0</jackson.version>
         <log4j2.version>2.20.0</log4j2.version>
+        <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
+        <mockito.version>5.8.0</mockito.version>
         <ognl.version>3.3.4</ognl.version>
+        <sitemesh.version>2.5.0</sitemesh.version>
         <slf4j.version>2.0.9</slf4j.version>
         <spring.platformVersion>6.0.13</spring.platformVersion>
         <tiles.version>3.0.8</tiles.version>
         <tiles-request.version>1.0.7</tiles-request.version>
-        <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
-        <hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
-        <freemarker.version>2.3.32</freemarker.version>
-        <sitemesh.version>2.5.0</sitemesh.version>
         <velocity-tools.version>3.1</velocity-tools.version>
-        <mockito.version>5.8.0</mockito.version>
-        <byte-buddy.version>1.14.11</byte-buddy.version>
 
         <!-- Site generation -->
         <fluido-skin.version>1.9</fluido-skin.version>

From 89a4580f8277c3f266713acab217eadd71d97455 Mon Sep 17 00:00:00 2001
From: Kusal Kithul-Godage <git@kusal.io>
Date: Tue, 2 Jan 2024 19:39:42 +1100
Subject: [PATCH 4/4] Upgrade Maven Surefire version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0e7ce73df..3d75c51d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,7 @@
         <hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
         <jackson.version>2.16.0</jackson.version>
         <log4j2.version>2.20.0</log4j2.version>
-        <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
         <mockito.version>5.8.0</mockito.version>
         <ognl.version>3.3.4</ognl.version>
         <sitemesh.version>2.5.0</sitemesh.version>