diff --git a/pom.xml b/pom.xml index 1aad952e29..ef5925fc83 100644 --- a/pom.xml +++ b/pom.xml @@ -252,7 +252,7 @@ org.apache.maven.shared maven-verifier - 1.7.2 + 2.0.0-M1 biz.aQute.bnd diff --git a/tycho-extras/tycho-extras-its/src/test/java/org/eclipse/tycho/extras/pde/TestListDependencies.java b/tycho-extras/tycho-extras-its/src/test/java/org/eclipse/tycho/extras/pde/TestListDependencies.java index dd86effd3c..e5ba04d88c 100644 --- a/tycho-extras/tycho-extras-its/src/test/java/org/eclipse/tycho/extras/pde/TestListDependencies.java +++ b/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"); diff --git a/tycho-extras/tycho-extras-its/src/test/java/org/eclipse/tycho/extras/pomless/SetVersionPomlessITest.java b/tycho-extras/tycho-extras-its/src/test/java/org/eclipse/tycho/extras/pomless/SetVersionPomlessITest.java index cdb960aa83..c3cf137b0a 100644 --- a/tycho-extras/tycho-extras-its/src/test/java/org/eclipse/tycho/extras/pomless/SetVersionPomlessITest.java +++ b/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()); diff --git a/tycho-extras/tycho-extras-its/src/test/java/org/eclipse/tycho/extras/pomless/TychoPomlessITest.java b/tycho-extras/tycho-extras-its/src/test/java/org/eclipse/tycho/extras/pomless/TychoPomlessITest.java index a6c0f6ae65..fd2701b4b2 100644 --- a/tycho-extras/tycho-extras-its/src/test/java/org/eclipse/tycho/extras/pomless/TychoPomlessITest.java +++ b/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 diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/MNGECLIPSE949jarDirectoryBundles/JarDirectoryBundlesTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/MNGECLIPSE949jarDirectoryBundles/JarDirectoryBundlesTest.java index e709cb5766..4f3a049bf0 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/MNGECLIPSE949jarDirectoryBundles/JarDirectoryBundlesTest.java +++ b/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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/MissingPluginVersionsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/MissingPluginVersionsTest.java index 12c44762f6..6ec5d37d73 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/MissingPluginVersionsTest.java +++ b/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 { diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0209tychoRepositoryRoundtrip/TychoRepositoryRoundtripTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0209tychoRepositoryRoundtrip/TychoRepositoryRoundtripTest.java index dd86422d67..1196a93aeb 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0209tychoRepositoryRoundtrip/TychoRepositoryRoundtripTest.java +++ b/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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0294ProductP2TargetPlatformResolver/ProductP2TargetPlatformResolverTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0294ProductP2TargetPlatformResolver/ProductP2TargetPlatformResolverTest.java index 43b17cd925..f5f42c8642 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0294ProductP2TargetPlatformResolver/ProductP2TargetPlatformResolverTest.java +++ b/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(); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0367localRepositoryCrosstalk/LocalRepositoryCrosstalkTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0367localRepositoryCrosstalk/LocalRepositoryCrosstalkTest.java index 1e92aec601..ae869762b1 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0367localRepositoryCrosstalk/LocalRepositoryCrosstalkTest.java +++ b/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(); } diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0383dotQualifierMatching/DotQualifierMatchingTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0383dotQualifierMatching/DotQualifierMatchingTest.java index 5f665dd79b..0e57fd688f 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0383dotQualifierMatching/DotQualifierMatchingTest.java +++ b/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(); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0404pomDependencyConsiderExtraClasspath/PomDependencyConsiderExtraClasspathTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0404pomDependencyConsiderExtraClasspath/PomDependencyConsiderExtraClasspathTest.java index 68102b80f3..03ee40aeea 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0404pomDependencyConsiderExtraClasspath/PomDependencyConsiderExtraClasspathTest.java +++ b/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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0439repositoryCategories/RepositoryCategoriesTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0439repositoryCategories/RepositoryCategoriesTest.java index 5fcc59a91f..a543795886 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0439repositoryCategories/RepositoryCategoriesTest.java +++ b/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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0453expandReleaseVersion/ExpandReleaseVersionTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0453expandReleaseVersion/ExpandReleaseVersionTest.java index ca68e938ff..7da129f28c 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO0453expandReleaseVersion/ExpandReleaseVersionTest.java +++ b/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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO109product/Tycho109ProductExportTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO109product/Tycho109ProductExportTest.java index 48c4c2dd96..ab8804aa6b 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO109product/Tycho109ProductExportTest.java +++ b/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(); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO192sourceBundles/Tycho192SourceBundleTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO192sourceBundles/Tycho192SourceBundleTest.java index c3de9c2af5..5a421c98c9 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO192sourceBundles/Tycho192SourceBundleTest.java +++ b/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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO240includeLaunchers/IncludeLaunchersTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO240includeLaunchers/IncludeLaunchersTest.java index 86dd017e7d..b8af083e3f 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO240includeLaunchers/IncludeLaunchersTest.java +++ b/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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO246rcpSourceBundles/TYCHO246rcpSourceBundlesTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO246rcpSourceBundles/TYCHO246rcpSourceBundlesTest.java index 1b930f1c8d..451231616d 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO246rcpSourceBundles/TYCHO246rcpSourceBundlesTest.java +++ b/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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO253extraClassPathEntries/ExtraClassPathEntriesTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO253extraClassPathEntries/ExtraClassPathEntriesTest.java index aac4b9d3b8..a668de12d4 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO253extraClassPathEntries/ExtraClassPathEntriesTest.java +++ b/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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO279HttpProxy/ProxySupportTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO279HttpProxy/ProxySupportTest.java index 5ca9a61e81..655c4f0793 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO279HttpProxy/ProxySupportTest.java +++ b/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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO285EclipseSourceBundles/TYCHO285EclipseSourceBundlesTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO285EclipseSourceBundles/TYCHO285EclipseSourceBundlesTest.java index 283ddf7d81..5c211f9681 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO285EclipseSourceBundles/TYCHO285EclipseSourceBundlesTest.java +++ b/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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO300launcherIcons/LauncherIconsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO300launcherIcons/LauncherIconsTest.java index a78038ea4f..9b2da97ec9 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO300launcherIcons/LauncherIconsTest.java +++ b/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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO308importSystemPackage/ImportSystemPackagesTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO308importSystemPackage/ImportSystemPackagesTest.java index d4511082bb..883cc96f79 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO308importSystemPackage/ImportSystemPackagesTest.java +++ b/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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO309pomDependencyConsider/PomDependencyConsiderTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO309pomDependencyConsider/PomDependencyConsiderTest.java index 365d1723a2..dd882785ce 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO309pomDependencyConsider/PomDependencyConsiderTest.java +++ b/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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO321deployableFeature/DeployableFeatureTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO321deployableFeature/DeployableFeatureTest.java index 7f567204e6..86f5d7b1da 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO321deployableFeature/DeployableFeatureTest.java +++ b/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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO330validateVersion/ValidateVersionTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO330validateVersion/ValidateVersionTest.java index 657f937ecc..a1fcf5623d 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO330validateVersion/ValidateVersionTest.java +++ b/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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO350ClassCastException/TYCHO350ClassCastExceptionTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO350ClassCastException/TYCHO350ClassCastExceptionTest.java index 0bba23cbe2..b87a0e8548 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO350ClassCastException/TYCHO350ClassCastExceptionTest.java +++ b/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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO418pomDependencyConsider/PomDependencyConsiderTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO418pomDependencyConsider/PomDependencyConsiderTest.java index 9a8bef22a7..1de8976828 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO418pomDependencyConsider/PomDependencyConsiderTest.java +++ b/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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO449SrcIncludesExcludes/Tycho449SrcIncludesExcludesTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO449SrcIncludesExcludes/Tycho449SrcIncludesExcludesTest.java index 7b4f94fcf2..104c7c1457 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO449SrcIncludesExcludes/Tycho449SrcIncludesExcludesTest.java +++ b/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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO502sourceBundleQualifier/Tycho502SourceBundleQualifierTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO502sourceBundleQualifier/Tycho502SourceBundleQualifierTest.java index a4e3684007..fe20e2ff43 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO502sourceBundleQualifier/Tycho502SourceBundleQualifierTest.java +++ b/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(); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/apitools/ApiToolsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/apitools/ApiToolsTest.java index 1b909a0fc9..fdedce67c2 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/apitools/ApiToolsTest.java +++ b/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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/baseline/BaselineMojoTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/baseline/BaselineMojoTest.java index a2c7c3bca2..58bc06aab7 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/baseline/BaselineMojoTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/baseline/BaselineMojoTest.java @@ -7,8 +7,8 @@ import java.util.List; import java.util.regex.Pattern; -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.Ignore; import org.junit.Test; @@ -84,7 +84,7 @@ private void verifyBaselineProblem(Verifier verifier, String delta, String type, private Verifier buildBaselineProject(String project, boolean compareShouldFail, String... xargs) throws Exception { File baseRepo = buildBaseRepo(); Verifier verifier = getBaselineProject(project); - verifier.addCliOption("-Dbaseline-url=" + baseRepo.toURI()); + verifier.addCliArgument("-Dbaseline-url=" + baseRepo.toURI()); for (String xarg : xargs) { verifier.addCliOption(xarg); } @@ -110,7 +110,7 @@ private Verifier buildBaselineProject(String project, boolean compareShouldFail, private File buildBaseRepo() throws Exception, VerificationException { Verifier verifier = getBaselineProject("base-repo"); - verifier.addCliOption("-Dtycho.baseline.skip=true"); + verifier.addCliArgument("-Dtycho.baseline.skip=true"); verifier.executeGoals(List.of("clean", "package")); verifier.verifyErrorFreeLog(); File repoBase = new File(verifier.getBasedir(), "base-repo/site/target/repository"); @@ -124,8 +124,7 @@ private File buildBaseRepo() throws Exception, VerificationException { private Verifier getBaselineProject(String project) throws Exception { Verifier verifier = getVerifier("baseline", false, true); - verifier.addCliOption("-f"); - verifier.addCliOption(project + "/pom.xml"); + verifier.addCliArguments("-f", project + "/pom.xml"); return verifier; } } diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/buildextension/CiFriendlyVersionsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/buildextension/CiFriendlyVersionsTest.java index 08fa07a9c5..a43cbcfa63 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/buildextension/CiFriendlyVersionsTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/buildextension/CiFriendlyVersionsTest.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.TimeZone; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; @@ -19,7 +19,7 @@ public class CiFriendlyVersionsTest extends AbstractTychoIntegrationTest { public void testDefaultBuildQualifier() throws Exception { Verifier verifier = getVerifier("ci-friendly/buildqualifier", false, true); // this used the default build qualifier - verifier.addCliOption("-Dtycho.buildqualifier.format=yyyy"); + verifier.addCliArgument("-Dtycho.buildqualifier.format=yyyy"); verifier.executeGoals(List.of("clean", "package")); verifier.verifyErrorFreeLog(); int year = Calendar.getInstance(TimeZone.getTimeZone("UTC")).get(Calendar.YEAR); @@ -32,8 +32,8 @@ public void testDefaultBuildQualifier() throws Exception { public void testJgitBuildQualifier() throws Exception { Verifier verifier = getVerifier("ci-friendly/buildqualifier", false, true); // this used the default build qualifier - verifier.addCliOption("-Dtycho.buildqualifier.provider=jgit"); - verifier.addCliOption("-Dtycho.buildqualifier.format=yyyyMM"); + verifier.addCliArgument("-Dtycho.buildqualifier.provider=jgit"); + verifier.addCliArgument("-Dtycho.buildqualifier.format=yyyyMM"); verifier.executeGoals(List.of("clean", "package")); verifier.verifyErrorFreeLog(); // XXX Must be updated if the test is changed but should remain constant diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/buildextension/PomlessTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/buildextension/PomlessTest.java index 4de8eadf0e..bbace476ca 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/buildextension/PomlessTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/buildextension/PomlessTest.java @@ -15,7 +15,7 @@ import java.util.Map; import java.util.Properties; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; @@ -24,8 +24,8 @@ public class PomlessTest extends AbstractTychoIntegrationTest { @Test public void testBnd() throws Exception { Verifier verifier = getVerifier("pomless", false, true); - verifier.addCliOption("-pl"); - verifier.addCliOption("bnd"); + verifier.addCliArgument("-pl"); + verifier.addCliArgument("bnd"); verifier.executeGoals(List.of("clean", "package")); verifier.verifyErrorFreeLog(); File file = new File(verifier.getBasedir(), "bnd/target/classes/module-info.class"); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/compare/CompareWithBaselineTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/compare/CompareWithBaselineTest.java index 25db520736..f94a23ca99 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/compare/CompareWithBaselineTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/compare/CompareWithBaselineTest.java @@ -10,7 +10,7 @@ package org.eclipse.tycho.test.compare; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/AnnotationProcessorTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/AnnotationProcessorTest.java index b82fce382c..f425c0cb6c 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/AnnotationProcessorTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/AnnotationProcessorTest.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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerClasspathEntryTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerClasspathEntryTest.java index 299c594fe3..1c8e7ebc93 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerClasspathEntryTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerClasspathEntryTest.java @@ -21,7 +21,7 @@ import java.util.stream.Collectors; import org.apache.maven.it.VerificationException; -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.EnvironmentUtil; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerClasspathTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerClasspathTest.java index 9e9ad71908..07ade7dda2 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerClasspathTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerClasspathTest.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.compiler; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerExcludeTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerExcludeTest.java index 5118ffa570..d7f4bed28d 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerExcludeTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerExcludeTest.java @@ -16,7 +16,7 @@ import java.io.File; 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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerExtraExportsJava17Test.java b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerExtraExportsJava17Test.java index 4dc9656b83..3ea86742c7 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerExtraExportsJava17Test.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerExtraExportsJava17Test.java @@ -13,7 +13,7 @@ package org.eclipse.tycho.test.compiler; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerExtraExportsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerExtraExportsTest.java index 31eaa9c4f2..bf87f719a9 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerExtraExportsTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/CompilerExtraExportsTest.java @@ -13,7 +13,7 @@ package org.eclipse.tycho.test.compiler; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/FailOnWarningTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/FailOnWarningTest.java index 5d299a4592..9c6d78b32b 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/FailOnWarningTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/FailOnWarningTest.java @@ -15,8 +15,8 @@ import static org.junit.Assert.fail; -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.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/FragmentsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/FragmentsTest.java index ff6acbbdce..2cd99584f0 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/FragmentsTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/FragmentsTest.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.compiler; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/JavaxAnnotationImportTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/JavaxAnnotationImportTest.java index 696de418e7..9dcad5e762 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/JavaxAnnotationImportTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/JavaxAnnotationImportTest.java @@ -13,7 +13,7 @@ package org.eclipse.tycho.test.compiler; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/MavenCompilerPluginTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/MavenCompilerPluginTest.java index 568ab6219a..3da36c38bf 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/MavenCompilerPluginTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/MavenCompilerPluginTest.java @@ -13,8 +13,8 @@ package org.eclipse.tycho.test.compiler; -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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/MisconfigurationTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/MisconfigurationTest.java index f40eb526bb..251d6a759d 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/MisconfigurationTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/MisconfigurationTest.java @@ -15,8 +15,8 @@ import static org.junit.Assert.fail; -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.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/RequireJREPackagesImportTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/RequireJREPackagesImportTest.java index 51a2138255..d2e3ab8ef2 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/RequireJREPackagesImportTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/RequireJREPackagesImportTest.java @@ -15,8 +15,8 @@ import static org.junit.Assert.fail; -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.Ignore; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/TestErrorMessages.java b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/TestErrorMessages.java index 5c6b6720f2..e3568acfbf 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/TestErrorMessages.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/compiler/TestErrorMessages.java @@ -14,8 +14,8 @@ import static org.junit.Assert.fail; -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.Test; @@ -43,7 +43,7 @@ public void testBREEWithoutProfile() throws Exception { @Test public void testMissingBREEWithPlainProfile() throws Exception { Verifier verifier = getVerifier("compiler.messages/missing-bree", false); - verifier.addCliOption("-Pplain"); + verifier.addCliArgument("-Pplain"); try { verifier.executeGoal("compile"); fail(); @@ -61,7 +61,7 @@ public void testMissingBREEWithPlainProfile() throws Exception { @Test public void testMissingBREEWithJustJProfile() throws Exception { Verifier verifier = getVerifier("compiler.messages/missing-bree", false); - verifier.addCliOption("-Pjustj"); + verifier.addCliArgument("-Pjustj"); try { verifier.executeGoal("compile"); fail(); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/eclipserun/EclipseRunBundleStartLevelTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/eclipserun/EclipseRunBundleStartLevelTest.java index 16b9e37448..e00d3d1e4a 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/eclipserun/EclipseRunBundleStartLevelTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/eclipserun/EclipseRunBundleStartLevelTest.java @@ -18,7 +18,7 @@ import java.nio.file.Files; import java.nio.file.Path; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/CustomProfileIntegrationTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/CustomProfileIntegrationTest.java index e6184248cd..df485e5600 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/CustomProfileIntegrationTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/CustomProfileIntegrationTest.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.eclipse.tycho.test.util.P2RepositoryTool; import org.eclipse.tycho.test.util.ResourceUtil; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/DependencyResolverEETest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/DependencyResolverEETest.java index 8985aeb8cc..f8f4bd0179 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/DependencyResolverEETest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/DependencyResolverEETest.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.eeProfile; -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; import org.junit.Test; @@ -23,7 +23,7 @@ public class DependencyResolverEETest extends AbstractTychoIntegrationTest { @Test public void eeFromBREE() throws Exception { Verifier verifier = getVerifier("/eeProfile/ee-from-bree", false); - verifier.addCliOption( + verifier.addCliArgument( "-Djavax.xml-repo=" + ResourceUtil.resolveTestResource("repositories/javax.xml").toURI().toString()); verifier.executeGoal("verify"); verifier.verifyErrorFreeLog(); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/FragmentsAttachedTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/FragmentsAttachedTest.java index a52e8b032f..e2160d035f 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/FragmentsAttachedTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/FragmentsAttachedTest.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.eeProfile; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/Java11ResolutionTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/Java11ResolutionTest.java index db28621500..8d041fd6a6 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/Java11ResolutionTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/Java11ResolutionTest.java @@ -18,7 +18,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.eclipse.tycho.test.util.P2RepositoryTool; import org.junit.BeforeClass; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/Java17ResolutionTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/Java17ResolutionTest.java index 32137b6c87..e87263aea2 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/Java17ResolutionTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/Java17ResolutionTest.java @@ -18,7 +18,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.eclipse.tycho.test.util.P2RepositoryTool; import org.junit.BeforeClass; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/Java18ResolutionTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/Java18ResolutionTest.java index dfd57ab789..15956b9547 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/Java18ResolutionTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/Java18ResolutionTest.java @@ -18,7 +18,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.eclipse.tycho.test.util.P2RepositoryTool; import org.junit.BeforeClass; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/Java7ResolutionTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/Java7ResolutionTest.java index 90d5b08524..fc8718b088 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/Java7ResolutionTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/eeProfile/Java7ResolutionTest.java @@ -18,7 +18,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.eclipse.tycho.test.util.P2RepositoryTool; import org.junit.BeforeClass; @@ -60,7 +60,7 @@ public void testRepositoryAggregationForJava7() throws Exception { @Test public void testP2ResolutionWithLowerBREEThanRequiredBundle() throws Exception { Verifier verifier = getVerifier("eeProfile.java7/bundle2", false); - verifier.addCliOption("-Dp2.repo.url=" + new File(buildResult, "repository1/target/repository").toURI()); + verifier.addCliArgument("-Dp2.repo.url=" + new File(buildResult, "repository1/target/repository").toURI()); verifier.executeGoal("verify"); // with bug 434959, p2 resolver would fail diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/feature/FeatureWithDependenciesTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/feature/FeatureWithDependenciesTest.java index 99c406fcda..1d3550caa9 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/feature/FeatureWithDependenciesTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/feature/FeatureWithDependenciesTest.java @@ -15,7 +15,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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/feature/FeatureWithMultipleFiltersTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/feature/FeatureWithMultipleFiltersTest.java index 09ca233982..5449dc6506 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/feature/FeatureWithMultipleFiltersTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/feature/FeatureWithMultipleFiltersTest.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.feature; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/feature/FeatureWithRestrictionsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/feature/FeatureWithRestrictionsTest.java index c19ec347d9..3e8ce05a1a 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/feature/FeatureWithRestrictionsTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/feature/FeatureWithRestrictionsTest.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Optional; -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; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/featurePatch/EclipseRepoIncludingFeaturePatchTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/featurePatch/EclipseRepoIncludingFeaturePatchTest.java index 0f0d063ece..2472cba228 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/featurePatch/EclipseRepoIncludingFeaturePatchTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/featurePatch/EclipseRepoIncludingFeaturePatchTest.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.eclipse.tycho.test.util.P2RepositoryTool; import org.eclipse.tycho.test.util.ResourceUtil; @@ -29,9 +29,9 @@ public class EclipseRepoIncludingFeaturePatchTest extends AbstractTychoIntegrati public void testRepsoitoryBuild() throws Exception { Verifier verifier = getVerifier("featurePatch.external/build", false); - verifier.addCliOption("-Decl342=" + P2Repositories.ECLIPSE_342.toString()); - verifier.addCliOption("-Decl352=" + P2Repositories.ECLIPSE_352.toString()); - verifier.addCliOption("-Drepo-with-patch=" + verifier.addCliArgument("-Decl342=" + P2Repositories.ECLIPSE_342.toString()); + verifier.addCliArgument("-Decl352=" + P2Repositories.ECLIPSE_352.toString()); + verifier.addCliArgument("-Drepo-with-patch=" + ResourceUtil.resolveTestResource("projects/featurePatch.external/patchrepo").toURI().toString()); verifier.executeGoal("verify"); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/featurePatch/FeaturePatchTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/featurePatch/FeaturePatchTest.java index a4b70ffab2..291d6dc0d0 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/featurePatch/FeaturePatchTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/featurePatch/FeaturePatchTest.java @@ -15,7 +15,7 @@ import static org.eclipse.tycho.test.util.ResourceUtil.P2Repositories.ECLIPSE_342; import static org.eclipse.tycho.test.util.ResourceUtil.P2Repositories.ECLIPSE_352; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; @@ -25,8 +25,8 @@ public class FeaturePatchTest extends AbstractTychoIntegrationTest { public void testFeaturePatch() throws Exception { Verifier verifier = getVerifier("featurePatch.build", false); - verifier.addCliOption("-De342-url=" + ECLIPSE_342.toString()); - verifier.addCliOption("-De352-url=" + ECLIPSE_352.toString()); + verifier.addCliArgument("-De342-url=" + ECLIPSE_342.toString()); + verifier.addCliArgument("-De352-url=" + ECLIPSE_352.toString()); verifier.executeGoal("verify"); verifier.verifyErrorFreeLog(); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/issue1093/Issue1093Test.java b/tycho-its/src/test/java/org/eclipse/tycho/test/issue1093/Issue1093Test.java index cf0498e504..388130f26c 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/issue1093/Issue1093Test.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/issue1093/Issue1093Test.java @@ -14,8 +14,8 @@ import java.util.List; -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.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/issue23/Issue23Test.java b/tycho-its/src/test/java/org/eclipse/tycho/test/issue23/Issue23Test.java index fd85c99d50..fcd40101be 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/issue23/Issue23Test.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/issue23/Issue23Test.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.issue23; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/issue271/Issue271Test.java b/tycho-its/src/test/java/org/eclipse/tycho/test/issue271/Issue271Test.java index 10da3c7034..33d05fc0e9 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/issue271/Issue271Test.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/issue271/Issue271Test.java @@ -14,7 +14,7 @@ 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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/issue697/Issue697Test.java b/tycho-its/src/test/java/org/eclipse/tycho/test/issue697/Issue697Test.java index 99b4330be6..6ec169dc5e 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/issue697/Issue697Test.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/issue697/Issue697Test.java @@ -2,7 +2,7 @@ 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.Ignore; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/iu/IUMetadataGenerationTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/iu/IUMetadataGenerationTest.java index 6acb701508..26927393a1 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/iu/IUMetadataGenerationTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/iu/IUMetadataGenerationTest.java @@ -20,7 +20,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.eclipse.tycho.test.util.P2RepositoryTool; import org.eclipse.tycho.test.util.P2RepositoryTool.IU; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/iu/ProductWithIUTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/iu/ProductWithIUTest.java index 9fb7d27ddc..7c78eff9ef 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/iu/ProductWithIUTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/iu/ProductWithIUTest.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.eclipse.tycho.test.util.P2RepositoryTool; import org.eclipse.tycho.test.util.ResourceUtil.P2Repositories; @@ -27,7 +27,7 @@ public class ProductWithIUTest extends AbstractTychoIntegrationTest { @Test public void testRootFilesFromIUPackagingInstalledAndInRepo() throws Exception { Verifier verifier = getVerifier("iu.product", false); - verifier.addCliOption("-Dtest-data-repo=" + P2Repositories.ECLIPSE_LATEST.toString()); + verifier.addCliArgument("-Dtest-data-repo=" + P2Repositories.ECLIPSE_LATEST.toString()); verifier.executeGoal("package"); verifier.verifyErrorFreeLog(); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/jarsigning/JarSigningTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/jarsigning/JarSigningTest.java index ad448466a1..43634f4485 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/jarsigning/JarSigningTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/jarsigning/JarSigningTest.java @@ -24,7 +24,7 @@ import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathFactory; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; import org.w3c.dom.Document; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/licenseFeature/LicenseFeatureTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/licenseFeature/LicenseFeatureTest.java index 9eb4f32553..894191dcd8 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/licenseFeature/LicenseFeatureTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/licenseFeature/LicenseFeatureTest.java @@ -23,7 +23,7 @@ import java.util.zip.ZipException; import java.util.zip.ZipFile; -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.Assert; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/licenseFeature/SetLicenseFeatureVersionTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/licenseFeature/SetLicenseFeatureVersionTest.java index 68f7bad7db..9a6f3772c6 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/licenseFeature/SetLicenseFeatureVersionTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/licenseFeature/SetLicenseFeatureVersionTest.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.core.utils.TychoVersion; import org.eclipse.tycho.model.Feature; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; @@ -33,7 +33,7 @@ public class SetLicenseFeatureVersionTest extends AbstractTychoIntegrationTest { public void test() throws Exception { Verifier verifier = getVerifier("/licenseFeature.setVersion", false); - verifier.addCliOption("-DnewVersion=" + NEW_MAVEN_VERSION); + verifier.addCliArgument("-DnewVersion=" + NEW_MAVEN_VERSION); verifier.executeGoal( "org.eclipse.tycho:tycho-versions-plugin:" + TychoVersion.getTychoVersion() + ":set-version"); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/limitations/MixedTychoVersionsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/limitations/MixedTychoVersionsTest.java index 6e67658e90..f5c05b2e01 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/limitations/MixedTychoVersionsTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/limitations/MixedTychoVersionsTest.java @@ -15,8 +15,8 @@ import static org.junit.Assert.fail; -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.core.utils.TychoVersion; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/limitations/NonUniqueBasedirsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/limitations/NonUniqueBasedirsTest.java index ff2250ce85..8b2170a624 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/limitations/NonUniqueBasedirsTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/limitations/NonUniqueBasedirsTest.java @@ -12,8 +12,8 @@ *******************************************************************************/ package org.eclipse.tycho.test.limitations; -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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/mngeclipse1007/BinExcludedTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/mngeclipse1007/BinExcludedTest.java index 76daeedf13..259659f65b 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/mngeclipse1007/BinExcludedTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/mngeclipse1007/BinExcludedTest.java @@ -15,7 +15,7 @@ import java.io.File; 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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/mngeclipse937/CustomSourceEncodingTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/mngeclipse937/CustomSourceEncodingTest.java index 48351e30f9..5fdcb913b8 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/mngeclipse937/CustomSourceEncodingTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/mngeclipse937/CustomSourceEncodingTest.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.mngeclipse937; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/multiplatform/MultiplatformProductTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/multiplatform/MultiplatformProductTest.java index d4c3c96189..dc6c200d0a 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/multiplatform/MultiplatformProductTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/multiplatform/MultiplatformProductTest.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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/multiplatform/MultiplatformReactorTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/multiplatform/MultiplatformReactorTest.java index d6113c55dd..751d226ca3 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/multiplatform/MultiplatformReactorTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/multiplatform/MultiplatformReactorTest.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; @@ -24,7 +24,7 @@ public class MultiplatformReactorTest extends AbstractTychoIntegrationTest { @Test public void testMultiplatformReactorBuild() throws Exception { Verifier verifier = getVerifier("multiPlatform.reactor", false); - verifier.addCliOption("-Dtarget-platform=" + P2Repositories.ECLIPSE_LATEST.toString()); + verifier.addCliArgument("-Dtarget-platform=" + P2Repositories.ECLIPSE_LATEST.toString()); verifier.executeGoal("verify"); verifier.verifyErrorFreeLog(); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Inf/ExtraUnitsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Inf/ExtraUnitsTest.java index bc481d8540..ac8f0fe732 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Inf/ExtraUnitsTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Inf/ExtraUnitsTest.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.p2Inf; -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; import org.junit.Test; @@ -22,7 +22,7 @@ public class ExtraUnitsTest extends AbstractTychoIntegrationTest { @Test public void testExtraUnitsDontSpoilDependencyArtifacts() throws Exception { Verifier verifier = getVerifier("/p2Inf.extraUnits", false); - verifier.addCliOption("-Dp2.repo=" + ResourceUtil.P2Repositories.ECLIPSE_342); + verifier.addCliArgument("-Dp2.repo=" + ResourceUtil.P2Repositories.ECLIPSE_342); verifier.executeGoal("verify"); /* diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Inf/HostRequiresFragmentWithP2InfTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Inf/HostRequiresFragmentWithP2InfTest.java index 46d597a56b..fdcd565fc5 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Inf/HostRequiresFragmentWithP2InfTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Inf/HostRequiresFragmentWithP2InfTest.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.p2Inf; -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; import org.junit.Test; @@ -22,7 +22,7 @@ public class HostRequiresFragmentWithP2InfTest extends AbstractTychoIntegrationT @Test public void testBuildAndTestWithHostRequiringOwnFragment() throws Exception { Verifier verifier = getVerifier("/p2Inf.hostRequireFragment", false); - verifier.addCliOption("-Dp2Repository=" + ResourceUtil.P2Repositories.ECLIPSE_LATEST); + verifier.addCliArgument("-Dp2Repository=" + ResourceUtil.P2Repositories.ECLIPSE_LATEST); // Test that // - the install-time dependency from the host to its fragment can be disabled diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Inf/MultienvP2infTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Inf/MultienvP2infTest.java index 1e7ec0ed68..76d73e3e93 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Inf/MultienvP2infTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Inf/MultienvP2infTest.java @@ -21,7 +21,7 @@ import java.util.List; 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.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/BasicP2RepositoryIntegrationTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/BasicP2RepositoryIntegrationTest.java index 39fc5fee9e..342491b098 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/BasicP2RepositoryIntegrationTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/BasicP2RepositoryIntegrationTest.java @@ -21,7 +21,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.test.AbstractTychoIntegrationTest; import org.eclipse.tycho.test.util.P2RepositoryTool; import org.eclipse.tycho.test.util.P2RepositoryTool.IU; @@ -39,7 +39,7 @@ public class BasicP2RepositoryIntegrationTest extends AbstractTychoIntegrationTe @BeforeClass public static void executeBuild() throws Exception { verifier = new BasicP2RepositoryIntegrationTest().getVerifier("/p2Repository", false); - verifier.addCliOption("-Dtest-data-repo=" + ResourceUtil.P2Repositories.ECLIPSE_LATEST.toString()); + verifier.addCliArgument("-Dtest-data-repo=" + ResourceUtil.P2Repositories.ECLIPSE_LATEST.toString()); verifier.executeGoal("verify"); verifier.verifyErrorFreeLog(); p2Repo = P2RepositoryTool.forEclipseRepositoryModule(new File(verifier.getBasedir())); @@ -93,7 +93,7 @@ public void testXZCompression() throws Exception { @Test public void testDependencyList() throws Exception { Verifier dependencyListVerifier = getVerifier("/p2Repository.basic"); - dependencyListVerifier.addCliOption("-Dtest-data-repo=" + ResourceUtil.P2Repositories.ECLIPSE_352); + dependencyListVerifier.addCliArgument("-Dtest-data-repo=" + ResourceUtil.P2Repositories.ECLIPSE_352); dependencyListVerifier.executeGoal("dependency:list"); dependencyListVerifier.verifyErrorFreeLog(); File logFile = new File(dependencyListVerifier.getBasedir(), dependencyListVerifier.getLogFileName()); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/DownloadStatsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/DownloadStatsTest.java index d15c2353c8..99c294282c 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/DownloadStatsTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/DownloadStatsTest.java @@ -24,7 +24,7 @@ import java.util.function.Predicate; 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.eclipse.tycho.test.util.ResourceUtil.P2Repositories; import org.junit.Test; @@ -39,7 +39,7 @@ public class DownloadStatsTest extends AbstractTychoIntegrationTest { @Test public void testNoDownloadStatsByDefault() throws Exception { Verifier verifier = getVerifier("p2Repository.reactor", false); - verifier.addCliOption("-De352-repo=" + P2Repositories.ECLIPSE_352.toString()); + verifier.addCliArgument("-De352-repo=" + P2Repositories.ECLIPSE_352.toString()); verifier.executeGoal("package"); verifier.verifyErrorFreeLog(); @@ -50,8 +50,8 @@ public void testNoDownloadStatsByDefault() throws Exception { @Test public void testDownloadStatsAddedUponProperty() throws Exception { Verifier verifier = getVerifier("p2Repository.reactor", false); - verifier.addCliOption("-De352-repo=" + P2Repositories.ECLIPSE_352.toString()); - verifier.addCliOption("-Dtycho.generateDownloadStatsProperty=true"); + verifier.addCliArgument("-De352-repo=" + P2Repositories.ECLIPSE_352.toString()); + verifier.addCliArgument("-Dtycho.generateDownloadStatsProperty=true"); verifier.executeGoal("package"); verifier.verifyErrorFreeLog(); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/MavenP2SiteTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/MavenP2SiteTest.java index 99a8c3e6f0..03c0b7a923 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/MavenP2SiteTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/MavenP2SiteTest.java @@ -18,7 +18,7 @@ import java.nio.file.Files; import java.nio.file.Paths; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/P2ArtifactMappingToMavenRepoTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/P2ArtifactMappingToMavenRepoTest.java index d94b430cba..3065ad17d4 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/P2ArtifactMappingToMavenRepoTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/P2ArtifactMappingToMavenRepoTest.java @@ -14,8 +14,8 @@ import java.io.File; import java.nio.file.Files; -import org.apache.maven.it.Verifier; import org.apache.maven.repository.RepositorySystem; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.eclipse.tycho.test.util.ResourceUtil; import org.junit.Test; @@ -25,7 +25,7 @@ public class P2ArtifactMappingToMavenRepoTest extends AbstractTychoIntegrationTe @Test public void testMapperReferenceMavenCentral() throws Exception { Verifier verifier = getVerifier("p2Repository.mavenRepo"); - verifier.addCliOption("-Dtest-data-repo=" + ResourceUtil.P2Repositories.ECLIPSE_352.toString()); + verifier.addCliArgument("-Dtest-data-repo=" + ResourceUtil.P2Repositories.ECLIPSE_352.toString()); verifier.executeGoal("package"); verifier.verifyErrorFreeLog(); File repository = new File(verifier.getBasedir(), "target/repository"); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/P2RepositoryDownloadTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/P2RepositoryDownloadTest.java index ab891cc4dd..ef274a6311 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/P2RepositoryDownloadTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/P2RepositoryDownloadTest.java @@ -21,8 +21,8 @@ import java.util.stream.Collectors; 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.eclipse.tycho.p2.repository.FileBasedTychoRepositoryIndex; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/P2RepositoryPropertiesTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/P2RepositoryPropertiesTest.java index 0a4714c5d8..a8d4e9d1cc 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/P2RepositoryPropertiesTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/P2RepositoryPropertiesTest.java @@ -23,7 +23,7 @@ import java.util.Optional; import java.util.stream.Collectors; -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.eclipse.tycho.test.util.ResourceUtil.P2Repositories; @@ -38,7 +38,7 @@ public class P2RepositoryPropertiesTest extends AbstractTychoIntegrationTest { @Test public void testArtifactRepositoryExtraProperties() throws Exception { Verifier verifier = getVerifier("p2Repository.reactor", false); - verifier.addCliOption("-De352-repo=" + P2Repositories.ECLIPSE_352.toString()); + verifier.addCliArgument("-De352-repo=" + P2Repositories.ECLIPSE_352.toString()); verifier.executeGoal("package"); verifier.verifyErrorFreeLog(); File artifactXml = new File(verifier.getBasedir(), "eclipse-repository/target/repository/artifacts.xml"); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/P2RepositoryValidateTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/P2RepositoryValidateTest.java index aaabd66da7..44562cd762 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/P2RepositoryValidateTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/P2RepositoryValidateTest.java @@ -18,8 +18,8 @@ import java.io.File; import java.util.Arrays; -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.eclipse.tycho.test.util.ResourceUtil.P2Repositories; import org.junit.Test; @@ -29,7 +29,7 @@ public class P2RepositoryValidateTest extends AbstractTychoIntegrationTest { @Test public void testValidate() throws Exception { Verifier verifier = getVerifier("p2Repository.unresolvableIU", false); - verifier.addCliOption("-Dtest-data-repo=" + P2Repositories.ECLIPSE_352.toString()); + verifier.addCliArgument("-Dtest-data-repo=" + P2Repositories.ECLIPSE_352.toString()); try { // validate is not always enough here as only in the prepare-package there is // the first mojo that requires classpath resolving and we want to delay it @@ -45,7 +45,7 @@ public void testValidate() throws Exception { @Test public void testValidateDoesNotFetch() throws Exception { Verifier verifier = getVerifier("p2Repository.basic", false); - verifier.addCliOption("-Dtest-data-repo=" + P2Repositories.ECLIPSE_352.toString()); + verifier.addCliArgument("-Dtest-data-repo=" + P2Repositories.ECLIPSE_352.toString()); File bundleCopyFolder = new File(verifier.getLocalRepository(), "p2/osgi/bundle/org.eclipse.osgi/3.5.2.R35x_v20100126"); // relative path should use some API if (bundleCopyFolder.exists()) { diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/QualifierExpansionAndArtifactAssemblyTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/QualifierExpansionAndArtifactAssemblyTest.java index afb7dda181..0409e08536 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/QualifierExpansionAndArtifactAssemblyTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/QualifierExpansionAndArtifactAssemblyTest.java @@ -20,7 +20,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.eclipse.tycho.test.util.P2RepositoryTool; import org.eclipse.tycho.test.util.P2RepositoryTool.IU; @@ -50,7 +50,7 @@ public class QualifierExpansionAndArtifactAssemblyTest extends AbstractTychoInte @BeforeClass public static void executeBuild() throws Exception { verifier = new QualifierExpansionAndArtifactAssemblyTest().getVerifier("p2Repository.reactor", false); - verifier.addCliOption("-De352-repo=" + P2Repositories.ECLIPSE_352.toString()); + verifier.addCliArgument("-De352-repo=" + P2Repositories.ECLIPSE_352.toString()); /* * Do not execute "install" to ensure that features and bundles can be included diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/RepoRefLocationP2RepositoryIntegrationTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/RepoRefLocationP2RepositoryIntegrationTest.java index 401858bfb9..0a56483fe1 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/RepoRefLocationP2RepositoryIntegrationTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/RepoRefLocationP2RepositoryIntegrationTest.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Objects; -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; import org.junit.BeforeClass; @@ -69,7 +69,7 @@ public String toString() { public static void executeBuild() throws Exception { verifier = new RepoRefLocationP2RepositoryIntegrationTest().getVerifier("/p2Repository.repositoryRef.location", false); - verifier.addCliOption("-Dtest-data-repo=" + ResourceUtil.P2Repositories.ECLIPSE_LATEST.toString()); + verifier.addCliArgument("-Dtest-data-repo=" + ResourceUtil.P2Repositories.ECLIPSE_LATEST.toString()); verifier.executeGoal("package"); verifier.verifyErrorFreeLog(); } diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/TransitiveP2RepoTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/TransitiveP2RepoTest.java index 54e848b4c1..31c5fdb708 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/TransitiveP2RepoTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/p2Repository/TransitiveP2RepoTest.java @@ -18,7 +18,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.BeforeClass; import org.junit.Test; @@ -34,7 +34,7 @@ public class TransitiveP2RepoTest extends AbstractTychoIntegrationTest { @BeforeClass public static void buildFeatureAndBundlesAndRepos() throws Exception { verifier = new TransitiveP2RepoTest().getVerifier("p2Repository.transitive", false); - verifier.addCliOption("-Dp2.repo=" + ECLIPSE_352.toString()); + verifier.addCliArgument("-Dp2.repo=" + ECLIPSE_352.toString()); /* * Do not execute "install" to ensure that features and bundles can be included * directly from the build results of the local reactor. diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/AttachedZipTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/AttachedZipTest.java index b3c9a037a7..e45713c2c8 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/AttachedZipTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/AttachedZipTest.java @@ -13,7 +13,7 @@ package org.eclipse.tycho.test.packaging; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/BaselineValidateAndReplaceTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/BaselineValidateAndReplaceTest.java index e3493fff1f..03be2fbd12 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/BaselineValidateAndReplaceTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/BaselineValidateAndReplaceTest.java @@ -7,8 +7,8 @@ import java.util.Arrays; import java.util.List; -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.codehaus.plexus.util.FileUtils; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Assert; @@ -27,7 +27,7 @@ public static void setupClass() throws IOException { private Verifier getVerifier(String project, File baselineRepo) throws Exception { Verifier verifier = getVerifier("/packaging.reproducibleArtifacts/" + project, true); - verifier.addCliOption("-Dbaseline-repo=" + baselineRepo.toURI().toString()); + verifier.addCliArgument("-Dbaseline-repo=" + baselineRepo.toURI().toString()); return verifier; } @@ -76,7 +76,7 @@ public void testRebuildOfTheSameCodebase() throws Exception { @Test public void testNewVersion() throws Exception { Verifier verifier = getVerifier("baseline/src", baselineRepo); - verifier.addCliOption("-DversionQualifier=2"); + verifier.addCliArgument("-DversionQualifier=2"); verifier.executeGoals(List.of("clean", "package")); verifier.verifyErrorFreeLog(); @@ -125,7 +125,7 @@ public void testContentChangedStrict() throws Exception { public void testBaselineDisable() throws Exception { Verifier verifier = getVerifier("contentchanged", baselineRepo); - verifier.addCliOption("-Dtycho.baseline=disable"); + verifier.addCliArgument("-Dtycho.baseline=disable"); verifier.executeGoals(List.of("clean", "package")); verifier.verifyErrorFreeLog(); @@ -135,7 +135,7 @@ public void testBaselineDisable() throws Exception { public void testBaselineWarn() throws Exception { Verifier verifier = getVerifier("contentchanged", baselineRepo); - verifier.addCliOption("-Dtycho.baseline=warn"); + verifier.addCliArgument("-Dtycho.baseline=warn"); verifier.executeGoals(List.of("clean", "package")); verifier.verifyTextInLog("baseline and build artifacts have same version but different contents"); @@ -145,7 +145,7 @@ public void testBaselineWarn() throws Exception { public void testBaselineWarn_changedAttachedArtifact() throws Exception { Verifier verifier = getVerifier("changedattachedartifact", baselineRepo); - verifier.addCliOption("-Dtycho.baseline=warn"); + verifier.addCliArgument("-Dtycho.baseline=warn"); verifier.executeGoals(List.of("clean", "package")); verifier.verifyTextInLog("baseline and build artifacts have same version but different contents"); @@ -158,7 +158,7 @@ public void testBaselineWarn_changedAttachedArtifact() throws Exception { public void testBaselineFailCommon_Changed() throws Exception { Verifier verifier = getVerifier("contentchanged", baselineRepo); - verifier.addCliOption("-Dtycho.baseline=failCommon"); + verifier.addCliArgument("-Dtycho.baseline=failCommon"); try { verifier.executeGoals(List.of("clean", "package")); @@ -173,8 +173,8 @@ public void testBaselineFailCommon_Changed() throws Exception { public void testBaselineFailCommon_Changed_ignoredFiles() throws Exception { Verifier verifier = getVerifier("contentchanged", baselineRepo); verifier.getCliOptions().addAll(Arrays.asList("--projects", "bundle01")); - verifier.addCliOption("-PignoreChanged"); - verifier.addCliOption("-Dtycho.baseline=failCommon"); + verifier.addCliArgument("-PignoreChanged"); + verifier.addCliArgument("-Dtycho.baseline=failCommon"); verifier.executeGoals(List.of("clean", "package")); verifier.verifyErrorFreeLog(); } @@ -183,7 +183,7 @@ public void testBaselineFailCommon_Changed_ignoredFiles() throws Exception { public void testBaselineFailCommon_newAttachedArtifact() throws Exception { Verifier verifier = getVerifier("newattachedartifact", baselineRepo); - verifier.addCliOption("-Dtycho.baseline=failCommon"); + verifier.addCliArgument("-Dtycho.baseline=failCommon"); try { verifier.executeGoals(List.of("clean", "package")); } catch (VerificationException expected) { @@ -196,7 +196,7 @@ public void testBaselineFailCommon_newAttachedArtifact() throws Exception { public void testBaselineFail() throws Exception { Verifier verifier = getVerifier("newattachedartifact", baselineRepo); - verifier.addCliOption("-Dtycho.baseline=fail"); + verifier.addCliArgument("-Dtycho.baseline=fail"); try { verifier.executeGoals(List.of("clean", "package")); @@ -211,7 +211,7 @@ public void testBaselineFail() throws Exception { public void testBaselineFail_changedAttachedArtifact() throws Exception { Verifier verifier = getVerifier("changedattachedartifact", baselineRepo); - verifier.addCliOption("-Dtycho.baseline=fail"); + verifier.addCliArgument("-Dtycho.baseline=fail"); try { verifier.executeGoals(List.of("clean", "package")); @@ -225,8 +225,8 @@ public void testBaselineFail_changedAttachedArtifact() throws Exception { public void testReplaceNone() throws Exception { Verifier verifier = getVerifier("contentchanged", baselineRepo); - verifier.addCliOption("-Dtycho.baseline=warn"); - verifier.addCliOption("-Dtycho.baseline.replace=none"); + verifier.addCliArgument("-Dtycho.baseline=warn"); + verifier.addCliArgument("-Dtycho.baseline.replace=none"); verifier.executeGoals(List.of("clean", "package")); verifier.verifyTextInLog("baseline and build artifacts have same version but different contents"); @@ -239,8 +239,8 @@ public void testReplaceNone() throws Exception { public void testReplaceCommon() throws Exception { Verifier verifier = getVerifier("newattachedartifact", baselineRepo); - verifier.addCliOption("-Dtycho.baseline=warn"); - verifier.addCliOption("-Dtycho.baseline.replace=common"); + verifier.addCliArgument("-Dtycho.baseline=warn"); + verifier.addCliArgument("-Dtycho.baseline.replace=common"); verifier.executeGoals(List.of("clean", "package")); verifier.verifyTextInLog("baseline and build artifacts have same version but different contents"); @@ -257,8 +257,8 @@ public void testReplaceCommon() throws Exception { public void testReplaceAll() throws Exception { Verifier verifier = getVerifier("newattachedartifact", baselineRepo); - verifier.addCliOption("-Dtycho.baseline=warn"); - verifier.addCliOption("-Dtycho.baseline.replace=all"); + verifier.addCliArgument("-Dtycho.baseline=warn"); + verifier.addCliArgument("-Dtycho.baseline.replace=all"); verifier.executeGoals(Arrays.asList("clean", "package")); verifier.verifyTextInLog("baseline and build artifacts have same version but different contents"); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/BuildQualifierTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/BuildQualifierTest.java index 51bc3ca956..f39c8f8fc2 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/BuildQualifierTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/BuildQualifierTest.java @@ -18,7 +18,7 @@ import java.nio.file.Files; import java.nio.file.Path; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/ConsumerPomTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/ConsumerPomTest.java index 628b1f0da3..d7587bb777 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/ConsumerPomTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/ConsumerPomTest.java @@ -21,7 +21,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.model.Dependency; import org.apache.maven.model.Model; import org.apache.maven.model.io.DefaultModelReader; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/CustomManifestAndFeatureTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/CustomManifestAndFeatureTest.java index 58567f2093..af782a2211 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/CustomManifestAndFeatureTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/CustomManifestAndFeatureTest.java @@ -1,6 +1,6 @@ package org.eclipse.tycho.test.packaging; -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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/DefaultBuildTimestampProviderTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/DefaultBuildTimestampProviderTest.java index e1b6f628b1..838e7d4032 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/DefaultBuildTimestampProviderTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/DefaultBuildTimestampProviderTest.java @@ -18,7 +18,7 @@ import java.text.SimpleDateFormat; import java.util.Date; -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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/PackageNestedJarsAndDirsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/PackageNestedJarsAndDirsTest.java index 06ffda8dce..45c99dc07c 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/PackageNestedJarsAndDirsTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/packaging/PackageNestedJarsAndDirsTest.java @@ -24,7 +24,7 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/pgp/TestPGPSigning.java b/tycho-its/src/test/java/org/eclipse/tycho/test/pgp/TestPGPSigning.java index fc93e0992a..2ec1e1f8ac 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/pgp/TestPGPSigning.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/pgp/TestPGPSigning.java @@ -32,8 +32,8 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -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.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPPublicKey; import org.bouncycastle.openpgp.PGPSignature; @@ -103,7 +103,7 @@ public class TestPGPSigning extends AbstractTychoIntegrationTest { private Verifier createVerifier() throws Exception { var verifier = getVerifier("gpg.sign.p2.basic", true); - verifier.addCliOption("-Pgpg-sign"); + verifier.addCliArgument("-Pgpg-sign"); // This forces gpg NOT to be used. verifier.setSystemProperty("org.eclipse.tycho.test.pgp.info", PGP_INFO.toString()); @@ -288,7 +288,7 @@ public void testResigningMerge() throws Exception { return; } - verifier.addCliOption("-Pgpg-sign-2"); + verifier.addCliArgument("-Pgpg-sign-2"); verifier.setSystemProperty("test.forceSignature", "bcpg"); verifier.setSystemProperty("test.pgpKeyBehavior-2", "merge"); verifier.setSystemProperty("gpg-keyname-2", SECONDARY_KEY_NAME); @@ -322,7 +322,7 @@ public void testResigningMergeSameKey() throws Exception { return; } - verifier.addCliOption("-Pgpg-sign-2"); + verifier.addCliArgument("-Pgpg-sign-2"); verifier.setSystemProperty("test.forceSignature", "bcpg"); verifier.setSystemProperty("test.pgpKeyBehavior-2", "merge"); verifier.setSystemProperty("gpg-keyname-2", PRIMARY_KEY_NAME); @@ -356,7 +356,7 @@ public void testResigningReplace() throws Exception { return; } - verifier.addCliOption("-Pgpg-sign-2"); + verifier.addCliArgument("-Pgpg-sign-2"); verifier.setSystemProperty("test.forceSignature", "bcpg"); verifier.setSystemProperty("test.pgpKeyBehavior-2", "replace"); verifier.setSystemProperty("gpg-keyname-2", SECONDARY_KEY_NAME); @@ -391,7 +391,7 @@ public void testResigningSkip() throws Exception { return; } - verifier.addCliOption("-Pgpg-sign-2"); + verifier.addCliArgument("-Pgpg-sign-2"); verifier.setSystemProperty("test.forceSignature", "bcpg"); verifier.setSystemProperty("test.pgpKeyBehavior-2", "skip"); verifier.setSystemProperty("gpg-keyname-2", SECONDARY_KEY_NAME); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencies/PomDependencyWrapTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencies/PomDependencyWrapTest.java index a37ef43325..8392d843e1 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencies/PomDependencyWrapTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencies/PomDependencyWrapTest.java @@ -11,7 +11,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.P2RepositoryTool; import org.junit.Assert; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencyConsider/PackagingPomDependencyWithTimestampProviderTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencyConsider/PackagingPomDependencyWithTimestampProviderTest.java index 41c8ac3ea0..061ccc2efd 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencyConsider/PackagingPomDependencyWithTimestampProviderTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencyConsider/PackagingPomDependencyWithTimestampProviderTest.java @@ -2,7 +2,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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencyConsider/PomDependencyIgnoreTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencyConsider/PomDependencyIgnoreTest.java index 925949c455..ab117c35af 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencyConsider/PomDependencyIgnoreTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencyConsider/PomDependencyIgnoreTest.java @@ -9,7 +9,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.pomDependencyConsider; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencyConsider/PomDependencyOnLocallyBuiltTychoArtifactTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencyConsider/PomDependencyOnLocallyBuiltTychoArtifactTest.java index f4c2ea44fc..8822bd7f27 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencyConsider/PomDependencyOnLocallyBuiltTychoArtifactTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencyConsider/PomDependencyOnLocallyBuiltTychoArtifactTest.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.DefaultPlexusContainer; import org.eclipse.tycho.p2.repository.GAV; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencyConsider/PomDependencyOnNonTychoArtifactTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencyConsider/PomDependencyOnNonTychoArtifactTest.java index 91e7ee4b82..4a7b5a6666 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencyConsider/PomDependencyOnNonTychoArtifactTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencyConsider/PomDependencyOnNonTychoArtifactTest.java @@ -17,7 +17,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.eclipse.tycho.test.util.P2RepositoryTool; import org.junit.Assert; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencyConsider/PomDependencySystemScopedTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencyConsider/PomDependencySystemScopedTest.java index 9c934c99fe..e9325be743 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencyConsider/PomDependencySystemScopedTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/pomDependencyConsider/PomDependencySystemScopedTest.java @@ -16,7 +16,7 @@ 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; @@ -26,7 +26,7 @@ public class PomDependencySystemScopedTest extends AbstractTychoIntegrationTest public void testSystemScopedDependenciesIgnored() throws Exception { // project with pomDependency=consider and checked-in nested jar Verifier verifier = getVerifier("pomDependencyConsider.systemScope", false); - verifier.addCliOption("-Drepo.url=" + ECLIPSE_LATEST.toString()); + verifier.addCliArgument("-Drepo.url=" + ECLIPSE_LATEST.toString()); // fails on second resolver invocation in TestMojo // if (injected) system-scoped dependencies are not filtered out for // pomDependency=consider diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/product/BuildProductWithIgnoredContentTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/product/BuildProductWithIgnoredContentTest.java index a63d21d477..8b5295acc9 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/product/BuildProductWithIgnoredContentTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/product/BuildProductWithIgnoredContentTest.java @@ -19,7 +19,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.eclipse.tycho.test.util.P2RepositoryTool; import org.eclipse.tycho.test.util.P2RepositoryTool.IU; @@ -43,7 +43,7 @@ public void testBuildOfProductWithBundlesDespiteUseFeaturesTrue() throws Excepti * bundles. */ Verifier verifier = getVerifier("product.sourceFile.leftovers", false); - verifier.addCliOption("-Dtest-data-repo=" + P2Repositories.ECLIPSE_342.toString()); + verifier.addCliArgument("-Dtest-data-repo=" + P2Repositories.ECLIPSE_342.toString()); verifier.executeGoal("verify"); verifier.verifyErrorFreeLog(); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/product/BuildProductWithoutCleanTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/product/BuildProductWithoutCleanTest.java index d3f293eba7..b188457a96 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/product/BuildProductWithoutCleanTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/product/BuildProductWithoutCleanTest.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.eclipse.tycho.test.util.P2RepositoryTool; import org.eclipse.tycho.test.util.P2RepositoryTool.IU; @@ -29,7 +29,7 @@ public class BuildProductWithoutCleanTest extends AbstractTychoIntegrationTest { @Test public void testProductUnitsAreCleaned() throws Exception { Verifier verifier = getVerifier("product.clean", false); - verifier.addCliOption("-Dtest-data-repo=" + P2Repositories.ECLIPSE_342.toString()); + verifier.addCliArgument("-Dtest-data-repo=" + P2Repositories.ECLIPSE_342.toString()); // run build to make target folder dirty verifier.executeGoal("package"); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/product/InvalidProductTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/product/InvalidProductTest.java index 2f6912ea73..6004195ddf 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/product/InvalidProductTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/product/InvalidProductTest.java @@ -11,8 +11,8 @@ import static org.junit.Assert.fail; -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.eclipse.tycho.test.util.ResourceUtil.P2Repositories; import org.junit.Test; @@ -22,7 +22,7 @@ public class InvalidProductTest extends AbstractTychoIntegrationTest { @Test public void testInvalidProductFile() throws Exception { Verifier verifier = getVerifier("product.invalid", false); - verifier.addCliOption("-Dtest-data-repo=" + P2Repositories.ECLIPSE_342.toString()); + verifier.addCliArgument("-Dtest-data-repo=" + P2Repositories.ECLIPSE_342.toString()); // run build and verify we get a proper error message instead of an NPE try { diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/product/MetaRequirementsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/product/MetaRequirementsTest.java index a36e3e3c0d..98097b6a96 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/product/MetaRequirementsTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/product/MetaRequirementsTest.java @@ -16,7 +16,7 @@ import static org.hamcrest.Matchers.startsWithIgnoringCase; import static org.junit.Assume.assumeThat; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductArchiveFormatTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductArchiveFormatTest.java index ee699f85bb..11c28345f5 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductArchiveFormatTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductArchiveFormatTest.java @@ -15,7 +15,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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductBuildTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductBuildTest.java index 59ccaf6096..623cf6a376 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductBuildTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductBuildTest.java @@ -20,7 +20,7 @@ import java.util.Optional; import java.util.stream.Collectors; -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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductDefinitionCrosstalkTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductDefinitionCrosstalkTest.java index 997ed37550..ccfcbb05ec 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductDefinitionCrosstalkTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductDefinitionCrosstalkTest.java @@ -18,7 +18,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.P2RepositoryTool; import org.eclipse.tycho.test.util.ResourceUtil.P2Repositories; @@ -35,7 +35,7 @@ public void testProductContentNotLeakedBetweenProducts() throws Exception { // an eclipse-repository module with two product definitions, each containing // exactly one bundle Verifier verifier = getVerifier("product.crosstalk", false); - verifier.addCliOption("-Dtest-data-repo=" + P2Repositories.ECLIPSE_342.toString()); + verifier.addCliArgument("-Dtest-data-repo=" + P2Repositories.ECLIPSE_342.toString()); verifier.executeGoal("verify"); verifier.verifyErrorFreeLog(); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductDuplicateIUsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductDuplicateIUsTest.java index ff83b8ba72..99a0e64b56 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductDuplicateIUsTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductDuplicateIUsTest.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.product; -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,7 +22,7 @@ public class ProductDuplicateIUsTest extends AbstractTychoIntegrationTest { @Test public void testMultipleProductsNoDuplicateIUs() throws Exception { Verifier verifier = getVerifier("product.duplicateIUs", false); - verifier.addCliOption("-Dtest-data-repo=" + P2Repositories.ECLIPSE_LATEST.toString()); + verifier.addCliArgument("-Dtest-data-repo=" + P2Repositories.ECLIPSE_LATEST.toString()); verifier.executeGoal("integration-test"); verifier.verifyErrorFreeLog(); } diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductMixedVersionsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductMixedVersionsTest.java index 9c0da351c7..fc5504614e 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductMixedVersionsTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductMixedVersionsTest.java @@ -20,7 +20,7 @@ import java.nio.file.Files; 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.eclipse.tycho.test.util.ResourceUtil.P2Repositories; import org.junit.Test; @@ -29,7 +29,7 @@ public class ProductMixedVersionsTest extends AbstractTychoIntegrationTest { @Test public void testMixedPluginVersions() throws Exception { Verifier verifier = getVerifier("product.differentVersions", false); - verifier.addCliOption("-Dplatform-url=" + P2Repositories.ECLIPSE_LATEST.toString()); + verifier.addCliArgument("-Dplatform-url=" + P2Repositories.ECLIPSE_LATEST.toString()); verifier.executeGoals(Arrays.asList("clean", "verify")); verifier.verifyErrorFreeLog(); // check that simple configurator is there... diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductTypesTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductTypesTest.java index d69f043cbf..4e803fb76f 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductTypesTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/product/ProductTypesTest.java @@ -4,7 +4,7 @@ import java.nio.file.Path; 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.BeforeClass; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/product/ReferenceBetweenProductsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/product/ReferenceBetweenProductsTest.java index 6becf43d25..9670b5607c 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/product/ReferenceBetweenProductsTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/product/ReferenceBetweenProductsTest.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.test.AbstractTychoIntegrationTest; import org.eclipse.tycho.test.util.P2RepositoryTool; import org.eclipse.tycho.test.util.ResourceUtil.P2Repositories; @@ -30,7 +30,7 @@ public class ReferenceBetweenProductsTest extends AbstractTychoIntegrationTest { @Test public void testProductCanReferenceProductFromDifferentModule() throws Exception { Verifier verifier = getVerifier("product.crossReference", false); - verifier.addCliOption("-Dtest-data-repo=" + P2Repositories.ECLIPSE_LATEST.toString()); + verifier.addCliArgument("-Dtest-data-repo=" + P2Repositories.ECLIPSE_LATEST.toString()); verifier.executeGoal("verify"); verifier.verifyErrorFreeLog(); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/product/Tycho188P2EnabledRcpTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/product/Tycho188P2EnabledRcpTest.java index d953b13684..392113a885 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/product/Tycho188P2EnabledRcpTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/product/Tycho188P2EnabledRcpTest.java @@ -28,7 +28,8 @@ import java.util.Properties; import java.util.Set; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.VerificationException; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.TargetEnvironment; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.eclipse.tycho.test.util.ArchiveContentUtil; @@ -237,8 +238,8 @@ private static void assertContainsEntry(File file, String prefix) throws Excepti } } - static private void assertRepositoryArtifacts(Verifier verifier) { - verifier.assertArtifactPresent(GROUP_ID, ARTIFACT_ID, VERSION, "zip"); + static private void assertRepositoryArtifacts(Verifier verifier) throws VerificationException { + verifier.verifyArtifactPresent(GROUP_ID, ARTIFACT_ID, VERSION, "zip"); } static private void assertTotalZipArtifacts(final Verifier verifier, final int expectedArtifacts) { diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/product/Tycho465RootFilesTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/product/Tycho465RootFilesTest.java index 67358b98b9..56e573ae95 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/product/Tycho465RootFilesTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/product/Tycho465RootFilesTest.java @@ -20,7 +20,7 @@ import java.util.Set; import java.util.zip.ZipException; -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; @@ -37,7 +37,7 @@ public class Tycho465RootFilesTest extends AbstractTychoIntegrationTest { public void testProductBuild() throws Exception { Verifier verifier = getVerifier("product.rootFiles", true); - verifier.addCliOption("-DforceContextQualifier=" + QUALIFIER.toString()); + verifier.addCliArgument("-DforceContextQualifier=" + QUALIFIER.toString()); verifier.executeGoal("install"); verifier.verifyErrorFreeLog(); @@ -60,7 +60,7 @@ public void testProductBuild() throws Exception { Verifier eclipseRepoProjectVerifier = getVerifier("product.rootFiles/eclipse-repository", true, ignoreLocallyInstalledArtifacts); - eclipseRepoProjectVerifier.addCliOption("-DforceContextQualifier=" + QUALIFIER.toString()); + eclipseRepoProjectVerifier.addCliArgument("-DforceContextQualifier=" + QUALIFIER.toString()); eclipseRepoProjectVerifier.executeGoal("verify"); eclipseRepoProjectVerifier.verifyErrorFreeLog(); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/reactor/makeBehaviour/MavenReactorMakeOptionsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/reactor/makeBehaviour/MavenReactorMakeOptionsTest.java index df87d7ceb9..8263976523 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/reactor/makeBehaviour/MavenReactorMakeOptionsTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/reactor/makeBehaviour/MavenReactorMakeOptionsTest.java @@ -16,8 +16,8 @@ import java.util.List; -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.Before; import org.junit.Test; @@ -44,48 +44,48 @@ public class MavenReactorMakeOptionsTest extends AbstractTychoIntegrationTest { @Before public void setUp() throws Exception { verifier = getVerifier("reactor.makeBehaviour"); - verifier.addCliOption("-T1C"); + verifier.addCliArgument("-T1C"); } @Test public void testCompleteBuild() throws Exception { verifier.executeGoals(List.of("clean", "verify")); verifier.verifyErrorFreeLog(); - verifier.assertFilePresent("bundle1/target/bundle1-1.0.0-SNAPSHOT.jar"); - verifier.assertFilePresent("bundle1a/target/bundle1a-1.0.0-SNAPSHOT.jar"); - verifier.assertFilePresent("bundle1b/target/bundle1b-1.0.0-SNAPSHOT.jar"); - verifier.assertFilePresent("bundle2/target/bundle2-1.0.0-SNAPSHOT.jar"); - verifier.assertFilePresent("feature1/target/feature1-1.0.0-SNAPSHOT.jar"); - verifier.assertFilePresent("feature2/target/feature2-1.0.0-SNAPSHOT.jar"); + verifier.verifyFilePresent("bundle1/target/bundle1-1.0.0-SNAPSHOT.jar"); + verifier.verifyFilePresent("bundle1a/target/bundle1a-1.0.0-SNAPSHOT.jar"); + verifier.verifyFilePresent("bundle1b/target/bundle1b-1.0.0-SNAPSHOT.jar"); + verifier.verifyFilePresent("bundle2/target/bundle2-1.0.0-SNAPSHOT.jar"); + verifier.verifyFilePresent("feature1/target/feature1-1.0.0-SNAPSHOT.jar"); + verifier.verifyFilePresent("feature2/target/feature2-1.0.0-SNAPSHOT.jar"); } @Test public void testAlsoMake() throws Exception { // REACTOR_MAKE_UPSTREAM - verifier.addCliOption("-am"); - verifier.addCliOption("-pl feature1"); + verifier.addCliArgument("-am"); + verifier.addCliArguments("-pl", "feature1"); verifier.executeGoals(List.of("clean", "verify")); verifier.verifyErrorFreeLog(); - verifier.assertFilePresent("bundle1/target/bundle1-1.0.0-SNAPSHOT.jar"); - verifier.assertFileNotPresent("bundle1a/target/bundle1a-1.0.0-SNAPSHOT.jar"); - verifier.assertFileNotPresent("bundle1b/target/bundle1b-1.0.0-SNAPSHOT.jar"); - verifier.assertFileNotPresent("bundle2/target/bundle2-1.0.0-SNAPSHOT.jar"); - verifier.assertFilePresent("feature1/target/feature1-1.0.0-SNAPSHOT.jar"); - verifier.assertFileNotPresent("feature2/target/feature2-1.0.0-SNAPSHOT.jar"); + verifier.verifyFilePresent("bundle1/target/bundle1-1.0.0-SNAPSHOT.jar"); + verifier.verifyFileNotPresent("bundle1a/target/bundle1a-1.0.0-SNAPSHOT.jar"); + verifier.verifyFileNotPresent("bundle1b/target/bundle1b-1.0.0-SNAPSHOT.jar"); + verifier.verifyFileNotPresent("bundle2/target/bundle2-1.0.0-SNAPSHOT.jar"); + verifier.verifyFilePresent("feature1/target/feature1-1.0.0-SNAPSHOT.jar"); + verifier.verifyFileNotPresent("feature2/target/feature2-1.0.0-SNAPSHOT.jar"); } @Test public void testAlsoMakeSite() throws Exception { - verifier.addCliOption("-am"); - verifier.addCliOption("-pl site"); + verifier.addCliArgument("-am"); + verifier.addCliArguments("-pl", "site"); verifier.executeGoals(List.of("clean", "verify")); verifier.verifyErrorFreeLog(); } @Test public void testAlsoMakeProduct() throws Exception { - verifier.addCliOption("-am"); - verifier.addCliOption("-pl product"); + verifier.addCliArgument("-am"); + verifier.addCliArguments("-pl", "product"); verifier.executeGoals(List.of("clean", "verify")); verifier.verifyErrorFreeLog(); } @@ -93,51 +93,51 @@ public void testAlsoMakeProduct() throws Exception { @Test public void testAlsoMakeWithIndirectDependencies() throws Exception { // REACTOR_MAKE_UPSTREAM - verifier.addCliOption("-am"); - verifier.addCliOption("-pl bundle1b"); + verifier.addCliArgument("-am"); + verifier.addCliArguments("-pl", "bundle1b"); verifier.executeGoals(List.of("clean", "verify")); verifier.verifyErrorFreeLog(); - verifier.assertFilePresent("bundle1/target/bundle1-1.0.0-SNAPSHOT.jar"); - verifier.assertFilePresent("bundle1a/target/bundle1a-1.0.0-SNAPSHOT.jar"); - verifier.assertFilePresent("bundle1b/target/bundle1b-1.0.0-SNAPSHOT.jar"); - verifier.assertFileNotPresent("bundle2/target/bundle2-1.0.0-SNAPSHOT.jar"); - verifier.assertFileNotPresent("feature1/target/feature1-1.0.0-SNAPSHOT.jar"); - verifier.assertFileNotPresent("feature2/target/feature2-1.0.0-SNAPSHOT.jar"); + verifier.verifyFilePresent("bundle1/target/bundle1-1.0.0-SNAPSHOT.jar"); + verifier.verifyFilePresent("bundle1a/target/bundle1a-1.0.0-SNAPSHOT.jar"); + verifier.verifyFilePresent("bundle1b/target/bundle1b-1.0.0-SNAPSHOT.jar"); + verifier.verifyFileNotPresent("bundle2/target/bundle2-1.0.0-SNAPSHOT.jar"); + verifier.verifyFileNotPresent("feature1/target/feature1-1.0.0-SNAPSHOT.jar"); + verifier.verifyFileNotPresent("feature2/target/feature2-1.0.0-SNAPSHOT.jar"); } @Test public void testAlsoMakeDependentsNeedsToPickUpDependenciesOfDependents() throws Exception { // REACTOR_MAKE_DOWNSTREAM - verifier.addCliOption("-amd"); - verifier.addCliOption("-pl bundle1"); + verifier.addCliArgument("-amd"); + verifier.addCliArguments("-pl", "bundle1"); verifier.executeGoals(List.of("clean", "verify")); verifier.verifyErrorFreeLog(); - verifier.assertFilePresent("bundle1/target/bundle1-1.0.0-SNAPSHOT.jar"); - verifier.assertFilePresent("bundle1a/target/bundle1a-1.0.0-SNAPSHOT.jar"); - verifier.assertFilePresent("bundle1b/target/bundle1b-1.0.0-SNAPSHOT.jar"); - verifier.assertFilePresent("bundle2/target/bundle2-1.0.0-SNAPSHOT.jar"); - verifier.assertFilePresent("feature1/target/feature1-1.0.0-SNAPSHOT.jar"); - verifier.assertFilePresent("feature2/target/feature2-1.0.0-SNAPSHOT.jar"); + verifier.verifyFilePresent("bundle1/target/bundle1-1.0.0-SNAPSHOT.jar"); + verifier.verifyFilePresent("bundle1a/target/bundle1a-1.0.0-SNAPSHOT.jar"); + verifier.verifyFilePresent("bundle1b/target/bundle1b-1.0.0-SNAPSHOT.jar"); + verifier.verifyFilePresent("bundle2/target/bundle2-1.0.0-SNAPSHOT.jar"); + verifier.verifyFilePresent("feature1/target/feature1-1.0.0-SNAPSHOT.jar"); + verifier.verifyFilePresent("feature2/target/feature2-1.0.0-SNAPSHOT.jar"); } @Test public void testBoth() throws Exception { // REACTOR_MAKE_BOTH - verifier.addCliOption("-am"); - verifier.addCliOption("-amd"); - verifier.addCliOption("-pl feature1,bundle2"); + verifier.addCliArgument("-am"); + verifier.addCliArgument("-amd"); + verifier.addCliArguments("-pl", "feature1,bundle2"); verifier.executeGoals(List.of("clean", "verify")); verifier.verifyErrorFreeLog(); - verifier.assertFilePresent("bundle1/target/bundle1-1.0.0-SNAPSHOT.jar"); - verifier.assertFilePresent("bundle2/target/bundle2-1.0.0-SNAPSHOT.jar"); - verifier.assertFilePresent("feature1/target/feature1-1.0.0-SNAPSHOT.jar"); - verifier.assertFilePresent("feature2/target/feature2-1.0.0-SNAPSHOT.jar"); + verifier.verifyFilePresent("bundle1/target/bundle1-1.0.0-SNAPSHOT.jar"); + verifier.verifyFilePresent("bundle2/target/bundle2-1.0.0-SNAPSHOT.jar"); + verifier.verifyFilePresent("feature1/target/feature1-1.0.0-SNAPSHOT.jar"); + verifier.verifyFilePresent("feature2/target/feature2-1.0.0-SNAPSHOT.jar"); } @Test public void testSingleProjectNoOptionFails() throws Exception { try { - verifier.addCliOption("-pl feature1"); + verifier.addCliArguments("-pl", "feature1"); verifier.executeGoals(List.of("clean", "verify")); fail("Build should fail due to missing reactor dependency"); } catch (VerificationException e) { diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/BundleNativeCodeTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/BundleNativeCodeTest.java index 41371a3213..8740e3a5cf 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/BundleNativeCodeTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/BundleNativeCodeTest.java @@ -9,7 +9,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.resolver; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/CycleTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/CycleTest.java index 5ed61aa708..f1411c7f71 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/CycleTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/CycleTest.java @@ -14,7 +14,7 @@ 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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/ExtraCompilerRequirementsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/ExtraCompilerRequirementsTest.java index ca474f84af..4c8078de50 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/ExtraCompilerRequirementsTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/ExtraCompilerRequirementsTest.java @@ -14,7 +14,7 @@ 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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/OptionalDependenciesTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/OptionalDependenciesTest.java index e96028b982..366beff9b2 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/OptionalDependenciesTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/OptionalDependenciesTest.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.resolver; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/PomDependenciesTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/PomDependenciesTest.java index 9ae636dacb..9bca4df165 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/PomDependenciesTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/PomDependenciesTest.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.resolver; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/ReexportedRequireBundleTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/ReexportedRequireBundleTest.java index 2924ba1c54..29660a8dd5 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/ReexportedRequireBundleTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/ReexportedRequireBundleTest.java @@ -9,7 +9,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.resolver; -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; @@ -19,7 +19,7 @@ public class ReexportedRequireBundleTest extends AbstractTychoIntegrationTest { @Test public void testBundleNativeCode() throws Exception { Verifier verifier = getVerifier("/resolver.reexportBundle/transitively.require.org.eclipse.osgi"); - verifier.addCliOption("-Drepo=" + P2Repositories.ECLIPSE_LATEST.toString()); + verifier.addCliArgument("-Drepo=" + P2Repositories.ECLIPSE_LATEST.toString()); verifier.executeGoal("compile"); verifier.verifyErrorFreeLog(); } @@ -27,7 +27,7 @@ public void testBundleNativeCode() throws Exception { @Test public void testOrgEclipseCoreExpressions() throws Exception { Verifier verifier = getVerifier("/resolver.reexportBundle/org.eclipse.core.expressions"); - verifier.addCliOption("-Drepo=" + P2Repositories.ECLIPSE_LATEST.toString()); + verifier.addCliArgument("-Drepo=" + P2Repositories.ECLIPSE_LATEST.toString()); verifier.executeGoal("compile"); verifier.verifyErrorFreeLog(); } diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/ResolverTests.java b/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/ResolverTests.java index 7780af504a..a2d32c75ca 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/ResolverTests.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/ResolverTests.java @@ -14,7 +14,7 @@ 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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/SplitPackagesTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/SplitPackagesTest.java index 255f253d27..d5ccba73ef 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/SplitPackagesTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/SplitPackagesTest.java @@ -9,7 +9,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.resolver; -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; @@ -19,7 +19,7 @@ public class SplitPackagesTest extends AbstractTychoIntegrationTest { @Test public void testSplitPackage() throws Exception { Verifier verifier = getVerifier("/resolver.split/org.eclipse.equinox.security"); - verifier.addCliOption("-Drepo=" + P2Repositories.ECLIPSE_LATEST.toString()); + verifier.addCliArgument("-Drepo=" + P2Repositories.ECLIPSE_LATEST.toString()); verifier.executeGoal("compile"); verifier.verifyErrorFreeLog(); } diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/Tycho1127AddjarsIssueTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/Tycho1127AddjarsIssueTest.java index 0ceeada143..5cd946afc8 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/Tycho1127AddjarsIssueTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/resolver/Tycho1127AddjarsIssueTest.java @@ -2,7 +2,7 @@ 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; @@ -11,7 +11,7 @@ public class Tycho1127AddjarsIssueTest extends AbstractTychoIntegrationTest { @Test public void testTycho1127AddjarsIssue() throws Exception { Verifier verifier = getVerifier("resolver.tycho1127_addjars_issue", false, false); - verifier.addCliOption("-Dtycho.resolver.classic=false"); + verifier.addCliArgument("-Dtycho.resolver.classic=false"); verifier.executeGoals(List.of("clean", "install")); verifier.verifyErrorFreeLog(); } diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/selundqma/SeLundqmaTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/selundqma/SeLundqmaTest.java index c245cbbbf4..73b61506e6 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/selundqma/SeLundqmaTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/selundqma/SeLundqmaTest.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.selundqma; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/sourceBundle/AutoGenerateSourceArtifactsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/sourceBundle/AutoGenerateSourceArtifactsTest.java index fa7172c1c9..11536d3eb0 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/sourceBundle/AutoGenerateSourceArtifactsTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/sourceBundle/AutoGenerateSourceArtifactsTest.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.sourceBundle; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/sourceBundle/AutoNoSourceBundleTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/sourceBundle/AutoNoSourceBundleTest.java index 559c1ce09e..3600f0d69c 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/sourceBundle/AutoNoSourceBundleTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/sourceBundle/AutoNoSourceBundleTest.java @@ -12,8 +12,8 @@ *******************************************************************************/ package org.eclipse.tycho.test.sourceBundle; -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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/sourceBundle/PDESourceHeaderGenerationTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/sourceBundle/PDESourceHeaderGenerationTest.java index 6e709023c4..2ab106f73b 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/sourceBundle/PDESourceHeaderGenerationTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/sourceBundle/PDESourceHeaderGenerationTest.java @@ -9,7 +9,7 @@ import java.util.jar.Attributes; 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.jupiter.api.Test; import org.osgi.framework.Constants; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/sourceBundle/SourceBundlesNestedJarsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/sourceBundle/SourceBundlesNestedJarsTest.java index eaa3cf4413..a2f7b18fff 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/sourceBundle/SourceBundlesNestedJarsTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/sourceBundle/SourceBundlesNestedJarsTest.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.jar.JarFile; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.osgi.util.ManifestElement; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/sourceBundle/TychoSourcePluginTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/sourceBundle/TychoSourcePluginTest.java index 2b14ec4bb9..4439e6a234 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/sourceBundle/TychoSourcePluginTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/sourceBundle/TychoSourcePluginTest.java @@ -29,7 +29,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.Test; @@ -42,7 +42,7 @@ public class TychoSourcePluginTest extends AbstractTychoIntegrationTest { @Test public void testBasic() throws Exception { Verifier verifier = getVerifier("/sourcePlugin/basic", false, false); - verifier.addCliOption("-De342-url=" + ECLIPSE_342.toString()); + verifier.addCliArgument("-De342-url=" + ECLIPSE_342.toString()); verifier.executeGoals(List.of("clean", "install")); verifier.verifyErrorFreeLog(); File feature = new File(verifier.getBasedir(), @@ -105,7 +105,7 @@ private static Optional findEntry(ZipFile zip, String name) { @Test public void testExtraSourceBundles() throws Exception { Verifier verifier = getVerifier("/sourcePlugin/extra-source-bundles", false, false); - verifier.addCliOption("-De342-url=" + ECLIPSE_342.toString()); + verifier.addCliArgument("-De342-url=" + ECLIPSE_342.toString()); verifier.executeGoals(List.of("clean", "install")); verifier.verifyErrorFreeLog(); File file = new File(verifier.getBasedir(), @@ -116,7 +116,7 @@ public void testExtraSourceBundles() throws Exception { @Test public void testLicenseFeature() throws Exception { Verifier verifier = getVerifier("/sourcePlugin/license-feature", false, false); - verifier.addCliOption("-De342-url=" + ECLIPSE_342.toString()); + verifier.addCliArgument("-De342-url=" + ECLIPSE_342.toString()); verifier.executeGoals(List.of("clean", "install")); verifier.verifyErrorFreeLog(); File sourceFeature = new File(verifier.getBasedir(), "feature/target/feature-1.0.0-sources-feature.jar"); @@ -141,7 +141,7 @@ public void testLicenseFeature() throws Exception { @Test public void testRemoteSourceBundles() throws Exception { Verifier verifier = getVerifier("/sourcePlugin/remote-source-bundles", false, false); - verifier.addCliOption("-De342-url=" + ECLIPSE_342.toString()); + verifier.addCliArgument("-De342-url=" + ECLIPSE_342.toString()); verifier.executeGoals(List.of("clean", "install")); verifier.verifyErrorFreeLog(); File file = new File(verifier.getBasedir(), diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/BundleStartInSurefireTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/BundleStartInSurefireTest.java index 6ac9bddbfd..3af426ad25 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/BundleStartInSurefireTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/BundleStartInSurefireTest.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.surefire; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/CategoriesTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/CategoriesTest.java index 9250ce7be9..f52b7066af 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/CategoriesTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/CategoriesTest.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.surefire; -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,9 +22,9 @@ public class CategoriesTest extends AbstractTychoIntegrationTest { @Test public void testIncludeExcludeCategories() throws Exception { Verifier verifier = getVerifier("/surefire.junit47/categories", false); - verifier.addCliOption("-Dkepler-repo=" + P2Repositories.ECLIPSE_LATEST.toString()); - verifier.addCliOption("-Dgroups=tycho.demo.itp01.tests.FastTests"); - verifier.addCliOption("-DexcludedGroups=tycho.demo.itp01.tests.SlowTests"); + verifier.addCliArgument("-Dkepler-repo=" + P2Repositories.ECLIPSE_LATEST.toString()); + verifier.addCliArgument("-Dgroups=tycho.demo.itp01.tests.FastTests"); + verifier.addCliArgument("-DexcludedGroups=tycho.demo.itp01.tests.SlowTests"); verifier.executeGoal("verify"); verifier.verifyErrorFreeLog(); } diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/DirectTestPluginInvocationTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/DirectTestPluginInvocationTest.java index 67337c5c8a..27ffd84d42 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/DirectTestPluginInvocationTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/DirectTestPluginInvocationTest.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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/EnableAssertionsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/EnableAssertionsTest.java index db65d89789..1071d559e5 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/EnableAssertionsTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/EnableAssertionsTest.java @@ -12,8 +12,8 @@ *******************************************************************************/ package org.eclipse.tycho.test.surefire; -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.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/EnvVarTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/EnvVarTest.java index 61458193d1..8acaefcb77 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/EnvVarTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/EnvVarTest.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.Map; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/ExplodedTestDependenciesTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/ExplodedTestDependenciesTest.java index dcd472b791..211bb8f1dd 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/ExplodedTestDependenciesTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/ExplodedTestDependenciesTest.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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/ExtraTestApplicationArgumentsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/ExtraTestApplicationArgumentsTest.java index 1af97ef2bd..c6235a26c5 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/ExtraTestApplicationArgumentsTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/ExtraTestApplicationArgumentsTest.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.surefire; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/FailIfNoTestsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/FailIfNoTestsTest.java index f4728341c7..b6aadb5745 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/FailIfNoTestsTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/FailIfNoTestsTest.java @@ -12,8 +12,8 @@ *******************************************************************************/ package org.eclipse.tycho.test.surefire; -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; @@ -25,7 +25,7 @@ public void testNoTestsNoFailure() throws Exception { Verifier verifier = getVerifier("surefire.noTests"); // support for this option was requested in TYCHO-432 - verifier.addCliOption("-DfailIfNoTests=false"); + verifier.addCliArgument("-DfailIfNoTests=false"); verifier.executeGoal("integration-test"); verifier.verifyErrorFreeLog(); } diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/FrameworkExtensionsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/FrameworkExtensionsTest.java index 3c8b9c9059..40a2927e32 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/FrameworkExtensionsTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/FrameworkExtensionsTest.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.surefire; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/JUnit5TempDirTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/JUnit5TempDirTest.java index 75ea5bf119..b7f16597e3 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/JUnit5TempDirTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/JUnit5TempDirTest.java @@ -2,7 +2,7 @@ import static org.eclipse.tycho.test.util.SurefireUtil.assertTestMethodWasSuccessfullyExecuted; -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; @@ -12,7 +12,7 @@ public class JUnit5TempDirTest extends AbstractTychoIntegrationTest { @Test public void testJUnit5Runner() throws Exception { Verifier verifier = getVerifier("/surefire.junit5tempdir/bundle.test", false); - verifier.addCliOption("-D2019-09-repo=" + P2Repositories.ECLIPSE_LATEST.toString()); + verifier.addCliArgument("-D2019-09-repo=" + P2Repositories.ECLIPSE_LATEST.toString()); verifier.executeGoal("verify"); verifier.verifyErrorFreeLog(); String projectBasedir = verifier.getBasedir(); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/JUnit5Test.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/JUnit5Test.java index a38402f2c3..58e7867e4b 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/JUnit5Test.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/JUnit5Test.java @@ -15,7 +15,7 @@ import static org.eclipse.tycho.test.util.SurefireUtil.assertNumberOfSuccessfulTests; import static org.eclipse.tycho.test.util.SurefireUtil.assertTestMethodWasSuccessfullyExecuted; -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; @@ -25,7 +25,7 @@ public class JUnit5Test extends AbstractTychoIntegrationTest { @Test public void testJUnit5Runner() throws Exception { Verifier verifier = getVerifier("/surefire.junit5/bundle.test", false); - verifier.addCliOption("-Doxygen-repo=" + P2Repositories.ECLIPSE_OXYGEN.toString()); + verifier.addCliArgument("-Doxygen-repo=" + P2Repositories.ECLIPSE_OXYGEN.toString()); verifier.executeGoal("verify"); verifier.verifyErrorFreeLog(); String projectBasedir = verifier.getBasedir(); @@ -48,7 +48,7 @@ public void testJUnit5Runner() throws Exception { @Test public void testJUnit4and54Runner() throws Exception { Verifier verifier = getVerifier("/surefire.junit4and54/bundle.test", false); - verifier.addCliOption("-Drepo-2019-03=" + P2Repositories.ECLIPSE_LATEST.toString()); + verifier.addCliArgument("-Drepo-2019-03=" + P2Repositories.ECLIPSE_LATEST.toString()); verifier.executeGoal("verify"); verifier.verifyErrorFreeLog(); String projectBasedir = verifier.getBasedir(); @@ -61,7 +61,7 @@ public void testJUnit4and54Runner() throws Exception { @Test public void testJUnit54Runner() throws Exception { Verifier verifier = getVerifier("/surefire.junit54/bundle.test", false); - verifier.addCliOption("-Drepo-2019-03=" + P2Repositories.ECLIPSE_LATEST.toString()); + verifier.addCliArgument("-Drepo-2019-03=" + P2Repositories.ECLIPSE_LATEST.toString()); verifier.executeGoal("verify"); verifier.verifyErrorFreeLog(); String projectBasedir = verifier.getBasedir(); @@ -73,7 +73,7 @@ public void testJUnit54Runner() throws Exception { @Test public void testJUnit56Runner() throws Exception { Verifier verifier = getVerifier("/surefire.junit56/bundle.test", false); - verifier.addCliOption("-Drepo-2020-03=" + P2Repositories.ECLIPSE_LATEST.toString()); + verifier.addCliArgument("-Drepo-2020-03=" + P2Repositories.ECLIPSE_LATEST.toString()); verifier.executeGoal("verify"); verifier.verifyErrorFreeLog(); String projectBasedir = verifier.getBasedir(); @@ -85,7 +85,7 @@ public void testJUnit56Runner() throws Exception { @Test public void testJUnit59Runner() throws Exception { Verifier verifier = getVerifier("/surefire.junit59/bundle.test", false); - verifier.addCliOption("-Drepo-2020-03=" + P2Repositories.ECLIPSE_LATEST.toString()); + verifier.addCliArgument("-Drepo-2020-03=" + P2Repositories.ECLIPSE_LATEST.toString()); verifier.executeGoal("verify"); verifier.verifyErrorFreeLog(); String projectBasedir = verifier.getBasedir(); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/JVMArgsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/JVMArgsTest.java index 5ee84a9144..53c34eb086 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/JVMArgsTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/JVMArgsTest.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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/JavaToolchainInSurefireTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/JavaToolchainInSurefireTest.java index 115fa1e9a5..dc98dd2e32 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/JavaToolchainInSurefireTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/JavaToolchainInSurefireTest.java @@ -11,7 +11,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; @@ -20,7 +20,7 @@ public class JavaToolchainInSurefireTest extends AbstractTychoIntegrationTest { public void test() throws Exception { Verifier verifier = getVerifier("surefire.toolchains"); File toolchains = new File(verifier.getBasedir() + "/toolchains.xml"); - verifier.addCliOption("--toolchains " + toolchains.getCanonicalPath()); + verifier.addCliArguments("--toolchains", toolchains.getCanonicalPath()); verifier.executeGoal("integration-test"); verifier.verifyTextInLog("Toolchain in tycho-surefire-plugin: JDK[fake-jdk-home]"); } diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/Junit4TestBundleTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/Junit4TestBundleTest.java index 0346f4ef58..b7fb86b72e 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/Junit4TestBundleTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/Junit4TestBundleTest.java @@ -15,7 +15,7 @@ import static org.eclipse.tycho.test.util.SurefireUtil.testResultFile; import static org.junit.Assert.assertTrue; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/OpenTest4JTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/OpenTest4JTest.java index 3185a4b8f3..d11e6ac378 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/OpenTest4JTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/OpenTest4JTest.java @@ -17,7 +17,7 @@ import static org.eclipse.tycho.test.util.SurefireUtil.assertNumberOfSkippedTests; import static org.eclipse.tycho.test.util.SurefireUtil.assertNumberOfSuccessfulTests; -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; @@ -27,7 +27,7 @@ public class OpenTest4JTest extends AbstractTychoIntegrationTest { @Test public void testOpenTest4JUsage() throws Exception { Verifier verifier = getVerifier("/surefire.opentest4j/bundle.test", false); - verifier.addCliOption("-Dtarget-platform=" + P2Repositories.ECLIPSE_LATEST.toString()); + verifier.addCliArgument("-Dtarget-platform=" + P2Repositories.ECLIPSE_LATEST.toString()); verifier.setSystemProperty("maven.test.error.ignore", Boolean.toString(true)); verifier.setSystemProperty("maven.test.failure.ignore", Boolean.toString(true)); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/P2InstalledTestRuntimeTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/P2InstalledTestRuntimeTest.java index dc73417158..f29d46c7b5 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/P2InstalledTestRuntimeTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/P2InstalledTestRuntimeTest.java @@ -14,7 +14,7 @@ import java.util.List; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.TargetEnvironment; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.eclipse.tycho.test.util.ResourceUtil; @@ -25,8 +25,8 @@ public class P2InstalledTestRuntimeTest extends AbstractTychoIntegrationTest { @Test public void testProvisionAppAndRunTest() throws Exception { Verifier verifier = getVerifier("surefire.p2InstalledRuntime", false); - verifier.addCliOption("-Dp2.repo.url=" + ResourceUtil.P2Repositories.ECLIPSE_LATEST.toString()); - verifier.addCliOption("-PprovisionProduct"); + verifier.addCliArgument("-Dp2.repo.url=" + ResourceUtil.P2Repositories.ECLIPSE_LATEST.toString()); + verifier.addCliArgument("-PprovisionProduct"); verifier.executeGoals(List.of("clean", "integration-test")); verifier.verifyErrorFreeLog(); } @@ -34,9 +34,9 @@ public void testProvisionAppAndRunTest() throws Exception { @Test public void testRunTestOnProvisionedApp() throws Exception { Verifier verifier = getVerifier("surefire.p2InstalledRuntime", false); - verifier.addCliOption("-Dp2.repo.url=" + ResourceUtil.P2Repositories.ECLIPSE_LATEST.toString()); - verifier.addCliOption("-PuseProvisionedProduct"); - verifier.addCliOption("-DproductClassifier=" + getProductClassifier()); + verifier.addCliArgument("-Dp2.repo.url=" + ResourceUtil.P2Repositories.ECLIPSE_LATEST.toString()); + verifier.addCliArgument("-PuseProvisionedProduct"); + verifier.addCliArgument("-DproductClassifier=" + getProductClassifier()); verifier.executeGoals(List.of("clean", "integration-test")); verifier.verifyErrorFreeLog(); } @@ -44,11 +44,11 @@ public void testRunTestOnProvisionedApp() throws Exception { @Test public void testDifferentHarnessVersions() throws Exception { Verifier verifier = getVerifier("surefire.p2InstalledRuntime", false); - verifier.addCliOption("-Dp2.repo.url=" + ResourceUtil.P2Repositories.ECLIPSE_OXYGEN.toString()); + verifier.addCliArgument("-Dp2.repo.url=" + ResourceUtil.P2Repositories.ECLIPSE_OXYGEN.toString()); // Use different TP for test bundle and product under test - verifier.addCliOption("-Dother.p2.repo.url=" + ResourceUtil.P2Repositories.ECLIPSE_LATEST.toString()); - verifier.addCliOption("-PuseProvisionedProduct"); - verifier.addCliOption("-DproductClassifier=" + getProductClassifier()); + verifier.addCliArgument("-Dother.p2.repo.url=" + ResourceUtil.P2Repositories.ECLIPSE_LATEST.toString()); + verifier.addCliArgument("-PuseProvisionedProduct"); + verifier.addCliArgument("-DproductClassifier=" + getProductClassifier()); verifier.executeGoals(List.of("clean", "integration-test")); verifier.verifyErrorFreeLog(); } diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/ParallelTestExecutionTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/ParallelTestExecutionTest.java index 2e6c790c4e..3065d73861 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/ParallelTestExecutionTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/ParallelTestExecutionTest.java @@ -30,7 +30,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.test.AbstractTychoIntegrationTest; import org.junit.Test; import org.w3c.dom.Element; @@ -42,7 +42,7 @@ public class ParallelTestExecutionTest extends AbstractTychoIntegrationTest { @Test public void testParallelExecution() throws Exception { Verifier verifier = getVerifier("/surefire.junit47/parallel"); - verifier.addCliOption("-Dparallel=classes"); + verifier.addCliArgument("-Dparallel=classes"); verifier.executeGoal("integration-test"); verifier.verifyErrorFreeLog(); File surefireReportsDir = new File(verifier.getBasedir(), "target/surefire-reports"); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/RequireBundleTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/RequireBundleTest.java index bfbd589b5f..ae84ddcd5b 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/RequireBundleTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/RequireBundleTest.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.surefire; -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 RequireBundleTest extends AbstractTychoIntegrationTest { @Test public void loadResourceFromRequireBundle() throws Exception { Verifier verifier = getVerifier("/surefire.requireBundle", false, true); - verifier.addCliOption("-Doxygen-repo=" + P2Repositories.ECLIPSE_LATEST.toString()); + verifier.addCliArgument("-Doxygen-repo=" + P2Repositories.ECLIPSE_LATEST.toString()); verifier.executeGoal("integration-test"); verifier.verifyErrorFreeLog(); } @@ -31,7 +31,7 @@ public void loadResourceFromRequireBundle() throws Exception { @Test public void requireMultipleVersionsOfABundle() throws Exception { Verifier verifier = getVerifier("/surefire.requireBundle.multipleVersions", false, true); - verifier.addCliOption("-Drepo=" + P2Repositories.ECLIPSE_LATEST.toString()); + verifier.addCliArgument("-Drepo=" + P2Repositories.ECLIPSE_LATEST.toString()); verifier.executeGoal("integration-test"); verifier.verifyErrorFreeLog(); } diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/RunOrderTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/RunOrderTest.java index 1679072a52..8a70978ffd 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/RunOrderTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/RunOrderTest.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.surefire; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/RunSingleTestTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/RunSingleTestTest.java index a15becf55a..46a69e2d9a 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/RunSingleTestTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/RunSingleTestTest.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.surefire; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; @@ -22,7 +22,7 @@ public void test() throws Exception { Verifier verifier = getVerifier("surefire.testSelection"); // call test with -Dtest=bundle.WorkingTest -> supported since TYCHO-356 - verifier.addCliOption("-Dtest=bundle.WorkingTest"); + verifier.addCliArgument("-Dtest=bundle.WorkingTest"); verifier.executeGoal("integration-test"); verifier.verifyErrorFreeLog(); } diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/SystemPropertiesTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/SystemPropertiesTest.java index 69a5db6b7f..a109fefd6c 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/SystemPropertiesTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/SystemPropertiesTest.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.surefire; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TestBundleShapeTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TestBundleShapeTest.java index a2f18d5a58..32497205f6 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TestBundleShapeTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TestBundleShapeTest.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.surefire; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TestFragmentTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TestFragmentTest.java index a9d4eec777..363c7467ee 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TestFragmentTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TestFragmentTest.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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TestNGBundleTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TestNGBundleTest.java index cda01160bf..c5621db82a 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TestNGBundleTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TestNGBundleTest.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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TestOptionalDependenciesTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TestOptionalDependenciesTest.java index 79fb52bc25..190887fe90 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TestOptionalDependenciesTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TestOptionalDependenciesTest.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.surefire; -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; import org.junit.Test; @@ -24,7 +24,7 @@ public class TestOptionalDependenciesTest extends AbstractTychoIntegrationTest { @Test public void testIgnoreMutuallyExclusiveOptionalDependenciesForTestRuntimeComputation() throws Exception { Verifier verifier = getVerifier("/surefire.optionalDependencies.ignore", false); - verifier.addCliOption("-De342-repo=" + ResourceUtil.P2Repositories.ECLIPSE_LATEST.toString()); + verifier.addCliArgument("-De342-repo=" + ResourceUtil.P2Repositories.ECLIPSE_LATEST.toString()); verifier.executeGoal("verify"); verifier.verifyErrorFreeLog(); } // see also OptionalDependenciesTest.testOptionallyRequiredBundleCanBeIgnored() @@ -34,7 +34,7 @@ public void testIgnoreMutuallyExclusiveOptionalDependenciesForTestRuntimeComputa @Test public void reactorIndirectOptionalDependencies() throws Exception { Verifier verifier = getVerifier("/surefire.optionalDependencies.reactor", false); - verifier.addCliOption("-De342-repo=" + ResourceUtil.P2Repositories.ECLIPSE_LATEST.toString()); + verifier.addCliArgument("-De342-repo=" + ResourceUtil.P2Repositories.ECLIPSE_LATEST.toString()); verifier.executeGoal("verify"); verifier.verifyErrorFreeLog(); } diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TestsInBundleTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TestsInBundleTest.java index febfa5ba90..347e713684 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TestsInBundleTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TestsInBundleTest.java @@ -18,8 +18,8 @@ import java.io.File; import java.util.Arrays; -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.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TrimStackTrace.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TrimStackTrace.java index 2795609e2f..af6de38371 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TrimStackTrace.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TrimStackTrace.java @@ -13,8 +13,8 @@ *******************************************************************************/ package org.eclipse.tycho.test.surefire; -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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TwoJunitVersionsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TwoJunitVersionsTest.java index b03daaa942..3474a273f4 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TwoJunitVersionsTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/surefire/TwoJunitVersionsTest.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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/symlinks/SymbolicLinkTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/symlinks/SymbolicLinkTest.java index 73da2259bf..db07384627 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/symlinks/SymbolicLinkTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/symlinks/SymbolicLinkTest.java @@ -18,7 +18,7 @@ import java.nio.file.Files; 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.BeforeClass; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/target/DifferentTargetFilesSameAbsolutePathTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/target/DifferentTargetFilesSameAbsolutePathTest.java index f212a2e393..6b8b2d1f52 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/target/DifferentTargetFilesSameAbsolutePathTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/target/DifferentTargetFilesSameAbsolutePathTest.java @@ -6,7 +6,7 @@ import java.nio.file.Path; 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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/target/OfflineModeTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/target/OfflineModeTest.java index cade4b8e20..6a05332fe6 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/target/OfflineModeTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/target/OfflineModeTest.java @@ -20,8 +20,8 @@ import java.util.LinkedHashSet; import java.util.Set; -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.eclipse.tycho.test.util.HttpServer; import org.eclipse.tycho.test.util.TargetDefinitionUtil; @@ -71,7 +71,7 @@ public void testWithCompositeRepository() throws Exception { private Verifier getVerifierAndSetupServerAndRepo(String basedir, String repoName) throws Exception, IOException { Verifier verifier = getVerifier(basedir, false); String url = server.addServer("test", new File(verifier.getBasedir(), repoName)); - verifier.addCliOption("-Dp2.repo=" + url); + verifier.addCliArgument("-Dp2.repo=" + url); File platformFile = new File(verifier.getBasedir(), "platform.target"); TargetDefinitionUtil.setRepositoryURLs(platformFile, url); @@ -79,7 +79,7 @@ private Verifier getVerifierAndSetupServerAndRepo(String basedir, String repoNam } private void runAndVerifyOfflineBuild(Verifier verifier) throws VerificationException { - verifier.addCliOption("--offline"); + verifier.addCliArgument("--offline"); verifier.setLogFileName("log-offline.txt"); verifier.executeGoal("integration-test"); verifier.verifyErrorFreeLog(); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/target/PasswordProtectedM2RepositoryTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/target/PasswordProtectedM2RepositoryTest.java index cd53df07e5..c15f261925 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/target/PasswordProtectedM2RepositoryTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/target/PasswordProtectedM2RepositoryTest.java @@ -15,7 +15,7 @@ import java.io.File; import java.util.Properties; -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.HttpServer; import org.eclipse.tycho.test.util.ResourceUtil; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/target/PasswordProtectedP2RepositoryTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/target/PasswordProtectedP2RepositoryTest.java index 2479da3911..28e90c672a 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/target/PasswordProtectedP2RepositoryTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/target/PasswordProtectedP2RepositoryTest.java @@ -15,7 +15,7 @@ import java.io.File; import java.util.Properties; -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.HttpServer; import org.eclipse.tycho.test.util.ResourceUtil; @@ -43,7 +43,7 @@ public void stopServer() throws Exception { @Test public void testRepository() throws Exception { Verifier verifier = createVerifier("settings.xml"); - verifier.addCliOption("-P=repository"); + verifier.addCliArgument("-P=repository"); verifier.executeGoal("package"); verifier.verifyErrorFreeLog(); } @@ -51,7 +51,7 @@ public void testRepository() throws Exception { @Test public void testRepositoryEncrypted() throws Exception { Verifier verifier = createVerifier("settings-encrypted.xml", "settings-security.xml"); - verifier.addCliOption("-P=repository"); + verifier.addCliArgument("-P=repository"); verifier.executeGoal("package"); verifier.verifyErrorFreeLog(); } @@ -61,7 +61,7 @@ public void testTargetDefinition() throws Exception { Verifier verifier = createVerifier("settings.xml"); File platformFile = new File(verifier.getBasedir(), "platform.target"); TargetDefinitionUtil.setRepositoryURLs(platformFile, p2RepoUrl); - verifier.addCliOption("-P=target-definition"); + verifier.addCliArgument("-P=target-definition"); verifier.executeGoal("package"); verifier.verifyErrorFreeLog(); } @@ -71,7 +71,7 @@ public void testTargetDefinitionEncrypted() throws Exception { Verifier verifier = createVerifier("settings-encrypted.xml", "settings-security.xml"); File platformFile = new File(verifier.getBasedir(), "platform.target"); TargetDefinitionUtil.setRepositoryURLs(platformFile, p2RepoUrl); - verifier.addCliOption("-P=target-definition"); + verifier.addCliArgument("-P=target-definition"); verifier.executeGoal("package"); verifier.verifyErrorFreeLog(); } diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetDefinitionPackagingTypeTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetDefinitionPackagingTypeTest.java index 895d4ddbf1..70e8a7e6e1 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetDefinitionPackagingTypeTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetDefinitionPackagingTypeTest.java @@ -16,7 +16,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.test.AbstractTychoIntegrationTest; import org.eclipse.tycho.test.util.ResourceUtil; import org.eclipse.tycho.test.util.TargetDefinitionUtil; @@ -45,7 +45,7 @@ public void prepare() throws Exception { @Test public void testTargetDefinitionFromWithinReactor() throws Exception { - verifier.addCliOption("-PtargetAndBundle"); + verifier.addCliArgument("-PtargetAndBundle"); verifier.executeGoal("package"); verifier.verifyErrorFreeLog(); } @@ -53,15 +53,15 @@ public void testTargetDefinitionFromWithinReactor() throws Exception { @Test public void testTargetDefinitionFromLocalRepo() throws Exception { // first, install the target definition into the local repo - verifier.addCliOption("-PtargetOnly"); + verifier.addCliArgument("-PtargetOnly"); verifier.executeGoal("install"); verifier.verifyErrorFreeLog(); - verifier.assertArtifactContents(TARGET_GROUPID, TARGET_ARTIFACTID, TARGET_VERSION, TARGET_EXTENSION, + verifier.verifyArtifactContent(TARGET_GROUPID, TARGET_ARTIFACTID, TARGET_VERSION, TARGET_EXTENSION, Files.readString(targetDefinitionFile.toPath())); // then, run the build of the bundle module only which should now // be able to resolve the target definition from the local repo verifier = getVerifier("target.packagingType", false); - verifier.addCliOption("-PbundleOnly"); + verifier.addCliArgument("-PbundleOnly"); verifier.executeGoal("package"); verifier.verifyErrorFreeLog(); } diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetDependenciesAccrossLocationsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetDependenciesAccrossLocationsTest.java index 7ba645be82..c3e734f640 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetDependenciesAccrossLocationsTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetDependenciesAccrossLocationsTest.java @@ -8,8 +8,8 @@ import javax.xml.parsers.ParserConfigurationException; -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.eclipse.tycho.test.util.HttpServer; import org.eclipse.tycho.test.util.ResourceUtil; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetPlatformFilteringIntegrationTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetPlatformFilteringIntegrationTest.java index 861ae89530..ca61f3c009 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetPlatformFilteringIntegrationTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetPlatformFilteringIntegrationTest.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.target; -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,8 +22,8 @@ public class TargetPlatformFilteringIntegrationTest extends AbstractTychoIntegra @Test public void test() throws Exception { Verifier verifier = getVerifier("target.restriction.filter", false); - verifier.addCliOption("-De342-repo=" + "https:////download.eclipse.org/releases/2021-06/"); - verifier.addCliOption("-De352-repo=" + P2Repositories.ECLIPSE_LATEST.toString()); + verifier.addCliArgument("-De342-repo=" + "https:////download.eclipse.org/releases/2021-06/"); + verifier.addCliArgument("-De352-repo=" + P2Repositories.ECLIPSE_LATEST.toString()); verifier.executeGoal("verify"); verifier.verifyErrorFreeLog(); } diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetPlatformLocationsTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetPlatformLocationsTest.java index 9b276eb97d..8431fa162b 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetPlatformLocationsTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetPlatformLocationsTest.java @@ -25,8 +25,8 @@ import java.util.Optional; import java.util.stream.Stream; -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.codehaus.plexus.util.xml.Xpp3Dom; import org.codehaus.plexus.util.xml.Xpp3DomBuilder; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; @@ -62,7 +62,7 @@ public void testMavenLocationScopes() throws Exception { @Test public void testMavenArtifactHaveMavenRepoPath() throws Exception { Verifier verifier = getVerifier("target.maven", false, true); - verifier.addCliOption("-DoutputAbsoluteArtifactFilename=true"); + verifier.addCliArgument("-DoutputAbsoluteArtifactFilename=true"); verifier.executeGoal("dependency:list"); verifier.verifyErrorFreeLog(); assertFalse("Location for Maven deps should not resolve to cache", @@ -104,7 +104,7 @@ public void testDirectoryLocation() throws Exception { @Test public void testTargetPlatformArtifactCaching() throws Exception { Verifier verifier = getVerifier("target.artifact.caching", false, true); - verifier.addCliOption("-Dtycho.localArtifacts=default"); + verifier.addCliArgument("-Dtycho.localArtifacts=default"); File annotBundleManifestFile = new File(verifier.getBasedir(), "target.test/plugins/osgi.annotation.bundle_0.0.1/META-INF/MANIFEST.MF"); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetRestrictionThroughTargetFilesTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetRestrictionThroughTargetFilesTest.java index 5933ec4e6c..7eba8e0c5a 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetRestrictionThroughTargetFilesTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/target/TargetRestrictionThroughTargetFilesTest.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.eclipse.tycho.test.util.P2RepositoryTool; import org.eclipse.tycho.test.util.TargetDefinitionUtil; @@ -68,7 +68,7 @@ public void testVersionRestrictionWithPlanner() throws Exception { @Test public void testContentAndVersionRestrictionWithSlicer() throws Exception { verifier = getVerifier("target.restriction.targetFile/testProject", false); - verifier.addCliOption("-Pwith-slicer-target"); + verifier.addCliArgument("-Pwith-slicer-target"); TargetDefinitionUtil.makeURLsAbsolute(new File(getTargetsProject(), "slicer.target"), new File("projects/target.restriction.targetFile/testProject/trt.targets")); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/tycho001/P2MetadataGenerationTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/tycho001/P2MetadataGenerationTest.java index 574ba6826a..94b06499e6 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/tycho001/P2MetadataGenerationTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/tycho001/P2MetadataGenerationTest.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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/tycho026/Tycho26MissingFeatureTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/tycho026/Tycho26MissingFeatureTest.java index f47b0a8b25..836262ba49 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/tycho026/Tycho26MissingFeatureTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/tycho026/Tycho26MissingFeatureTest.java @@ -12,21 +12,21 @@ *******************************************************************************/ package org.eclipse.tycho.test.tycho026; -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.Test; /* java -jar \eclipse\plugins\org.eclipse.equinox.launcher_1.0.1.R33x_v20080118.jar -application org.eclipse.update.core.siteOptimizer -digestBuilder -digestOutputDir=d:\temp\eclipse\digest -siteXML=D:\sonatype\workspace\tycho\tycho-its\projects\tycho129\tycho.demo.site\target\site\site.xml -jarProcessor -processAll -pack -outputDir d:\temp\eclipse\site D:\sonatype\workspace\tycho\tycho-its\projects\tycho129\tycho.demo.site\target\site */ public class Tycho26MissingFeatureTest extends AbstractTychoIntegrationTest { - @Test(expected = VerificationException.class) - public void test() throws Exception { - Verifier verifier = getVerifier("/tycho026"); - verifier.setAutoclean(false); + @Test(expected = VerificationException.class) + public void test() throws Exception { + Verifier verifier = getVerifier("/tycho026"); + verifier.setAutoclean(false); - verifier.executeGoal("package"); - verifier.verifyErrorFreeLog(); - } + verifier.executeGoal("package"); + verifier.verifyErrorFreeLog(); + } } diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/tycho136/Tycho136GenerateFeatureTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/tycho136/Tycho136GenerateFeatureTest.java index e40887bd12..feb803d3fb 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/tycho136/Tycho136GenerateFeatureTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/tycho136/Tycho136GenerateFeatureTest.java @@ -16,7 +16,7 @@ import org.junit.Assert; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/tycho136/Tycho136GenerateIndividualSourceBundlesTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/tycho136/Tycho136GenerateIndividualSourceBundlesTest.java index cffb43f526..b2422c1cdd 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/tycho136/Tycho136GenerateIndividualSourceBundlesTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/tycho136/Tycho136GenerateIndividualSourceBundlesTest.java @@ -16,7 +16,7 @@ import org.junit.Assert; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/tycho136/Tycho136GeneratePluginTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/tycho136/Tycho136GeneratePluginTest.java index 71590df5b5..8ca16c5d4c 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/tycho136/Tycho136GeneratePluginTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/tycho136/Tycho136GeneratePluginTest.java @@ -16,7 +16,7 @@ import org.junit.Assert; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/tycho154/Tycho154BundleJarTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/tycho154/Tycho154BundleJarTest.java index 15adad0714..d21f379ea1 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/tycho154/Tycho154BundleJarTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/tycho154/Tycho154BundleJarTest.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.tycho154; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/tycho476/ExecutionEnvironmentTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/tycho476/ExecutionEnvironmentTest.java index 066410f9ae..c4ad046a24 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/tycho476/ExecutionEnvironmentTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/tycho476/ExecutionEnvironmentTest.java @@ -16,7 +16,7 @@ import org.apache.bcel.classfile.ClassParser; import org.apache.bcel.classfile.JavaClass; -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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/tycho503/TYCHO503DoubleEncodedUrlTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/tycho503/TYCHO503DoubleEncodedUrlTest.java index 59a439cb50..7d72efc21b 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/tycho503/TYCHO503DoubleEncodedUrlTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/tycho503/TYCHO503DoubleEncodedUrlTest.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.tycho503; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/tycho937/Tycho937Test.java b/tycho-its/src/test/java/org/eclipse/tycho/test/tycho937/Tycho937Test.java index b52249bd2b..ac062243f3 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/tycho937/Tycho937Test.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/tycho937/Tycho937Test.java @@ -14,7 +14,7 @@ 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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/tycho98/Tycho98MultiSourcesBundleJarTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/tycho98/Tycho98MultiSourcesBundleJarTest.java index d5905d61f4..7ddd2df51f 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/tycho98/Tycho98MultiSourcesBundleJarTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/tycho98/Tycho98MultiSourcesBundleJarTest.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.tycho.test.tycho98; -import org.apache.maven.it.Verifier; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/versionsplugin/TychoVersionsPluginTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/versionsplugin/TychoVersionsPluginTest.java index 12eaebcd32..131a01a6ca 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/versionsplugin/TychoVersionsPluginTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/versionsplugin/TychoVersionsPluginTest.java @@ -19,9 +19,9 @@ import java.io.FileReader; import java.nio.file.Files; -import org.apache.maven.it.Verifier; import org.apache.maven.model.Model; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; +import org.apache.maven.shared.verifier.Verifier; import org.eclipse.tycho.core.utils.TychoVersion; import org.eclipse.tycho.test.AbstractTychoIntegrationTest; import org.junit.Test; @@ -51,7 +51,7 @@ public void invokeVersionsPluginOnTycho0120Project() throws Exception { Verifier verifier = getVerifier("TychoVersionsPluginTest/compat", true); - verifier.addCliOption("-DnewVersion=" + expectedNewVersion); + verifier.addCliArgument("-DnewVersion=" + expectedNewVersion); verifier.executeGoal( "org.eclipse.tycho:tycho-versions-plugin:" + TychoVersion.getTychoVersion() + ":set-version"); @@ -68,7 +68,7 @@ public void updateTargetVersionTest() throws Exception { Verifier verifier = getVerifier("TychoVersionsPluginTest/update-target", true); - verifier.addCliOption("-DnewVersion=" + expectedNewVersion); + verifier.addCliArgument("-DnewVersion=" + expectedNewVersion); verifier.executeGoal( "org.eclipse.tycho:tycho-versions-plugin:" + TychoVersion.getTychoVersion() + ":set-version"); diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/workspacereader/WorkspaceReaderTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/workspacereader/WorkspaceReaderTest.java index ae503dba5a..196082a56a 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/workspacereader/WorkspaceReaderTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/workspacereader/WorkspaceReaderTest.java @@ -14,7 +14,7 @@ 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; diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/xtend/TychoXtendTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/xtend/TychoXtendTest.java index dcb9af52d9..e0083c8fbb 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/xtend/TychoXtendTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/xtend/TychoXtendTest.java @@ -14,7 +14,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; diff --git a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java index 5fd28cf48b..aa07946b46 100644 --- a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java +++ b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java @@ -21,8 +21,8 @@ import java.util.List; import java.util.regex.Pattern; -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.codehaus.plexus.util.DirectoryScanner; import org.codehaus.plexus.util.FileUtils; import org.eclipse.tycho.test.util.EnvironmentUtil; @@ -87,6 +87,7 @@ protected Verifier getVerifier(String test, boolean setTargetPlatform, File user File testDir = getBasedir(test); Verifier verifier = new Verifier(testDir.getAbsolutePath()); + verifier.setForkJvm(true); String debug = System.getProperty("tycho.mvnDebug"); if (debug != null) { System.out.println("Preparing to execute Maven in debug mode"); @@ -108,34 +109,34 @@ protected Verifier getVerifier(String test, boolean setTargetPlatform, File user verifier.getEnvironmentVariables().put("MAVEN_OPTS", mvnOpts); System.out.flush(); } - verifier.addCliOption("-Dmaven.home=" + getMavenHome()); - verifier.addCliOption("-Dtycho-version=" + getTychoVersion()); + verifier.addCliArgument("-Dmaven.home=" + getMavenHome()); + verifier.addCliArgument("-Dtycho-version=" + getTychoVersion()); // bug 447397: use temp dir in target/ folder to make sure we don't leave garbage behind // when using maven < 3.1 File tmpDir = new File("target/tmp"); tmpDir.mkdirs(); - verifier.addCliOption("-Djava.io.tmpdir=" + tmpDir.getAbsolutePath()); + verifier.addCliArgument("-Djava.io.tmpdir=" + tmpDir.getAbsolutePath()); if (setTargetPlatform) { - verifier.addCliOption("-Dtarget-platform=" + getTargetPlatform()); + verifier.addCliArgument("-Dtarget-platform=" + getTargetPlatform()); } if (ignoreLocalArtifacts) { - verifier.addCliOption("-Dtycho.localArtifacts=ignore"); + verifier.addCliArgument("-Dtycho.localArtifacts=ignore"); } - verifier.addCliOption("-X"); - verifier.addCliOption("-s " + userSettings.getAbsolutePath()); + verifier.addCliArgument("-X"); + verifier.addCliArguments("-s", userSettings.getAbsolutePath()); verifier.getVerifierProperties().put("use.mavenRepoLocal", "true"); verifier.setLocalRepo(EnvironmentUtil.getLocalRepo()); String customOptions = System.getProperty("it.cliOptions"); if (customOptions != null && !customOptions.trim().isEmpty()) { - verifier.addCliOption(customOptions); + verifier.addCliArguments(customOptions.split(" ")); } if (System.getProperty(SYSPROP_STATELOCATION) != null) { verifier.setForkJvm(false); String m2eresolver = System.getProperty("tychodev-maven.ext.class.path"); // XXX if (m2eresolver != null) { - verifier.addCliOption("-Dmaven.ext.class.path=" + m2eresolver); + verifier.addCliArgument("-Dmaven.ext.class.path=" + m2eresolver); } }