[SUREFIRE-2226] Upgrade to Maven Verifier 2.0.0-M1

pom.xml

@@ -194,7 +194,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>

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>
@@ -192,6 +198,7 @@
             <configuration>
               <skipTests>${skipTests}</skipTests>
               <runOrder>alphabetical</runOrder>
+              <forkCount>1C</forkCount>
               <threadCount>1</threadCount>
               <forkCount>1C</forkCount>
               <rerunFailingTestsCount>1</rerunFailingTestsCount>

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;

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;

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;

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;

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;
 

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;

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);
     }

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;

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;
 
 /**
  *

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<String, String> envVars = new HashMap<>();
 
-    private final Map<String, String> 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<String> goalsAndProps = new ArrayList<>(goals);
-
-            for (Entry<String, String> 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() {

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;

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

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;
 

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;

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;

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;

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;

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;