You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/09/07 19:16:14 UTC
[maven-integration-testing] branch master updated: Add cli arguments one by one for Verifier
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
The following commit(s) were added to refs/heads/master by this push:
new ecf4a04cd Add cli arguments one by one for Verifier
ecf4a04cd is described below
commit ecf4a04cd1c4b7698f28e3332cd24c23116c1467
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Wed Sep 7 19:34:18 2022 +0200
Add cli arguments one by one for Verifier
Prepare for Verifier 2.0 - MSHARED-1125
---
...venITmng3057VersionExprTransformationsTest.java | 3 ++-
...venITmng3268MultipleHyphenPCommandLineTest.java | 3 ++-
.../it/MavenITmng3545ProfileDeactivationTest.java | 6 ++++--
...MavenITmng3641ProfileActivationWarningTest.java | 18 +++++++++++------
.../it/MavenITmng3714ToolchainsCliOptionTest.java | 3 ++-
.../it/MavenITmng4428FollowHttpRedirectTest.java | 3 ++-
.../it/MavenITmng5208EventSpyParallelTest.java | 3 ++-
.../it/MavenITmng5338FileOptionToDirectory.java | 3 ++-
.../MavenITmng5557ProperlyRestrictedReactor.java | 3 ++-
.../maven/it/MavenITmng5578SessionScopeTest.java | 5 ++++-
.../maven/it/MavenITmng5716ToolchainsTypeTest.java | 3 ++-
.../maven/it/MavenITmng6090CIFriendlyTest.java | 6 ++++--
.../it/MavenITmng6118SubmoduleInvocation.java | 23 +++++++++++-----------
...MavenITmng6511OptionalProjectSelectionTest.java | 15 +++++++++-----
...MavenITmng7128BlockExternalHttpReactorTest.java | 4 +++-
15 files changed, 64 insertions(+), 37 deletions(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java
index b9f64a605..1e46d5e92 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java
@@ -70,7 +70,8 @@ public class MavenITmng3057VersionExprTransformationsTest
verifier.addCliOption( "-V" );
verifier.addCliOption( "-DtestVersion=1" );
- verifier.addCliOption( "-f pom-filtered.xml" );
+ verifier.addCliOption( "-f" );
+ verifier.addCliOption( "pom-filtered.xml" );
verifier.executeGoal( "generate-sources" );
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java
index b2e2a34b3..ef6fe7840 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java
@@ -48,7 +48,8 @@ public class MavenITmng3268MultipleHyphenPCommandLineTest
verifier.addCliOption( "-Pprofile1,profile2" );
verifier.addCliOption( "-Pprofile3" );
- verifier.addCliOption( "-P profile4" );
+ verifier.addCliOption( "-P" );
+ verifier.addCliOption( "profile4" );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java
index 0630fd657..3b3c8de80 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java
@@ -81,7 +81,8 @@ public class MavenITmng3545ProfileDeactivationTest
// Deactivate active by default profiles
verifier.addCliOption( "-P-profile1" );
- verifier.addCliOption( "-P -profile2" );
+ verifier.addCliOption( "-P" );
+ verifier.addCliOption( "-profile2" );
verifier.executeGoal( "validate" );
@@ -103,7 +104,8 @@ public class MavenITmng3545ProfileDeactivationTest
// Deactivate active by default profiles
verifier.addCliOption( "-P!profile1" );
- verifier.addCliOption( "-P !profile2" );
+ verifier.addCliOption( "-P" );
+ verifier.addCliOption( "!profile2" );
verifier.executeGoal( "validate" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java
index 778c662d5..51359f598 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java
@@ -51,7 +51,8 @@ public class MavenITmng3641ProfileActivationWarningTest
verifier.deleteArtifact( "org.apache.maven.its.mng3641", "parent", "1.0", "pom" );
// (1) make sure the profile is found. Must not contain a warning.
- verifier.addCliOption( "-P mng-3641-it-provided-profile" );
+ verifier.addCliOption( "-P" );
+ verifier.addCliOption( "mng-3641-it-provided-profile" );
verifier.setLogFileName( "log-1.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@@ -62,7 +63,8 @@ public class MavenITmng3641ProfileActivationWarningTest
// (2) make sure the profile was not found and a warning was printed.
verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.addCliOption( "-P mng-3641-TWlzdGVyIFQgd2FzIGhlcmUuICheX14p" );
+ verifier.addCliOption( "-P" );
+ verifier.addCliOption( "mng-3641-TWlzdGVyIFQgd2FzIGhlcmUuICheX14p" );
verifier.setLogFileName( "log-2.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@@ -74,7 +76,8 @@ public class MavenITmng3641ProfileActivationWarningTest
// (3) make sure the first profile is found while the other is not and a warning was printed
// accordingly.
verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.addCliOption( "-P mng-3641-it-provided-profile,mng-3641-TWlzdGVyIFQgd2FzIGhlcmUuICheX14p" );
+ verifier.addCliOption( "-P" );
+ verifier.addCliOption( "mng-3641-it-provided-profile,mng-3641-TWlzdGVyIFQgd2FzIGhlcmUuICheX14p" );
verifier.setLogFileName( "log-3.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@@ -86,7 +89,8 @@ public class MavenITmng3641ProfileActivationWarningTest
// (4) make sure the warning is only printed when the profile is missing in all projects
verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.addCliOption( "-P mng-3641-it-provided-profile-child" );
+ verifier.addCliOption( "-P" );
+ verifier.addCliOption( "mng-3641-it-provided-profile-child" );
verifier.setLogFileName( "log-4.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@@ -97,7 +101,8 @@ public class MavenITmng3641ProfileActivationWarningTest
// (5) make sure the profile is found in subproject. Must not contain a warning.
verifier = newVerifier( new File( testDir, "child1" ).getAbsolutePath() );
- verifier.addCliOption( "-P mng-3641-it-provided-profile-child" );
+ verifier.addCliOption( "-P" );
+ verifier.addCliOption( "mng-3641-it-provided-profile-child" );
verifier.setLogFileName( "log-5.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@@ -108,7 +113,8 @@ public class MavenITmng3641ProfileActivationWarningTest
// (6) make sure the profile is found from parent in subproject. Must not contain a warning.
verifier = newVerifier( new File( testDir, "child1" ).getAbsolutePath() );
- verifier.addCliOption( "-P mng-3641-it-provided-profile" );
+ verifier.addCliOption( "-P" );
+ verifier.addCliOption( "mng-3641-it-provided-profile" );
verifier.setLogFileName( "log-6.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java
index 185fa58e6..4b31f312b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java
@@ -62,7 +62,8 @@ public class MavenITmng3714ToolchainsCliOptionTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.addCliOption( "--toolchains toolchains.xml" );
+ verifier.addCliOption( "--toolchains" );
+ verifier.addCliOption( "toolchains.xml" );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java
index d6f708ec7..64d41969a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java
@@ -160,7 +160,8 @@ public class MavenITmng4428FollowHttpRedirectTest
filterProps.setProperty( "@protocol@", fromHttp ? "http" : "https" );
filterProps.setProperty( "@port@", Integer.toString( ( (NetworkConnector) from ).getLocalPort() ) );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
- verifier.addCliOption( "-X --settings" );
+ verifier.addCliOption( "-X" );
+ verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.setSystemProperty( "javax.net.ssl.trustStore", storePath );
verifier.setSystemProperty( "javax.net.ssl.trustStorePassword", storePwd );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java
index abf88976c..4f9bf5c41 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java
@@ -50,7 +50,8 @@ public class MavenITmng5208EventSpyParallelTest
verifier.deleteDirectory( "target" );
verifier.setSystemProperty( "maven.ext.class.path", "../spy/target/event-spy-0.0.1-SNAPSHOT.jar" );
verifier.addCliOption( "-X" );
- verifier.addCliOption( "-T 2" );
+ verifier.addCliOption( "-T" );
+ verifier.addCliOption( "2" );
verifier.addCliOption( "-fn" );
verifier.executeGoal( "compile" );
verifier.verifyTextInLog( "ProjectFailed/org.apache.maven.its.mng5208:sub-2" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java
index 9051a4231..33abb0d2b 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java
@@ -64,7 +64,8 @@ public class MavenITmng5338FileOptionToDirectory
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng5338" );
- verifier.addCliOption( "-f project" );
+ verifier.addCliOption( "-f" );
+ verifier.addCliOption( "project" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java
index a90f3a389..4d09ee394 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java
@@ -50,7 +50,8 @@ public class MavenITmng5557ProperlyRestrictedReactor
// from the reactor.
//
verifier.deleteArtifacts( "org.apache.maven.its.mng5557" );
- verifier.addCliOption( "--projects project-0,project-1" );
+ verifier.addCliOption( "--projects" );
+ verifier.addCliOption( "project-0,project-1" );
try
{
verifier.executeGoal( "package" );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java
index 5061590e4..486a01910 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java
@@ -72,7 +72,10 @@ public class MavenITmng5578SessionScopeTest
// build the test project
verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
verifier.addCliOption( "-Dit-build-extensions=false" );
- verifier.addCliOption( "--builder multithreaded -T 1" );
+ verifier.addCliOption( "--builder" );
+ verifier.addCliOption( "multithreaded" );
+ verifier.addCliOption( "-T" );
+ verifier.addCliOption( "1" );
verifier.executeGoal( "package" );
verifier.resetStreams();
verifier.verifyErrorFreeLog();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java
index 16896f26d..ec95213f1 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java
@@ -60,7 +60,8 @@ public class MavenITmng5716ToolchainsTypeTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.addCliOption( "--toolchains toolchains.xml" );
+ verifier.addCliOption( "--toolchains" );
+ verifier.addCliOption( "toolchains.xml" );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java
index 85f4a4976..4a9525746 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java
@@ -72,7 +72,8 @@ public class MavenITmng6090CIFriendlyTest
verifier.setAutoclean( false );
verifier.addCliOption( "-Drevision=1.2" );
- verifier.addCliOption( "-pl module-3" );
+ verifier.addCliOption( "-pl" );
+ verifier.addCliOption( "module-3" );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -101,7 +102,8 @@ public class MavenITmng6090CIFriendlyTest
verifier.setForkJvm(true);
verifier.addCliOption( "-Drevision=1.2" );
- verifier.addCliOption( "-pl module-3" );
+ verifier.addCliOption( "-pl" );
+ verifier.addCliOption( "module-3" );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java
index 97217f6ed..4e4b6bf9e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java
@@ -19,12 +19,10 @@ package org.apache.maven.it;
* under the License.
*/
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
+
+import org.apache.maven.it.util.ResourceExtractor;
/**
* This is a collection of test cases for <a href="https://issues.apache.org/jira/browse/MNG-6118">MNG-6118</a>,
@@ -43,7 +41,6 @@ public class MavenITmng6118SubmoduleInvocation extends AbstractMavenIntegrationT
{
private static final String RESOURCE_PATH = "/mng-6118-submodule-invocation-full-reactor";
private final File testDir;
- private final Map<String, String> envVars = new HashMap<>();
public MavenITmng6118SubmoduleInvocation() throws IOException
{
@@ -60,13 +57,13 @@ public class MavenITmng6118SubmoduleInvocation extends AbstractMavenIntegrationT
{
// Compile the whole project first.
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "compile", envVars );
+ verifier.executeGoal( "compile" );
final File submoduleDirectory = new File( testDir, "app" );
verifier = newVerifier( submoduleDirectory.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.setLogFileName( "log-insubmodule.txt" );
- verifier.executeGoal( "compile", envVars );
+ verifier.executeGoal( "compile" );
}
/**
@@ -83,8 +80,9 @@ public class MavenITmng6118SubmoduleInvocation extends AbstractMavenIntegrationT
verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.setLogFileName( "log-withfile.txt" );
- verifier.addCliOption( "-f app/pom.xml" );
- verifier.executeGoal( "compile", envVars );
+ verifier.addCliOption( "-f" );
+ verifier.addCliOption( "app/pom.xml" );
+ verifier.executeGoal( "compile" );
}
/**
@@ -96,9 +94,10 @@ public class MavenITmng6118SubmoduleInvocation extends AbstractMavenIntegrationT
{
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.addCliOption( "-am" );
- verifier.addCliOption( "-f app/pom.xml" );
+ verifier.addCliOption( "-f" );
+ verifier.addCliOption( "app/pom.xml" );
verifier.setLogFileName( "log-withfilealsomake.txt" );
- verifier.executeGoal( "compile", envVars );
+ verifier.executeGoal( "compile" );
verifier.verifyTextInLog( "Building Maven Integration Test :: MNG-6118 :: Library 1.0" );
}
@@ -113,7 +112,7 @@ public class MavenITmng6118SubmoduleInvocation extends AbstractMavenIntegrationT
Verifier verifier = newVerifier( submoduleDirectory.getAbsolutePath() );
verifier.addCliOption( "-am" );
verifier.setLogFileName( "log-insubmodulealsomake.txt" );
- verifier.executeGoal( "compile", envVars );
+ verifier.executeGoal( "compile" );
verifier.verifyTextInLog( "Building Maven Integration Test :: MNG-6118 :: Library 1.0" );
}
}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java
index 8690e885a..c0a141460 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java
@@ -48,7 +48,8 @@ public class MavenITmng6511OptionalProjectSelectionTest extends AbstractMavenInt
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setLogFileName( "log-select-existing.txt" );
- verifier.addCliOption( "-pl ?existing-module" );
+ verifier.addCliOption( "-pl" );
+ verifier.addCliOption( "?existing-module" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "existing-module/target/touch.txt" ); // existing-module should have been built.
@@ -60,7 +61,8 @@ public class MavenITmng6511OptionalProjectSelectionTest extends AbstractMavenInt
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setLogFileName( "log-select-existing-artifact-id.txt" );
- verifier.addCliOption( "-pl ?:existing-module" );
+ verifier.addCliOption( "-pl" );
+ verifier.addCliOption( "?:existing-module" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "existing-module/target/touch.txt" ); // existing-module should have been built.
@@ -72,7 +74,8 @@ public class MavenITmng6511OptionalProjectSelectionTest extends AbstractMavenInt
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setLogFileName( "log-select-non-existing.txt" );
- verifier.addCliOption( "-pl ?non-existing-module" );
+ verifier.addCliOption( "-pl" );
+ verifier.addCliOption( "?non-existing-module" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "existing-module/target/touch.txt" ); // existing-module should have been built.
@@ -84,7 +87,8 @@ public class MavenITmng6511OptionalProjectSelectionTest extends AbstractMavenInt
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setLogFileName( "log-deselect-existing.txt" );
- verifier.addCliOption( "-pl !?existing-module" );
+ verifier.addCliOption( "-pl" );
+ verifier.addCliOption( "!?existing-module" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.verifyFileNotPresent( "existing-module/target/touch.txt" ); // existing-module should not have been built.
@@ -96,7 +100,8 @@ public class MavenITmng6511OptionalProjectSelectionTest extends AbstractMavenInt
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setLogFileName( "log-deselect-non-existing.txt" );
- verifier.addCliOption( "-pl !?non-existing-module" );
+ verifier.addCliOption( "-pl" );
+ verifier.addCliOption( "!?non-existing-module" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.verifyFilePresent( "existing-module/target/touch.txt" ); // existing-module should have been built.
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java
index 3e6a8834a..c10cfb64e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java
@@ -42,7 +42,9 @@ public class MavenITmng7128BlockExternalHttpReactorTest
{
final File projectDir = ResourceExtractor.simpleExtractResources( getClass(), PROJECT_PATH );
final Verifier verifier = newVerifier( projectDir.getAbsolutePath() );
- verifier.addCliOption( "-s settings.xml" ); // ITs override global settings that provide blocked mirror: need to define the mirror in dedicated settings
+ // ITs override global settings that provide blocked mirror: need to define the mirror in dedicated settings
+ verifier.addCliOption( "-s" );
+ verifier.addCliOption( "settings.xml" );
try
{