From 4584ebbff97a383ddbd6d1d8ce6122e7f7d0d6b0 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Sat, 30 Dec 2023 21:15:48 +0100 Subject: [PATCH] [SUREFIRE-2226] Upgrade to Maven Verifier 2.0.0-M1 --- pom.xml | 2 +- surefire-its/pom.xml | 7 ++++ ...JUnit47RerunFailingTestWithCucumberIT.java | 2 +- .../surefire/its/JUnitPlatformEnginesIT.java | 2 +- .../its/JUnitPlatformStreamCorruptionIT.java | 2 +- .../its/MultiModuleProjectWithJPMSIT.java | 2 +- .../maven/surefire/its/PojoSimpleIT.java | 2 +- .../apache/maven/surefire/its/RunOrderIT.java | 2 +- .../maven/surefire/its/Surefire1602IT.java | 6 ++- .../surefire/its/WorkingDirectoryIT.java | 2 +- .../its/fixture/FailsafeOutputValidator.java | 2 +- .../surefire/its/fixture/MavenLauncher.java | 40 ++++++++----------- .../surefire/its/fixture/OutputValidator.java | 4 +- .../its/fixture/SurefireLauncher.java | 2 +- ...efire1082ParallelJUnitParameterizedIT.java | 2 +- .../jiras/Surefire1098BalancedRunOrderIT.java | 2 +- .../Surefire1177TestngParallelSuitesIT.java | 2 +- .../jiras/Surefire1185DoNotSpawnTestsIT.java | 2 +- .../Surefire1209RerunAndForkCountIT.java | 2 +- ...Surefire1383ScanSessionDependenciesIT.java | 2 +- ...efire1426JvmCrashShouldNotBeIgnoredIT.java | 2 +- .../Surefire1535TestNGParallelSuitesIT.java | 2 +- .../Surefire1993JpmsProvidingModulesIT.java | 2 +- .../surefire/its/jiras/Surefire2065IT.java | 2 +- ...5FailsafeJvmCrashShouldNotBeIgnoredIT.java | 2 +- ...efire649EmptyStringSystemPropertiesIT.java | 2 +- ...35ForkFailWithRedirectConsoleOutputIT.java | 2 +- ...fire747MethodParallelWithSuiteCountIT.java | 2 +- .../jiras/Surefire772NoFailsafeReportsIT.java | 2 +- .../Surefire995CategoryInheritanceIT.java | 2 +- 30 files changed, 56 insertions(+), 53 deletions(-) diff --git a/pom.xml b/pom.xml index 7e50e75b36..af719bb994 100644 --- a/pom.xml +++ b/pom.xml @@ -194,7 +194,7 @@ org.apache.maven.shared maven-verifier - 1.8.0 + 2.0.0-M1 org.codehaus.plexus diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml index e652514481..4e42b55488 100644 --- a/surefire-its/pom.xml +++ b/surefire-its/pom.xml @@ -53,6 +53,12 @@ maven-verifier test + + org.hamcrest + hamcrest + 2.2 + test + org.apache.maven maven-settings @@ -192,6 +198,7 @@ ${skipTests} alphabetical + 1C 1 1C 1 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 5857c242b5..a893c35873 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 @@ 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 4679335141..ba79ccb9ff 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 @@ 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 f8370d5f69..fb8ad43d5d 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 @@ 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 d928833996..3bab707caa 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 @@ 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 d768e44ba5..96780f8a37 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 58dea50180..fe046eb2bb 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 @@ 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 6057da852b..41f9dca4e9 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; @@ -32,7 +32,11 @@ public class Surefire1602IT extends SurefireJUnit4IntegrationTestCase { @Test public void nonCanonicalPath() throws VerificationException { SurefireLauncher launcher = unpack("/surefire-1602"); + launcher.setLogFileName("log-install.txt"); launcher.executeInstall(); + launcher.reset(); + + launcher.setLogFileName("log-test.txt"); launcher.addGoal("--file").addGoal("./integration-tests/pom.xml").executeTest(); launcher.getSubProjectValidator("integration-tests").assertTestSuiteResults(1, 0, 0, 0); } 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 e216dfafb3..d7a7c3a9de 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.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 5b1da9de63..3446a54cf7 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 05c8d8c965..441d449692 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 @@ -23,16 +23,15 @@ import java.net.URL; import java.util.ArrayList; import java.util.HashMap; -import java.util.LinkedHashMap; import java.util.List; import java.util.ListIterator; import java.util.Map; -import java.util.Map.Entry; +import java.util.Properties; -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; @@ -52,7 +51,7 @@ public final class MavenLauncher { private final Map envVars = new HashMap<>(); - private final Map props = new LinkedHashMap<>(); + private final Properties props = new Properties(); private File unpackedAt; @@ -138,6 +137,8 @@ private static StackTraceElement[] getStackTraceElements() { public void reset() { resetGoals(); resetCliOptions(); + verifier = null; + validator = null; } private void resetCliOptions() { @@ -221,7 +222,7 @@ private void writeGoal(String newGoal) { 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 +243,7 @@ private OutputValidator conditionalExec(String goal) { } } if (expectFailure) { - throw new RuntimeException("Expecting build failure, got none!"); + throw new RuntimeException("Expecting build failure, have got none!"); } return verify; } @@ -259,21 +260,14 @@ public OutputValidator execute(String goal) { public OutputValidator executeCurrentGoals() { try { - List goalsAndProps = new ArrayList<>(goals); - - for (Entry e : props.entrySet()) { - String key = e.getKey(); - String val = e.getValue(); - goalsAndProps.add(val == null ? "-D" + key : "-D" + key + "=" + val); - } - - getVerifier().setCliOptions(cliOptions); - getVerifier().executeGoals(goalsAndProps, envVars); + getVerifier().addCliArguments(cliOptions.toArray(new String[0])); + getVerifier().addCliArguments(goals.toArray(new String[] {})); + getVerifier().setSystemProperties(props); + getVerifier().setEnvironmentVariables(envVars); + getVerifier().execute(); return getValidator(); } catch (VerificationException e) { throw new SurefireVerifierException(e.getLocalizedMessage(), e); - } finally { - getVerifier().resetStreams(); } } @@ -399,12 +393,10 @@ String getTestMethodName() { private static Verifier createVerifier(String basedir, String settingsFile, String[] defaultCliOptions) throws VerificationException { - Verifier verifier = defaultCliOptions == null + + return defaultCliOptions == null ? new Verifier(basedir, settingsFile, false) : new Verifier(basedir, settingsFile, false, defaultCliOptions); - - verifier.getVerifierProperties().setProperty("use.mavenRepoLocal", "true"); - return verifier; } private static File settingsXmlPath() { 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 87596dd762..5b157e9f42 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.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 f691f4bfc0..0337e92ef8 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.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 f962337bf5..45042aec43 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.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 996fab9a28..1fe4488fb5 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.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 4acc62f361..a468a816fe 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 6ea4db3163..cd9649be65 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 3b260845ca..010ccf344a 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 344241ac52..c2b0ec0015 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 c6b9195f88..4e2c89c9cd 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 9868caa6ef..82f9fa19c4 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 4172ef8dcc..b59f680f49 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 59447ba975..95a923fd75 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 c1bf858052..8004979ad3 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 b97052f084..e0108dfa96 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 201e9348e7..38bdeff1c6 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.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 1220713312..cb40accc5e 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.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 6aa685e745..ce536591e2 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 8319508543..a6d5fcd5ce 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;