Update maven-verifier to 2.x

pom.xml

@@ -252,7 +252,7 @@
 			<dependency>
 				<groupId>org.apache.maven.shared</groupId>
 				<artifactId>maven-verifier</artifactId>
-				<version>1.7.2</version>
+				<version>2.0.0-M1</version>
 			</dependency>
 			<dependency>
 				<groupId>biz.aQute.bnd</groupId>

tycho-extras/tycho-extras-its/src/test/java/org/eclipse/tycho/extras/pde/TestListDependencies.java

@@ -13,7 +13,7 @@
 import java.io.File;
 import java.nio.file.Files;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.eclipse.tycho.extras.its.AbstractTychoExtrasIntegrationTest;
 import org.junit.Assert;
 import org.junit.Test;
@@ -37,7 +37,7 @@ public void testDependencyInReactor() throws Exception {
     @Test
     public void testDependencyWithNestedJar() throws Exception {
         Verifier verifier = getVerifier("dependencyList/dependency-with-nested-jar", false);
-        verifier.addCliOption("-Dp2-repo=" + P2_REPO);
+        verifier.addCliArgument("-Dp2-repo=" + P2_REPO);
         verifier.executeGoal("verify");
         verifier.verifyErrorFreeLog();
         File file = new File(verifier.getBasedir(), "target/dependencies-list.txt");

tycho-extras/tycho-extras-its/src/test/java/org/eclipse/tycho/extras/pomless/SetVersionPomlessITest.java

@@ -14,7 +14,7 @@
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.eclipse.tycho.core.osgitools.DefaultBundleReader;
 import org.eclipse.tycho.core.osgitools.OsgiManifest;
 import org.eclipse.tycho.extras.its.AbstractTychoExtrasIntegrationTest;
@@ -29,7 +29,7 @@ public class SetVersionPomlessITest extends AbstractTychoExtrasIntegrationTest {
     public void testPomlessBuildExtension() throws Exception {
         Verifier verifier = getVerifier("testsetversionpomless", false);
         String newVersion = "2.0.0";
-        verifier.addCliOption("-DnewVersion=" + newVersion);
+        verifier.addCliArgument("-DnewVersion=" + newVersion);
         verifier.executeGoal("org.eclipse.tycho:tycho-versions-plugin:" + getTychoVersion() + ":set-version");
         verifier.verifyErrorFreeLog();
         File baseDir = new File(verifier.getBasedir());

tycho-extras/tycho-extras-its/src/test/java/org/eclipse/tycho/extras/pomless/TychoPomlessITest.java

@@ -19,7 +19,7 @@
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.eclipse.tycho.extras.its.AbstractTychoExtrasIntegrationTest;
 import org.junit.Test;
 
@@ -48,8 +48,7 @@ private void check(File baseDir) {
     @Test
     public void testPomlessFlatBuildExtension() throws Exception {
         Verifier verifier = getVerifier("testpomless-flat", false);
-        verifier.addCliOption("-f");
-        verifier.addCliOption("aggregate/pom.xml");
+        verifier.addCliArguments("-f aggregate/pom.xml");
         verifier.executeGoals(asList("clean", "verify"));
         verifier.verifyErrorFreeLog();
         // sanity check pom-less if bundle, test bundle and feature have been built

tycho-its/src/test/java/org/eclipse/tycho/test/CustomBundlePluginTest.java

@@ -16,7 +16,7 @@
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.junit.Test;
 
 public class CustomBundlePluginTest extends AbstractTychoIntegrationTest {

tycho-its/src/test/java/org/eclipse/tycho/test/DemoTest.java

@@ -14,7 +14,7 @@
 
 import java.util.List;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.junit.Test;
 
 /**

tycho-its/src/test/java/org/eclipse/tycho/test/MNGECLIPSE949jarDirectoryBundles/JarDirectoryBundlesTest.java

@@ -17,7 +17,7 @@
 import java.io.File;
 import java.io.FileFilter;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.eclipse.tycho.core.osgitools.DefaultBundleReader;
 import org.eclipse.tycho.core.osgitools.OsgiManifest;
 import org.eclipse.tycho.test.AbstractTychoIntegrationTest;

tycho-its/src/test/java/org/eclipse/tycho/test/MissingPluginVersionsTest.java

@@ -13,7 +13,7 @@
 
 package org.eclipse.tycho.test;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.junit.Test;
 
 public class MissingPluginVersionsTest extends AbstractTychoIntegrationTest {

tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0209tychoRepositoryRoundtrip/TychoRepositoryRoundtripTest.java

@@ -16,7 +16,7 @@
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
 import org.junit.Test;
 

tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0294ProductP2TargetPlatformResolver/ProductP2TargetPlatformResolverTest.java

@@ -14,7 +14,7 @@
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
 import org.eclipse.tycho.test.util.ResourceUtil.P2Repositories;
 import org.junit.Test;
@@ -23,7 +23,7 @@ public class ProductP2TargetPlatformResolverTest extends AbstractTychoIntegratio
 	@Test
 	public void testBasic() throws Exception {
 		Verifier verifier = getVerifier("/TYCHO0294ProductP2TargetPlatformResolver");
-		verifier.addCliOption("-Dp2.repo=" + P2Repositories.ECLIPSE_LATEST.toString());
+		verifier.addCliArgument("-Dp2.repo=" + P2Repositories.ECLIPSE_LATEST.toString());
 		verifier.executeGoal("verify");
 		verifier.verifyErrorFreeLog();
 

tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0367localRepositoryCrosstalk/LocalRepositoryCrosstalkTest.java

@@ -12,7 +12,7 @@
  *******************************************************************************/
 package org.eclipse.tycho.test.TYCHO0367localRepositoryCrosstalk;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
 import org.eclipse.tycho.test.util.ResourceUtil.P2Repositories;
 import org.junit.Test;
@@ -22,13 +22,13 @@ public class LocalRepositoryCrosstalkTest extends AbstractTychoIntegrationTest {
 	public void test() throws Exception {
 		// run e352 test first
 		Verifier v01 = getVerifier("/TYCHO0367localRepositoryCrosstalk/bundle02", false);
-		v01.addCliOption("-Dp2.repo=" + P2Repositories.ECLIPSE_LATEST.toString());
+		v01.addCliArgument("-Dp2.repo=" + P2Repositories.ECLIPSE_LATEST.toString());
 		v01.executeGoal("install");
 		v01.verifyErrorFreeLog();
 
 		// now run e342 test, it should not "see" e352 artifacts in local repo
 		Verifier v02 = getVerifier("/TYCHO0367localRepositoryCrosstalk/bundle01", false);
-		v02.addCliOption("-Dp2.repo=" + P2Repositories.ECLIPSE_OXYGEN.toString());
+		v02.addCliArgument("-Dp2.repo=" + P2Repositories.ECLIPSE_OXYGEN.toString());
 		v02.executeGoal("install");
 		v02.verifyErrorFreeLog();
 	}

tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0383dotQualifierMatching/DotQualifierMatchingTest.java

@@ -14,7 +14,7 @@
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
 import org.eclipse.tycho.test.util.ResourceUtil.P2Repositories;
 import org.junit.Test;
@@ -23,7 +23,7 @@ public class DotQualifierMatchingTest extends AbstractTychoIntegrationTest {
 	@Test
 	public void testFeature() throws Exception {
 		Verifier verifier = getVerifier("/TYCHO0383dotQualifierMatching/featureDotQualifier", false);
-		verifier.addCliOption("-Dp2.repo=" + P2Repositories.ECLIPSE_342.toString());
+		verifier.addCliArgument("-Dp2.repo=" + P2Repositories.ECLIPSE_342.toString());
 		verifier.executeGoal("integration-test");
 		verifier.verifyErrorFreeLog();
 
@@ -34,7 +34,7 @@ public void testFeature() throws Exception {
 	@Test
 	public void testProduct() throws Exception {
 		Verifier verifier = getVerifier("/TYCHO0383dotQualifierMatching/productDotQualifier", false);
-		verifier.addCliOption("-Dp2.repo=" + P2Repositories.ECLIPSE_342.toString());
+		verifier.addCliArgument("-Dp2.repo=" + P2Repositories.ECLIPSE_342.toString());
 		verifier.executeGoal("integration-test");
 		verifier.verifyErrorFreeLog();
 

tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0404pomDependencyConsiderExtraClasspath/PomDependencyConsiderExtraClasspathTest.java

@@ -14,7 +14,7 @@
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.codehaus.plexus.util.FileUtils;
 import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
 import org.junit.Test;

tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0439repositoryCategories/RepositoryCategoriesTest.java

@@ -16,7 +16,7 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
 import org.junit.Assert;
 import org.junit.Test;

tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0453expandReleaseVersion/ExpandReleaseVersionTest.java

@@ -18,7 +18,7 @@
 import java.io.File;
 import java.nio.file.Files;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.eclipse.tycho.model.Feature;
 import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
 import org.junit.Test;

tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO109product/Tycho109ProductExportTest.java

@@ -17,7 +17,7 @@
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
 import org.junit.Test;
 
@@ -59,7 +59,7 @@ public void exportPluginRcpApplication() throws Exception {
 	@Test
 	public void productNoZip() throws Exception {
 		Verifier verifier = getVerifier("/TYCHO109product/product-nozip/product");
-		verifier.addCliOption("-Dtycho.product.createArchive=false");
+		verifier.addCliArgument("-Dtycho.product.createArchive=false");
 
 		verifier.executeGoal("package");
 		verifier.verifyErrorFreeLog();

tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO192sourceBundles/Tycho192SourceBundleTest.java

@@ -34,7 +34,7 @@
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.eclipse.tycho.TychoConstants;
 import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
 import org.junit.Test;

tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO240includeLaunchers/IncludeLaunchersTest.java

@@ -20,7 +20,7 @@
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.SystemUtils;
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
 import org.junit.Test;
 

tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO246rcpSourceBundles/TYCHO246rcpSourceBundlesTest.java

@@ -14,7 +14,7 @@
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
 import org.junit.Test;
 

tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO253extraClassPathEntries/ExtraClassPathEntriesTest.java

@@ -14,7 +14,7 @@
 
 import java.util.Arrays;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
 import org.junit.Test;
 

tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO279HttpProxy/ProxySupportTest.java

@@ -33,7 +33,7 @@
 import javax.xml.xpath.XPathExpression;
 import javax.xml.xpath.XPathFactory;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.eclipse.jetty.server.NetworkTrafficServerConnector;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;

tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO285EclipseSourceBundles/TYCHO285EclipseSourceBundlesTest.java

@@ -17,7 +17,7 @@
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
 import org.junit.Assert;
 import org.junit.Test;

tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO300launcherIcons/LauncherIconsTest.java

@@ -12,7 +12,7 @@
  *******************************************************************************/
 package org.eclipse.tycho.test.TYCHO300launcherIcons;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
 import org.junit.Test;
 

tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO308importSystemPackage/ImportSystemPackagesTest.java

@@ -12,7 +12,7 @@
  *******************************************************************************/
 package org.eclipse.tycho.test.TYCHO308importSystemPackage;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
 import org.junit.Test;
 

tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO309pomDependencyConsider/PomDependencyConsiderTest.java

@@ -16,7 +16,7 @@
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
 import org.junit.Test;
 

tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO321deployableFeature/DeployableFeatureTest.java

@@ -14,7 +14,7 @@
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
 import org.junit.Assert;
 import org.junit.Test;

tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO330validateVersion/ValidateVersionTest.java

@@ -12,8 +12,8 @@
  *******************************************************************************/
 package org.eclipse.tycho.test.TYCHO330validateVersion;
 
-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.eclipse.tycho.test.AbstractTychoIntegrationTest;
 import org.junit.Assert;
 import org.junit.Test;

tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO350ClassCastException/TYCHO350ClassCastExceptionTest.java

@@ -11,7 +11,7 @@
 
 import static java.util.Arrays.asList;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
 import org.junit.Test;
 

tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO418pomDependencyConsider/PomDependencyConsiderTest.java

@@ -16,7 +16,7 @@
 
 import java.io.File;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
 import org.junit.Test;
 

tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO449SrcIncludesExcludes/Tycho449SrcIncludesExcludesTest.java

@@ -15,7 +15,7 @@
 import java.io.File;
 import java.util.jar.JarFile;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
 import org.junit.Assert;
 import org.junit.Test;

tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO502sourceBundleQualifier/Tycho502SourceBundleQualifierTest.java

@@ -21,7 +21,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
 import org.junit.Test;
 
@@ -32,7 +32,7 @@ public void testReferencedQualifierInSourceBundle() throws Exception {
 		Verifier verifier = getVerifier("/TYCHO502sourceBundleQualifier", false);
 		File targetDir = new File(verifier.getBasedir(), "target");
 		{
-			verifier.addCliOption("-DforceContextQualifier=old");
+			verifier.addCliArgument("-DforceContextQualifier=old");
 			verifier.executeGoal("package");
 			verifier.verifyErrorFreeLog();
 
@@ -43,7 +43,7 @@ public void testReferencedQualifierInSourceBundle() throws Exception {
 		}
 		// rebuild _without clean_ and test again
 		{
-			verifier.addCliOption("-DforceContextQualifier=new");
+			verifier.addCliArgument("-DforceContextQualifier=new");
 			verifier.setAutoclean(false);
 			verifier.executeGoal("package");
 			verifier.verifyErrorFreeLog();

tycho-its/src/test/java/org/eclipse/tycho/test/apitools/ApiToolsTest.java

@@ -6,7 +6,7 @@
 import java.io.File;
 import java.util.List;
 
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.Verifier;
 import org.eclipse.tycho.test.AbstractTychoIntegrationTest;
 import org.junit.Test;