From d499b57002110067a5e25453dd2aa7d2f846a8c8 Mon Sep 17 00:00:00 2001
From: singingbush <singingbush@hotmail.com>
Date: Mon, 13 Nov 2023 13:32:24 +0000
Subject: [PATCH 1/2] Update unit test dependencies (Junit Vintage)

---
 fop-core/pom.xml                                    | 13 ++++++++++---
 .../render/intermediate/BorderPainterTestCase.java  |  6 +++---
 fop-events/pom.xml                                  |  6 ++++++
 fop-sandbox/pom.xml                                 |  6 ++++++
 fop-transcoder-allinone/pom.xml                     |  6 ++++++
 fop-transcoder/pom.xml                              |  6 ++++++
 fop-util/pom.xml                                    |  6 ++++++
 fop/pom.xml                                         |  6 ++++++
 pom.xml                                             |  7 ++++---
 9 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/fop-core/pom.xml b/fop-core/pom.xml
index d1e1a2f650b..c3914c16900 100644
--- a/fop-core/pom.xml
+++ b/fop-core/pom.xml
@@ -139,18 +139,25 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <version>${junit4.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>2.28.2</version>
+      <version>4.11.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>xmlunit</groupId>
-      <artifactId>xmlunit</artifactId>
+      <groupId>org.xmlunit</groupId>
+      <artifactId>xmlunit-legacy</artifactId>
       <version>${xmlunit.version}</version>
       <scope>test</scope>
     </dependency>
diff --git a/fop-core/src/test/java/org/apache/fop/render/intermediate/BorderPainterTestCase.java b/fop-core/src/test/java/org/apache/fop/render/intermediate/BorderPainterTestCase.java
index 4a89b3ac6ac..986b9404903 100644
--- a/fop-core/src/test/java/org/apache/fop/render/intermediate/BorderPainterTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/intermediate/BorderPainterTestCase.java
@@ -30,7 +30,7 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 
 import org.apache.fop.fo.Constants;
 import org.apache.fop.traits.BorderProps;
@@ -96,7 +96,7 @@ public void testDrawRectangularBordersWithNullBorders() throws IOException, IFEx
         BorderProps nullBorderProps = null;
         new BorderPainter(graphicsPainter).drawRectangularBorders(new Rectangle(0, 0, 1000, 1000),
                 nullBorderProps, nullBorderProps, nullBorderProps, nullBorderProps);
-        verifyZeroInteractions(graphicsPainter);
+        verifyNoInteractions(graphicsPainter);
     }
 
     @Test
@@ -119,7 +119,7 @@ public void testDrawRoundedBordersWithNullBorders() throws IOException, IFExcept
         BorderProps nullBorderProps = null;
         new BorderPainter(graphicsPainter).drawRoundedBorders(new Rectangle(0, 0, 1000, 1000),
                 nullBorderProps, nullBorderProps, nullBorderProps, nullBorderProps);
-        verifyZeroInteractions(graphicsPainter);
+        verifyNoInteractions(graphicsPainter);
     }
 
     @Test
diff --git a/fop-events/pom.xml b/fop-events/pom.xml
index a7a6d2d0e1e..eea9968febe 100644
--- a/fop-events/pom.xml
+++ b/fop-events/pom.xml
@@ -46,6 +46,12 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <version>${junit4.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
diff --git a/fop-sandbox/pom.xml b/fop-sandbox/pom.xml
index 880195c65fc..8d0e9626981 100644
--- a/fop-sandbox/pom.xml
+++ b/fop-sandbox/pom.xml
@@ -24,6 +24,12 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <version>${junit4.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
diff --git a/fop-transcoder-allinone/pom.xml b/fop-transcoder-allinone/pom.xml
index 92dd675410a..0fdfc49ca80 100644
--- a/fop-transcoder-allinone/pom.xml
+++ b/fop-transcoder-allinone/pom.xml
@@ -44,6 +44,12 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <version>${junit4.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
diff --git a/fop-transcoder/pom.xml b/fop-transcoder/pom.xml
index 2ef6f7fc776..a6655287172 100644
--- a/fop-transcoder/pom.xml
+++ b/fop-transcoder/pom.xml
@@ -34,6 +34,12 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <version>${junit4.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
diff --git a/fop-util/pom.xml b/fop-util/pom.xml
index 33fc903c3e8..987fbcaabf3 100644
--- a/fop-util/pom.xml
+++ b/fop-util/pom.xml
@@ -24,6 +24,12 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <version>${junit4.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
diff --git a/fop/pom.xml b/fop/pom.xml
index 5845e1f2c49..ae69eed44e0 100644
--- a/fop/pom.xml
+++ b/fop/pom.xml
@@ -34,6 +34,12 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <version>${junit4.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
diff --git a/pom.xml b/pom.xml
index aa61f80a61c..83b85510658 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,15 +23,16 @@
     <findbugs.plugin.version>4.2.3</findbugs.plugin.version>
     <jar.plugin.version>3.1.1</jar.plugin.version>
     <java.version>8</java.version>
-    <junit.version>4.11</junit.version>
+    <junit4.version>4.13.2</junit4.version>
+    <junit.version>5.10.1</junit.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.info.reports.plugin.version>2.8</project.info.reports.plugin.version>
     <release.plugin.version>2.5.2</release.plugin.version>
-    <surefire.plugin.version>2.18.1</surefire.plugin.version>
+    <surefire.plugin.version>3.2.2</surefire.plugin.version>
     <war.plugin.version>3.3.2</war.plugin.version>
     <xml.plugin.version>1.0.1</xml.plugin.version>
     <xmlgraphics.commons.version>2.9.0-SNAPSHOT</xmlgraphics.commons.version>
-    <xmlunit.version>1.2</xmlunit.version>
+    <xmlunit.version>2.9.1</xmlunit.version>
     <jdk.path>${env.JAVA_HOME}</jdk.path>
   </properties>
 

From 62897b47bb342241ba16e7b37ab20f79d853d052 Mon Sep 17 00:00:00 2001
From: singingbush <singingbush@hotmail.com>
Date: Fri, 9 Feb 2024 00:49:53 +0000
Subject: [PATCH 2/2] update junit to 5.10.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 83b85510658..3d3d810729c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,11 +24,11 @@
     <jar.plugin.version>3.1.1</jar.plugin.version>
     <java.version>8</java.version>
     <junit4.version>4.13.2</junit4.version>
-    <junit.version>5.10.1</junit.version>
+    <junit.version>5.10.2</junit.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.info.reports.plugin.version>2.8</project.info.reports.plugin.version>
     <release.plugin.version>2.5.2</release.plugin.version>
-    <surefire.plugin.version>3.2.2</surefire.plugin.version>
+    <surefire.plugin.version>3.2.5</surefire.plugin.version>
     <war.plugin.version>3.3.2</war.plugin.version>
     <xml.plugin.version>1.0.1</xml.plugin.version>
     <xmlgraphics.commons.version>2.9.0-SNAPSHOT</xmlgraphics.commons.version>