This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch SUREFIRE-2226
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 574c3564801fc1004257992d3260995504e9d955
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Sat Dec 30 21:15:48 2023 +0100
[SUREFIRE-2226] Upgrade to Maven Verifier 2.0.0-M1
---
pom.xml | 2 +-
surefire-its/pom.xml | 6 ++++++
.../surefire/its/JUnit47RerunFailingTestWithCucumberIT.java | 2 +-
.../org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java | 2 +-
.../maven/surefire/its/JUnitPlatformStreamCorruptionIT.java | 2 +-
.../maven/surefire/its/MultiModuleProjectWithJPMSIT.java | 2 +-
.../test/java/org/apache/maven/surefire/its/PojoSimpleIT.java | 2 +-
.../test/java/org/apache/maven/surefire/its/RunOrderIT.java | 2 +-
.../java/org/apache/maven/surefire/its/Surefire1602IT.java | 2 +-
.../java/org/apache/maven/surefire/its/WorkingDirectoryIT.java | 2 +-
.../maven/surefire/its/fixture/FailsafeOutputValidator.java | 2 +-
.../org/apache/maven/surefire/its/fixture/MavenLauncher.java | 10 +++++-----
.../org/apache/maven/surefire/its/fixture/OutputValidator.java | 4 ++--
.../apache/maven/surefire/its/fixture/SurefireLauncher.java | 2 +-
.../its/jiras/Surefire1082ParallelJUnitParameterizedIT.java | 2 +-
.../surefire/its/jiras/Surefire1098BalancedRunOrderIT.java | 2 +-
.../surefire/its/jiras/Surefire1177TestngParallelSuitesIT.java | 2 +-
.../surefire/its/jiras/Surefire1185DoNotSpawnTestsIT.java | 2 +-
.../surefire/its/jiras/Surefire1209RerunAndForkCountIT.java | 2 +-
.../its/jiras/Surefire1383ScanSessionDependenciesIT.java | 2 +-
.../its/jiras/Surefire1426JvmCrashShouldNotBeIgnoredIT.java | 2 +-
.../surefire/its/jiras/Surefire1535TestNGParallelSuitesIT.java | 2 +-
.../surefire/its/jiras/Surefire1993JpmsProvidingModulesIT.java | 2 +-
.../org/apache/maven/surefire/its/jiras/Surefire2065IT.java | 2 +-
.../Surefire2095FailsafeJvmCrashShouldNotBeIgnoredIT.java | 2 +-
.../its/jiras/Surefire649EmptyStringSystemPropertiesIT.java | 2 +-
.../jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java | 2 +-
.../its/jiras/Surefire747MethodParallelWithSuiteCountIT.java | 2 +-
.../surefire/its/jiras/Surefire772NoFailsafeReportsIT.java | 2 +-
.../surefire/its/jiras/Surefire995CategoryInheritanceIT.java | 2 +-
30 files changed, 40 insertions(+), 34 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8f08f2027..f1acd3416 100644
--- a/pom.xml
+++ b/pom.xml
@@ -229,7 +229,7 @@
<!-- Do not upgrade, needs code changes -->
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-verifier</artifactId>
- <version>1.8.0</version>
+ <version>2.0.0-M1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml
index 9a8cb1523..b289b252d 100644
--- a/surefire-its/pom.xml
+++ b/surefire-its/pom.xml
@@ -53,6 +53,12 @@
<artifactId>maven-verifier</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47RerunFailingTestWithCucumberIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47RerunFailingTestWithCucumberIT.java
index 5857c242b..a893c3587 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47RerunFailingTestWithCucumberIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47RerunFailingTestWithCucumberIT.java
@@ -20,7 +20,7 @@ package org.apache.maven.surefire.its;
import java.util.ArrayList;
-import org.apache.maven.it.VerificationException;
+import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.junit.Test;
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java
index 38eb553d0..8f3fc3b66 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java
@@ -21,7 +21,7 @@ package org.apache.maven.surefire.its;
import java.util.ArrayList;
import java.util.List;
-import org.apache.maven.it.VerificationException;
+import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.junit.Test;
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformStreamCorruptionIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformStreamCorruptionIT.java
index f8370d5f6..fb8ad43d5 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformStreamCorruptionIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformStreamCorruptionIT.java
@@ -20,7 +20,7 @@ package org.apache.maven.surefire.its;
import java.util.List;
-import org.apache.maven.it.VerificationException;
+import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.junit.Ignore;
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/MultiModuleProjectWithJPMSIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/MultiModuleProjectWithJPMSIT.java
index d92883399..3bab707ca 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/MultiModuleProjectWithJPMSIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/MultiModuleProjectWithJPMSIT.java
@@ -20,7 +20,7 @@ package org.apache.maven.surefire.its;
import java.util.List;
-import org.apache.maven.it.VerificationException;
+import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.surefire.its.fixture.AbstractJava9PlusIT;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.junit.Test;
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
index d768e44ba..96780f8a3 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.maven.surefire.its;
-import org.apache.maven.it.VerificationException;
+import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.junit.Test;
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java
index 58dea5018..fe046eb2b 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java
@@ -21,7 +21,7 @@ package org.apache.maven.surefire.its;
import java.util.Arrays;
import java.util.Calendar;
-import org.apache.maven.it.VerificationException;
+import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/Surefire1602IT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/Surefire1602IT.java
index 6057da852..90443f61b 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/Surefire1602IT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/Surefire1602IT.java
@@ -18,7 +18,7 @@
*/
package org.apache.maven.surefire.its;
-import org.apache.maven.it.VerificationException;
+import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.junit.Test;
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
index e216dfafb..d7a7c3a9d 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
@@ -23,7 +23,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.util.Properties;
-import org.apache.maven.it.VerificationException;
+import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/FailsafeOutputValidator.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/FailsafeOutputValidator.java
index 5b1da9de6..3446a54cf 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/FailsafeOutputValidator.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/FailsafeOutputValidator.java
@@ -18,7 +18,7 @@
*/
package org.apache.maven.surefire.its.fixture;
-import org.apache.maven.it.VerificationException;
+import org.apache.maven.shared.verifier.VerificationException;
/**
*
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 55cc0b6b4..7d3ec96fa 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
@@ -29,10 +29,10 @@ import java.util.ListIterator;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
import org.apache.maven.shared.utils.io.FileUtils;
+import org.apache.maven.shared.verifier.VerificationException;
+import org.apache.maven.shared.verifier.Verifier;
+import org.apache.maven.shared.verifier.util.ResourceExtractor;
import static java.util.Collections.singletonMap;
import static java.util.Collections.unmodifiableList;
@@ -221,7 +221,7 @@ public final class MavenLauncher {
String goal = it.next();
if (goal.equals(sysPropKey) ||
goal.startsWith(sysPropStarter)) {
System.out.printf(
- "[WARNING] System property already exists '%s'.
Overriding to '%s'.\n", goal, newGoal);
+ "[WARNING] System property already exists '%s'.
Overriding to '%s'.%n", goal, newGoal);
it.set(newGoal);
return;
}
@@ -242,7 +242,7 @@ public final class MavenLauncher {
}
}
if (expectFailure) {
- throw new RuntimeException("Expecting build failure, got none!");
+ throw new RuntimeException("Expecting build failure, have got
none!");
}
return verify;
}
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
index 42819c5d8..bfd223571 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
@@ -26,8 +26,8 @@ import java.util.Arrays;
import java.util.List;
import org.apache.commons.io.FileUtils;
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.VerificationException;
+import org.apache.maven.shared.verifier.Verifier;
import org.hamcrest.Matcher;
import static java.nio.charset.StandardCharsets.UTF_8;
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
index 2df39a478..a898ef45b 100755
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
@@ -22,7 +22,7 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import org.apache.maven.it.VerificationException;
+import org.apache.maven.shared.verifier.VerificationException;
/**
* Encapsulate all needed features to start a surefire run
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
index f962337bf..45042aec4 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
@@ -22,7 +22,7 @@ import java.util.Collection;
import java.util.Set;
import java.util.TreeSet;
-import org.apache.maven.it.VerificationException;
+import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java
index 996fab9a2..1fe4488fb 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java
@@ -23,7 +23,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import org.apache.maven.it.VerificationException;
+import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1177TestngParallelSuitesIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1177TestngParallelSuitesIT.java
index 4acc62f36..a468a816f 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1177TestngParallelSuitesIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1177TestngParallelSuitesIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.maven.surefire.its.jiras;
-import org.apache.maven.it.VerificationException;
+import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1185DoNotSpawnTestsIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1185DoNotSpawnTestsIT.java
index 6ea4db316..cd9649be6 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1185DoNotSpawnTestsIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1185DoNotSpawnTestsIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.maven.surefire.its.jiras;
-import org.apache.maven.it.VerificationException;
+import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.junit.Test;
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java
index 3b260845c..010ccf344 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.maven.surefire.its.jiras;
-import org.apache.maven.it.VerificationException;
+import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.junit.Test;
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1383ScanSessionDependenciesIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1383ScanSessionDependenciesIT.java
index 344241ac5..c2b0ec001 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1383ScanSessionDependenciesIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1383ScanSessionDependenciesIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.maven.surefire.its.jiras;
-import org.apache.maven.it.VerificationException;
+import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.junit.Test;
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1426JvmCrashShouldNotBeIgnoredIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1426JvmCrashShouldNotBeIgnoredIT.java
index c6b9195f8..4e2c89c9c 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1426JvmCrashShouldNotBeIgnoredIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1426JvmCrashShouldNotBeIgnoredIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.maven.surefire.its.jiras;
-import org.apache.maven.it.VerificationException;
+import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.junit.Test;
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1535TestNGParallelSuitesIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1535TestNGParallelSuitesIT.java
index 9868caa6e..82f9fa19c 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1535TestNGParallelSuitesIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1535TestNGParallelSuitesIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.maven.surefire.its.jiras;
-import org.apache.maven.it.VerificationException;
+import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1993JpmsProvidingModulesIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1993JpmsProvidingModulesIT.java
index 4172ef8dc..b59f680f4 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1993JpmsProvidingModulesIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1993JpmsProvidingModulesIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.maven.surefire.its.jiras;
-import org.apache.maven.it.VerificationException;
+import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.junit.Before;
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire2065IT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire2065IT.java
index 59447ba97..95a923fd7 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire2065IT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire2065IT.java
@@ -18,7 +18,7 @@
*/
package org.apache.maven.surefire.its.jiras;
-import org.apache.maven.it.VerificationException;
+import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.hamcrest.Matchers;
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire2095FailsafeJvmCrashShouldNotBeIgnoredIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire2095FailsafeJvmCrashShouldNotBeIgnoredIT.java
index c1bf85805..8004979ad 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire2095FailsafeJvmCrashShouldNotBeIgnoredIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire2095FailsafeJvmCrashShouldNotBeIgnoredIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.maven.surefire.its.jiras;
-import org.apache.maven.it.VerificationException;
+import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.junit.Test;
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire649EmptyStringSystemPropertiesIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire649EmptyStringSystemPropertiesIT.java
index b97052f08..e0108dfa9 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire649EmptyStringSystemPropertiesIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire649EmptyStringSystemPropertiesIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.maven.surefire.its.jiras;
-import org.apache.maven.it.VerificationException;
+import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java
index 201e9348e..38bdeff1c 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java
@@ -22,7 +22,7 @@ import java.io.File;
import java.io.FilenameFilter;
import java.util.Collection;
-import org.apache.maven.it.VerificationException;
+import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java
index 122071331..cb40accc5 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java
@@ -24,7 +24,7 @@ import java.util.Iterator;
import java.util.Set;
import java.util.TreeSet;
-import org.apache.maven.it.VerificationException;
+import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
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 adce8ef2f..a8a9bd7b7 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
@@ -18,7 +18,7 @@
*/
package org.apache.maven.surefire.its.jiras;
-import org.apache.maven.it.VerificationException;
+import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
diff --git
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire995CategoryInheritanceIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire995CategoryInheritanceIT.java
index 831950854..a6d5fcd5c 100644
---
a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire995CategoryInheritanceIT.java
+++
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire995CategoryInheritanceIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.maven.surefire.its.jiras;
-import org.apache.maven.it.VerificationException;
+import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
