From 5ff5a4045b83b6ec6a47f028133c18d6a9c7cfff Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Mon, 4 Apr 2022 22:07:06 +0200
Subject: [PATCH] [SUREFIRE-2044] Upgrade Maven Verifier to 1.8.0

---
 pom.xml                                              | 12 +-----------
 .../maven/surefire/its/fixture/MavenLauncher.java    |  4 ++--
 .../its/jiras/Surefire772NoFailsafeReportsIT.java    |  2 +-
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index ca0d8387d9..b36cd51f3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -230,17 +230,7 @@
       <dependency>
         <groupId>org.apache.maven.shared</groupId>
         <artifactId>maven-verifier</artifactId>
-        <version>1.7.2</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.apache.maven.shared</groupId>
-            <artifactId>maven-shared-utils</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-          </exclusion>
-        </exclusions>
+        <version>1.8.0</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
index 8dc2465f45..9b484b518b 100755
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
@@ -186,9 +186,9 @@ public MavenLauncher addEnvVar( String key, String value )
         return this;
     }
 
-    public MavenLauncher assertNotPresent( String subFile )
+    public MavenLauncher verifyFileNotPresent( String subFile ) throws VerificationException
     {
-        getVerifier().assertFileNotPresent( getValidator().getSubFile( subFile ).getAbsolutePath() );
+        getVerifier().verifyFileNotPresent( getValidator().getSubFile( subFile ).getAbsolutePath() );
         return this;
     }
 
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java
index 98dd5121f5..9ae8f4aa70 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java
@@ -104,7 +104,7 @@ private SurefireLauncher unpack()
         throws VerificationException, IOException
     {
         final SurefireLauncher unpack = unpack( "surefire-772-no-failsafe-reports" );
-        unpack.maven().deleteSiteDir().skipClean().failNever().assertNotPresent( "site" );
+        unpack.maven().deleteSiteDir().skipClean().failNever().verifyFileNotPresent( "site" );
         return unpack;
     }