Merge 62897b47bb into 12547d7b66

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>

fop-core/src/test/java/org/apache/fop/render/intermediate/BorderPainterTestCase.java

@@ -30,7 +30,7 @@ import static org.mockito.Mockito.mock;
 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 class BorderPainterTestCase {
         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 class BorderPainterTestCase {
         BorderProps nullBorderProps = null;
         new BorderPainter(graphicsPainter).drawRoundedBorders(new Rectangle(0, 0, 1000, 1000),
                 nullBorderProps, nullBorderProps, nullBorderProps, nullBorderProps);
-        verifyZeroInteractions(graphicsPainter);
+        verifyNoInteractions(graphicsPainter);
     }
 
     @Test

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>

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>

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>

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>

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>

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>

pom.xml

@@ -23,15 +23,16 @@
     <findbugs.plugin.version>4.7.3.6</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.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>2.18.1</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>
-    <xmlunit.version>1.2</xmlunit.version>
+    <xmlunit.version>2.9.1</xmlunit.version>
     <jdk.path>${env.JAVA_HOME}</jdk.path>
   </properties>