This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new c4834efdba Move everything out of bootstrap (#1909)
c4834efdba is described below
commit c4834efdba9de109d66f0d8a0d2fb518971475d3
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Sat Nov 16 18:50:22 2024 +0100
Move everything out of bootstrap (#1909)
---
.../MavenIT0030DepPomDepMgmtInheritanceTest.java | 2 +-
...nIT0041ArtifactTypeFromPluginExtensionTest.java | 2 +-
.../maven/it/MavenITmng0469ReportConfigTest.java | 2 +-
.../it/MavenITmng0507ArtifactRelocationTest.java | 2 +-
.../it/MavenITmng2135PluginBuildInReactorTest.java | 2 +-
.../it/MavenITmng2199ParentVersionRangeTest.java | 12 +-
...ITmng3259DepsDroppedInMultiModuleBuildTest.java | 4 +-
...venITmng3268MultipleHyphenPCommandLineTest.java | 2 +-
...avenITmng3372DirectInvocationOfPluginsTest.java | 4 +-
...encyManagementForOverConstrainedRangesTest.java | 6 +-
...etadataUpdatedFromDeploymentRepositoryTest.java | 2 +-
...ng3477DependencyResolutionErrorMessageTest.java | 27 +--
.../MavenITmng3485OverrideWagonExtensionTest.java | 2 +-
.../it/MavenITmng3498ForkToOtherMojoTest.java | 2 +-
...enITmng3506ArtifactHandlersFromPluginsTest.java | 2 +-
.../MavenITmng3536AppendedAbsolutePathsTest.java | 2 +-
.../it/MavenITmng3652UserAgentHeaderTest.java | 20 +--
.../it/MavenITmng3684BuildPluginParameterTest.java | 4 +-
.../it/MavenITmng3693PomFileBasedirChangeTest.java | 2 +-
.../MavenITmng3694ReactorProjectsDynamismTest.java | 2 +-
...g3703ExecutionProjectWithRelativePathsTest.java | 4 +-
.../MavenITmng3710PollutedClonedPluginsTest.java | 4 +-
.../it/MavenITmng3716AggregatorForkingTest.java | 2 +-
.../MavenITmng3723ConcreteParentProjectTest.java | 2 +-
.../it/MavenITmng3724ExecutionProjectSyncTest.java | 2 +-
.../it/MavenITmng3729MultiForkAggregatorsTest.java | 2 +-
...Tmng3740SelfReferentialReactorProjectsTest.java | 2 +-
.../it/MavenITmng3746POMPropertyOverrideTest.java | 4 +-
.../it/MavenITmng4207PluginWithLog4JTest.java | 2 +-
...ITmng4238ArtifactHandlerExtensionUsageTest.java | 2 +-
...Tmng4270ArtifactHandlersFromPluginDepsTest.java | 2 +-
...463DependencyManagementImportVersionRanges.java | 6 +-
...528ExcludeWagonsFromMavenCoreArtifactsTest.java | 2 +-
...mng4633DualCompilerExecutionsWeaveModeTest.java | 2 +-
...Tmng4654ArtifactHandlerForMainArtifactTest.java | 2 +-
...76ForkedReactorPluginVersionResolutionTest.java | 4 +-
.../maven/it/MavenITmng5382Jsr330Plugin.java | 4 +-
.../MavenITmng5387ArtifactReplacementPlugin.java | 2 +-
...mng5389LifecycleParticipantAfterSessionEnd.java | 4 +-
.../maven/it/MavenITmng5482AetherNotFoundTest.java | 2 +-
.../it/MavenITmng5530MojoExecutionScopeTest.java | 14 +-
.../maven/it/MavenITmng5578SessionScopeTest.java | 18 +-
.../it/MavenITmng5581LifecycleMappingDelegate.java | 2 +-
.../maven/it/MavenITmng5591WorkspaceReader.java | 4 +-
...avenITmng5742BuildExtensionClassloaderTest.java | 4 +-
...mng5753CustomMojoExecutionConfiguratorTest.java | 4 +-
.../MavenITmng5783PluginDependencyFiltering.java | 4 +-
.../it/MavenITmng5840ParentVersionRanges.java | 8 +-
.../MavenITmng5840RelativePathReactorMatching.java | 4 +-
...onalLostInTranstiveManagedDependenciesTest.java | 2 +-
.../maven/it/MavenITmng6084Jsr250PluginTest.java | 4 +-
...uginExecutionConfigurationInterferenceTest.java | 4 +-
...avenITmng6240PluginExtensionAetherProvider.java | 4 +-
.../it/MavenITmng6506PackageAnnotationTest.java | 4 +-
...ecuteAnnotationShouldNotReExecuteGoalsTest.java | 2 +-
...310LifecycleActivatedInSpecifiedModuleTest.java | 2 +-
.../src/test/resources-filtered/bootstrap.txt | 190 ---------------------
.../src/test/resources/bootstrap/bootstrap/pom.xml | 38 -----
.../test/resources/bootstrap/packaging-jar/pom.xml | 33 ----
.../bootstrap/packaging-maven-plugin/pom.xml | 33 ----
.../test/resources/bootstrap/packaging-war/pom.xml | 33 ----
.../src/test/resources/bootstrap/pom.xml | 7 -
.../maven/it/AbstractMavenIntegrationTestCase.java | 2 +-
63 files changed, 124 insertions(+), 455 deletions(-)
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java
index c10bd80430..23fef916fc 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java
@@ -37,7 +37,7 @@ public class MavenIT0030DepPomDepMgmtInheritanceTest extends
AbstractMavenIntegr
@Test
public void testit0030() throws Exception {
File testDir = ResourceExtractor.simpleExtractResources(getClass(),
"/it0030");
- Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.deleteArtifact("org.apache.maven.it", "maven-it-it0030",
"1.0-SNAPSHOT", "jar");
verifier.deleteArtifact("org.apache.maven.it",
"maven-it-it0030-child-hierarchy", "1.0-SNAPSHOT", "jar");
verifier.deleteArtifact("org.apache.maven.it",
"maven-it-it0030-child-project1", "1.0-SNAPSHOT", "jar");
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
index 4e74cb4afa..eef6e80df3 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
@@ -43,7 +43,7 @@ public class MavenIT0041ArtifactTypeFromPluginExtensionTest
extends AbstractMave
public void testit0041() throws Exception {
File testDir = ResourceExtractor.simpleExtractResources(getClass(),
"/it0041");
- Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteArtifacts("org.apache.maven", "maven-core-it-support",
"1.2");
verifier.addCliArgument("--settings");
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
index b9cd00ba1a..619012d4e0 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
@@ -67,7 +67,7 @@ public class MavenITmng0469ReportConfigTest extends
AbstractMavenIntegrationTest
public void testitBuildConfigIrrelevantForReports() throws Exception {
File testDir = ResourceExtractor.simpleExtractResources(getClass(),
"/mng-0469/test2");
- Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.deleteDirectory("target");
verifier.setAutoclean(false);
if (matchesVersionRange("(,3.0-alpha-1)")) {
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
index 663e3999d3..8222e7a5c0 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
@@ -46,7 +46,7 @@ public class MavenITmng0507ArtifactRelocationTest extends
AbstractMavenIntegrati
public void testitMNG507() throws Exception {
File testDir = ResourceExtractor.simpleExtractResources(getClass(),
"/mng-0507");
- Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven", "maven-core-it-support",
"1.1");
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java
index c95a283d40..1fe7d7a2a7 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java
@@ -43,7 +43,7 @@ public class MavenITmng2135PluginBuildInReactorTest extends
AbstractMavenIntegra
public void testit() throws Exception {
File testDir = ResourceExtractor.simpleExtractResources(getClass(),
"/mng-2135");
- Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteDirectory("plugin/target");
verifier.deleteDirectory("project/target");
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java
index 7157409855..ac5cb65169 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java
@@ -43,7 +43,7 @@ public class MavenITmng2199ParentVersionRangeTest extends
AbstractMavenIntegrati
File testDir = ResourceExtractor.simpleExtractResources(
getClass(),
"/mng-2199-parent-version-range/valid-inclusive-upper-bound");
- verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(testDir.getAbsolutePath());
verifier.addCliArgument("-U");
verifier.setAutoclean(false);
verifier.addCliArgument("verify");
@@ -64,7 +64,7 @@ public class MavenITmng2199ParentVersionRangeTest extends
AbstractMavenIntegrati
File testDir = ResourceExtractor.simpleExtractResources(
getClass(),
"/mng-2199-parent-version-range/valid-exclusive-upper-bound");
- verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(testDir.getAbsolutePath());
verifier.addCliArgument("-U");
verifier.setAutoclean(false);
verifier.addCliArgument("verify");
@@ -84,7 +84,7 @@ public class MavenITmng2199ParentVersionRangeTest extends
AbstractMavenIntegrati
File testDir = ResourceExtractor.simpleExtractResources(getClass(),
"/mng-2199-parent-version-range/invalid");
try {
- verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.addCliArgument("-U");
verifier.addCliArgument("verify");
@@ -106,7 +106,7 @@ public class MavenITmng2199ParentVersionRangeTest extends
AbstractMavenIntegrati
ResourceExtractor.simpleExtractResources(getClass(),
"/mng-2199-parent-version-range/expression");
try {
- verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.addCliArgument("-U");
verifier.addCliArgument("verify");
@@ -126,7 +126,7 @@ public class MavenITmng2199ParentVersionRangeTest extends
AbstractMavenIntegrati
File testDir = ResourceExtractor.simpleExtractResources(getClass(),
"/mng-2199-parent-version-range/inherited");
try {
- verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.addCliArgument("-U");
verifier.addCliArgument("verify");
@@ -190,7 +190,7 @@ public class MavenITmng2199ParentVersionRangeTest extends
AbstractMavenIntegrati
File testDir = ResourceExtractor.simpleExtractResources(
getClass(),
"/mng-2199-parent-version-range/local-fallback-to-remote/child");
- verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(testDir.getAbsolutePath());
verifier.addCliArgument("verify");
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java
index 0cb3349857..e30b533490 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java
@@ -44,14 +44,14 @@ public class
MavenITmng3259DepsDroppedInMultiModuleBuildTest extends AbstractMav
Verifier verifier;
- verifier = newVerifier(new File(testDir, "parent").getAbsolutePath(),
"remote");
+ verifier = newVerifier(new File(testDir, "parent").getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
- verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(testDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java
index 356a837b37..4ccf112d30 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java
@@ -40,7 +40,7 @@ public class MavenITmng3268MultipleHyphenPCommandLineTest
extends AbstractMavenI
Verifier verifier;
- verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(testDir.getAbsolutePath());
verifier.addCliArgument("-Pprofile1,profile2");
verifier.addCliArgument("-Pprofile3");
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
index 8f67627fa2..705bcf648a 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
@@ -43,7 +43,7 @@ public class MavenITmng3372DirectInvocationOfPluginsTest
extends AbstractMavenIn
File project = new File(testBaseDir, "project");
File settingsFile = new File(testBaseDir, "settings.xml");
- Verifier verifier = newVerifier(plugin.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(plugin.getAbsolutePath());
verifier.deleteArtifacts("org.apache.maven.its.mng3372");
@@ -69,7 +69,7 @@ public class MavenITmng3372DirectInvocationOfPluginsTest
extends AbstractMavenIn
// file.
File testBaseDir =
ResourceExtractor.simpleExtractResources(getClass(),
"/mng-3372/dependency-tree");
- Verifier verifier = newVerifier(testBaseDir.getAbsolutePath(),
"remote");
+ Verifier verifier = newVerifier(testBaseDir.getAbsolutePath());
verifier.addCliArgument("-U");
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java
index 5dba957ec4..938cc11ae8 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java
@@ -40,7 +40,7 @@ public class
MavenITmng3396DependencyManagementForOverConstrainedRangesTest exte
String baseDir = "/mng-3396";
File testDir = ResourceExtractor.simpleExtractResources(getClass(),
baseDir + "/dependencies");
- Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.deleteArtifact(GROUP_ID, "A", "1.0", "pom");
verifier.deleteArtifact(GROUP_ID, "A", "1.0", "jar");
verifier.deleteArtifact(GROUP_ID, "B", "1.0", "pom");
@@ -51,7 +51,7 @@ public class
MavenITmng3396DependencyManagementForOverConstrainedRangesTest exte
testDir = ResourceExtractor.simpleExtractResources(getClass(), baseDir
+ "/plugin");
- verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(testDir.getAbsolutePath());
verifier.deleteArtifact(GROUP_ID, "A", "1.0", "pom");
verifier.deleteArtifact(GROUP_ID, "A", "1.0", "jar");
verifier.deleteArtifact(GROUP_ID, "A", "3.0", "pom");
@@ -64,7 +64,7 @@ public class
MavenITmng3396DependencyManagementForOverConstrainedRangesTest exte
testDir = ResourceExtractor.simpleExtractResources(getClass(), baseDir
+ "/pluginuser");
- verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(testDir.getAbsolutePath());
verifier.deleteArtifact(GROUP_ID, "pluginuser", "1.0", "pom");
verifier.deleteArtifact(GROUP_ID, "pluginuser", "1.0", "jar");
verifier.addCliArgument("install");
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java
index 7ac6a69abc..5bd1b68c5f 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java
@@ -51,7 +51,7 @@ public class
MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest extends A
Verifier verifier;
- verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(testDir.getAbsolutePath());
verifier.addCliArgument("-s");
verifier.addCliArgument("settings.xml");
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java
index b63ca255da..ea698ee795 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java
@@ -29,6 +29,7 @@ import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Server;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
@@ -49,7 +50,7 @@ class MavenITmng3477DependencyResolutionErrorMessageTest
extends AbstractMavenIn
void testit(int port, String[] logExpectPatterns, String projectFile)
throws Exception {
File testDir = ResourceExtractor.simpleExtractResources(getClass(),
"/mng-3477");
- Verifier verifier = newVerifier(testDir.getAbsolutePath());
+ Verifier verifier = newVerifier(testDir.getAbsolutePath(), "");
Map<String, String> filterProps = new HashMap<>();
filterProps.put("@port@", Integer.toString(port));
@@ -95,7 +96,9 @@ class MavenITmng3477DependencyResolutionErrorMessageTest
extends AbstractMavenIn
testit(
54312,
new String[] {
- ".*The following artifacts could not be resolved:
org.apache.maven.its.plugins:maven-it-plugin-not-exists:pom:1.2.3 \\(absent\\):
Could not transfer artifact
org.apache.maven.its.plugins:maven-it-plugin-not-exists:pom:1.2.3 from/to
maven-core-it \\(http://localhost:.*/repo\\): Connection to
http://localhost:.*2/repo/ refused.*"
+ ".*The following artifacts could not be resolved:
org.apache.maven.its.plugins:maven-it-plugin-not-exists:pom:1.2.3 \\(absent\\):
"
+ + "Could not transfer artifact
org.apache.maven.its.plugins:maven-it-plugin-not-exists:pom:1.2.3 from/to "
+ + "maven-core-it \\(http://localhost:.*/repo\\):
Connection to http://localhost:.*2/repo/ refused.*"
},
"pom-plugin.xml");
}
@@ -106,16 +109,16 @@ class MavenITmng3477DependencyResolutionErrorMessageTest
extends AbstractMavenIn
try {
server = new Server(0);
server.start();
- if (server.isFailed()) {
- fail("Couldn't bind the server socket to a free port!");
- }
+ assertFalse(server.isFailed(), "Couldn't bind the server socket to
a free port!");
int port = ((NetworkConnector)
server.getConnectors()[0]).getLocalPort();
testit(
port,
new String[] {
- ".*Could not find artifact
org.apache.maven.its.mng3477:dep:.*:1.0 in central
\\(http://localhost:.*/repo\\).*",
- ".*Could not find artifact
org.apache.maven.its.mng3477:dep:.*:1.0 in maven-core-it
\\(http://localhost:.*/repo\\).*"
+ ".*Could not find artifact
org.apache.maven.its.mng3477:dep:.*:1.0 "
+ + "in central
\\(http://localhost:.*/repo\\).*",
+ ".*Could not find artifact
org.apache.maven.its.mng3477:dep:.*:1.0 "
+ + "in maven-core-it
\\(http://localhost:.*/repo\\).*"
},
"pom.xml");
@@ -133,16 +136,16 @@ class MavenITmng3477DependencyResolutionErrorMessageTest
extends AbstractMavenIn
try {
server = new Server(0);
server.start();
- if (server.isFailed()) {
- fail("Couldn't bind the server socket to a free port!");
- }
+ assertFalse(server.isFailed(), "Couldn't bind the server socket to
a free port!");
int port = ((NetworkConnector)
server.getConnectors()[0]).getLocalPort();
testit(
port,
new String[] {
- ".*Could not find artifact
org.apache.maven.its.plugins:maven-it-plugin-not-exists:jar:1.2.3 in central
\\(http://localhost:.*/repo\\).*",
- ".*Could not find artifact
org.apache.maven.its.plugins:maven-it-plugin-not-exists:jar:1.2.3 in
maven-core-it \\(http://localhost:.*/repo\\).*"
+ ".*Could not find artifact
org.apache.maven.its.plugins:maven-it-plugin-not-exists:jar:1.2.3 "
+ + "in central
\\(http://localhost:.*/repo\\).*",
+ ".*Could not find artifact
org.apache.maven.its.plugins:maven-it-plugin-not-exists:jar:1.2.3 "
+ + "in maven-core-it
\\(http://localhost:.*/repo\\).*"
},
"pom-plugin.xml");
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
index fd9c44f6ab..ec718c5ff4 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
@@ -39,7 +39,7 @@ public class MavenITmng3485OverrideWagonExtensionTest extends
AbstractMavenInteg
Verifier verifier;
- verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(testDir.getAbsolutePath());
verifier.addCliArgument("deploy");
verifier.execute();
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java
index 67939373f5..5cbe5b497c 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java
@@ -46,7 +46,7 @@ public class MavenITmng3498ForkToOtherMojoTest extends
AbstractMavenIntegrationT
File pluginDir = new File(testDir, "maven-mng3498-plugin");
File projectDir = new File(testDir, "mng-3498-project");
- Verifier verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.deleteArtifact("org.apache.maven.its.mng3498",
"mavenit-mng3498-plugin", "1", "pom");
verifier.addCliArgument("install");
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java
index b601fac947..42c94fc3e7 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java
@@ -51,7 +51,7 @@ public class MavenITmng3506ArtifactHandlersFromPluginsTest
extends AbstractMaven
public void testProjectPackagingUsage() throws IOException,
VerificationException {
File testDir = ResourceExtractor.simpleExtractResources(getClass(),
"/" + AID);
- Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.deleteArtifacts(GID);
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java
index 845f4f4c71..3ea1cf3983 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java
@@ -38,7 +38,7 @@ public class MavenITmng3536AppendedAbsolutePathsTest extends
AbstractMavenIntegr
public void testitMNG3536() throws Exception {
File testDir = ResourceExtractor.simpleExtractResources(getClass(),
"/mng-3536");
File pluginDir = new File(testDir, "plugin");
- Verifier verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
index e25243b030..c43f43c3c7 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
@@ -108,12 +108,12 @@ public class MavenITmng3652UserAgentHeaderTest extends
AbstractMavenIntegrationT
File pluginDir = new File(testDir, "test-plugin");
File projectDir = new File(testDir, "test-project");
- Verifier verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
- verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(projectDir.getAbsolutePath());
verifier.addCliArgument("-DtestPort=" + port);
verifier.addCliArgument("-X");
@@ -151,12 +151,12 @@ public class MavenITmng3652UserAgentHeaderTest extends
AbstractMavenIntegrationT
File pluginDir = new File(testDir, "test-plugin");
File projectDir = new File(testDir, "test-project");
- Verifier verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
- verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(projectDir.getAbsolutePath());
// test webdav
verifier.addCliArgument("-DtestPort=" + port);
@@ -196,12 +196,12 @@ public class MavenITmng3652UserAgentHeaderTest extends
AbstractMavenIntegrationT
File pluginDir = new File(testDir, "test-plugin");
File projectDir = new File(testDir, "test-project");
- Verifier verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
- verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(projectDir.getAbsolutePath());
// test settings with no config
@@ -243,12 +243,12 @@ public class MavenITmng3652UserAgentHeaderTest extends
AbstractMavenIntegrationT
File pluginDir = new File(testDir, "test-plugin");
File projectDir = new File(testDir, "test-project");
- Verifier verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
- verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(projectDir.getAbsolutePath());
// test settings with config
@@ -275,12 +275,12 @@ public class MavenITmng3652UserAgentHeaderTest extends
AbstractMavenIntegrationT
File pluginDir = new File(testDir, "test-plugin");
File projectDir = new File(testDir, "test-project");
- Verifier verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
- verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(projectDir.getAbsolutePath());
// test settings with config
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java
index cebcf7ef95..8c02d80b13 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java
@@ -41,13 +41,13 @@ public class MavenITmng3684BuildPluginParameterTest extends
AbstractMavenIntegra
File pluginDir = new File(testDir, "maven-mng3684-plugin");
File projectDir = new File(testDir, "project");
- Verifier verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
- verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(projectDir.getAbsolutePath());
verifier.setLogFileName("log-validate.txt");
verifier.addCliArgument("validate");
verifier.execute();
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java
index 7e924fb274..6718e59134 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java
@@ -45,7 +45,7 @@ public class MavenITmng3693PomFileBasedirChangeTest extends
AbstractMavenIntegra
File pluginDir = new File(testDir, "maven-mng3693-plugin");
File projectsDir = new File(testDir, "projects");
- Verifier verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java
index 2a7ad669bd..945c61455c 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java
@@ -42,7 +42,7 @@ public class MavenITmng3694ReactorProjectsDynamismTest
extends AbstractMavenInte
File pluginDir = new File(testDir, "maven-mng3694-plugin");
File projectDir = new File(testDir, "projects");
- Verifier verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
index 0256af5736..dc1d48bcc8 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
@@ -44,7 +44,7 @@ public class
MavenITmng3703ExecutionProjectWithRelativePathsTest extends Abstrac
Verifier verifier;
- verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
@@ -68,7 +68,7 @@ public class
MavenITmng3703ExecutionProjectWithRelativePathsTest extends Abstrac
Verifier verifier;
- verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java
index ed04a3475c..953b98934d 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java
@@ -48,7 +48,7 @@ public class MavenITmng3710PollutedClonedPluginsTest extends
AbstractMavenIntegr
Verifier verifier;
- verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
@@ -78,7 +78,7 @@ public class MavenITmng3710PollutedClonedPluginsTest extends
AbstractMavenIntegr
Verifier verifier;
- verifier = newVerifier(pluginsDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(pluginsDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java
index 87b55179b0..9888bee499 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java
@@ -45,7 +45,7 @@ public class MavenITmng3716AggregatorForkingTest extends
AbstractMavenIntegratio
Verifier verifier;
- verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java
index 70d9ac7e64..14925c145b 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java
@@ -50,7 +50,7 @@ public class MavenITmng3723ConcreteParentProjectTest extends
AbstractMavenIntegr
Verifier verifier;
- verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java
index 64e8b42b7b..ebcdee4879 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java
@@ -45,7 +45,7 @@ public class MavenITmng3724ExecutionProjectSyncTest extends
AbstractMavenIntegra
Verifier verifier;
- verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java
index cb15fb4b2b..daa9176361 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java
@@ -59,7 +59,7 @@ public class MavenITmng3729MultiForkAggregatorsTest extends
AbstractMavenIntegra
Verifier verifier;
- verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java
index 50ea9a65d3..932fe3b2ab 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java
@@ -47,7 +47,7 @@ public class MavenITmng3740SelfReferentialReactorProjectsTest
extends AbstractMa
Verifier verifier;
- verifier = newVerifier(v1.getAbsolutePath(), "remote");
+ verifier = newVerifier(v1.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java
index d370964d72..49637f1197 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java
@@ -46,7 +46,7 @@ public class MavenITmng3746POMPropertyOverrideTest extends
AbstractMavenIntegrat
Verifier verifier;
- verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.setLogFileName("log-sys.txt");
verifier.addCliArgument("install");
verifier.execute();
@@ -69,7 +69,7 @@ public class MavenITmng3746POMPropertyOverrideTest extends
AbstractMavenIntegrat
Verifier verifier;
- verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.setLogFileName("log-cli.txt");
verifier.addCliArgument("install");
verifier.execute();
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java
index 56b311cb85..d3e5f43d88 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java
@@ -44,7 +44,7 @@ public class MavenITmng4207PluginWithLog4JTest extends
AbstractMavenIntegrationT
public void testit() throws Exception {
File testDir = ResourceExtractor.simpleExtractResources(getClass(),
"/mng-4207");
- Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteArtifacts("org.apache.maven.its.mng4207");
verifier.addCliArgument("-s");
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
index b76fd09502..f9dfd6b8f9 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
@@ -50,7 +50,7 @@ public class MavenITmng4238ArtifactHandlerExtensionUsageTest
extends AbstractMav
public void testProjectPackagingUsage() throws IOException,
VerificationException {
File testDir = ResourceExtractor.simpleExtractResources(getClass(),
"/mng-4238");
- Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.deleteArtifacts(GID);
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java
index 6c4675bd86..5e7d89d6da 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java
@@ -52,7 +52,7 @@ public class MavenITmng4270ArtifactHandlersFromPluginDepsTest
extends AbstractMa
public void testProjectPackagingUsage() throws IOException,
VerificationException {
File testDir = ResourceExtractor.simpleExtractResources(getClass(),
"/" + AID);
- Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.deleteArtifacts(GID);
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java
index c00c69c704..c299f7f661 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java
@@ -42,7 +42,7 @@ public class
MavenITmng4463DependencyManagementImportVersionRanges extends Abstr
@Test
public void testInclusiveUpperBoundResolvesToHighestVersion() throws
Exception {
final File testDir =
ResourceExtractor.simpleExtractResources(getClass(),
"/mng-4463/inclusive-upper-bound");
- final Verifier verifier = newVerifier(testDir.getAbsolutePath(),
"remote");
+ final Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.addCliArgument("validate");
@@ -56,7 +56,7 @@ public class
MavenITmng4463DependencyManagementImportVersionRanges extends Abstr
@Test
public void testExclusiveUpperBoundResolvesToHighestVersion() throws
Exception {
final File testDir =
ResourceExtractor.simpleExtractResources(getClass(),
"/mng-4463/exclusive-upper-bound");
- final Verifier verifier = newVerifier(testDir.getAbsolutePath(),
"remote");
+ final Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.addCliArgument("validate");
@@ -70,7 +70,7 @@ public class
MavenITmng4463DependencyManagementImportVersionRanges extends Abstr
@Test
public void testFailureWithoutUpperBound() throws Exception {
final File testDir =
ResourceExtractor.simpleExtractResources(getClass(),
"/mng-4463/no-upper-bound");
- final Verifier verifier = newVerifier(testDir.getAbsolutePath(),
"remote");
+ final Verifier verifier = newVerifier(testDir.getAbsolutePath());
try {
verifier.setAutoclean(false);
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java
index 721eb638ec..69bc71498a 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java
@@ -50,7 +50,7 @@ public class
MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest extends Abstr
public void testit() throws Exception {
File testDir = ResourceExtractor.simpleExtractResources(getClass(),
"/mng-4528");
- Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.addCliArgument("validate");
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java
index d81bb5062b..6b90e16cc9 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java
@@ -66,7 +66,7 @@ public class
MavenITmng4633DualCompilerExecutionsWeaveModeTest extends AbstractM
public void testit() throws Exception {
File testDir = ResourceExtractor.simpleExtractResources(getClass(),
"/mng-4633");
- Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.addCliArgument("-T");
verifier.addCliArgument("2W");
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java
index db9fec8d30..1b543ff4fc 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java
@@ -44,7 +44,7 @@ public class MavenITmng4654ArtifactHandlerForMainArtifactTest
extends AbstractMa
public void testit() throws Exception {
File testDir = ResourceExtractor.simpleExtractResources(getClass(),
"/mng-4654");
- Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteArtifacts("org.apache.maven.its.mng4654");
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java
index 7b2869eddc..be9e18cfc2 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java
@@ -45,7 +45,7 @@ public class
MavenITmng4776ForkedReactorPluginVersionResolutionTest extends Abst
public void testitLifecycle() throws Exception {
File testDir = ResourceExtractor.simpleExtractResources(getClass(),
"/mng-4776");
- Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteDirectory("sub/target");
@@ -68,7 +68,7 @@ public class
MavenITmng4776ForkedReactorPluginVersionResolutionTest extends Abst
public void testitCmdLine() throws Exception {
File testDir = ResourceExtractor.simpleExtractResources(getClass(),
"/mng-4776");
- Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.deleteDirectory("sub/target");
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java
index 2c776e8146..e6a5508040 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java
@@ -47,7 +47,7 @@ public class MavenITmng5382Jsr330Plugin extends
AbstractMavenIntegrationTestCase
//
// Build a plugin that uses a JSR330 plugin
//
- Verifier v0 = newVerifier(testDir.getAbsolutePath(), "remote");
+ Verifier v0 = newVerifier(testDir.getAbsolutePath());
v0.setAutoclean(false);
v0.deleteDirectory("target");
v0.deleteArtifacts("org.apache.maven.its.mng5382");
@@ -58,7 +58,7 @@ public class MavenITmng5382Jsr330Plugin extends
AbstractMavenIntegrationTestCase
//
// Execute the JSR330 plugin
//
- Verifier v1 = newVerifier(testDir.getAbsolutePath(), "remote");
+ Verifier v1 = newVerifier(testDir.getAbsolutePath());
v1.setAutoclean(false);
v1.addCliArgument("org.apache.maven.its.mng5382:jsr330-maven-plugin:0.0.1-SNAPSHOT:hello");
v1.execute();
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java
index 26e6436501..730b0b5c12 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java
@@ -42,7 +42,7 @@ public class MavenITmng5387ArtifactReplacementPlugin extends
AbstractMavenIntegr
@Test
public void testArtifactReplacementExecution() throws Exception {
- Verifier v0 = newVerifier(testDir.getAbsolutePath(), "remote");
+ Verifier v0 = newVerifier(testDir.getAbsolutePath());
v0.setAutoclean(false);
v0.deleteDirectory("target");
v0.deleteArtifacts("org.apache.maven.its.mng5387");
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java
index d54891c5c4..bd63d42821 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java
@@ -38,13 +38,13 @@ public class
MavenITmng5389LifecycleParticipantAfterSessionEnd extends AbstractM
Verifier verifier;
// install the test plugin
- verifier = newVerifier(extensionDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(extensionDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
// build the test project
- verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(projectDir.getAbsolutePath());
verifier.addCliArgument("package");
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java
index b795d1f317..0d63929612 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java
@@ -63,7 +63,7 @@ public class MavenITmng5482AetherNotFoundTest extends
AbstractMavenIntegrationTe
public void check(String dir) throws IOException, VerificationException {
File testDir = ResourceExtractor.simpleExtractResources(getClass(),
"/mng-5482/" + dir);
- Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.addCliArgument("validate");
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java
index 9527ecc3d1..9cb6633587 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java
@@ -37,13 +37,13 @@ public class MavenITmng5530MojoExecutionScopeTest extends
AbstractMavenIntegrati
Verifier verifier;
// install the test plugin
- verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
// build the test project
- verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(projectDir.getAbsolutePath());
verifier.addCliArgument("package");
verifier.execute();
verifier.verifyErrorFreeLog();
@@ -62,13 +62,13 @@ public class MavenITmng5530MojoExecutionScopeTest extends
AbstractMavenIntegrati
Verifier verifier;
// install the test plugin
- verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
// build the test project
- verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(projectDir.getAbsolutePath());
verifier.addCliArgument("--builder");
verifier.addCliArgument("multithreaded");
verifier.addCliArgument("-T");
@@ -92,19 +92,19 @@ public class MavenITmng5530MojoExecutionScopeTest extends
AbstractMavenIntegrati
Verifier verifier;
// install the test extension
- verifier = newVerifier(extensionDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(extensionDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
// install the test plugin
- verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
// build the test project
- verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(projectDir.getAbsolutePath());
verifier.addCliArgument("-Dmaven.ext.class.path=" + new
File(extensionDir, "target/classes").getAbsolutePath());
verifier.setForkJvm(true); // verifier does not support custom realms
in embedded mode
verifier.addCliArgument("package");
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java
index 58a0114454..315ffcc714 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java
@@ -37,13 +37,13 @@ public class MavenITmng5578SessionScopeTest extends
AbstractMavenIntegrationTest
Verifier verifier;
// install the test plugin
- verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
// build the test project
- verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(projectDir.getAbsolutePath());
verifier.addCliArgument("-Dit-build-extensions=false");
verifier.addCliArgument("package");
verifier.execute();
@@ -59,13 +59,13 @@ public class MavenITmng5578SessionScopeTest extends
AbstractMavenIntegrationTest
Verifier verifier;
// install the test plugin
- verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
// build the test project
- verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(projectDir.getAbsolutePath());
verifier.addCliArgument("-Dit-build-extensions=false");
verifier.addCliArgument("--builder");
verifier.addCliArgument("multithreaded");
@@ -85,13 +85,13 @@ public class MavenITmng5578SessionScopeTest extends
AbstractMavenIntegrationTest
Verifier verifier;
// install the test plugin
- verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
// build the test project
- verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(projectDir.getAbsolutePath());
verifier.addCliArgument("-Dit-build-extensions=true");
verifier.addCliArgument("package");
verifier.execute();
@@ -108,19 +108,19 @@ public class MavenITmng5578SessionScopeTest extends
AbstractMavenIntegrationTest
Verifier verifier;
// install the test extension
- verifier = newVerifier(extensionDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(extensionDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
// install the test plugin
- verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
// build the test project
- verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(projectDir.getAbsolutePath());
verifier.addCliArgument("-Dmaven.ext.class.path=" + new
File(extensionDir, "target/classes").getAbsolutePath());
verifier.setForkJvm(true); // verifier does not support custom realms
in embedded mode
verifier.addCliArgument("package");
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
index d02a294957..f1763c7330 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
@@ -58,7 +58,7 @@ public class MavenITmng5581LifecycleMappingDelegate extends
AbstractMavenIntegra
verifier.verifyErrorFreeLog();
// run custom "test-only" build phase
- verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(projectDir.getAbsolutePath());
verifier = newVerifier(projectDir.getAbsolutePath());
verifier.setLogFileName("test-only-log.txt");
verifier.setForkJvm(true);
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java
index 556239d9fd..f5343526c8 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java
@@ -45,13 +45,13 @@ public class MavenITmng5591WorkspaceReader extends
AbstractMavenIntegrationTestC
Verifier verifier;
// install the test extension
- verifier = newVerifier(extensionDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(extensionDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
// compile the test project
- verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(projectDir.getAbsolutePath());
verifier.addCliArgument("-Dmaven.ext.class.path="
+ new File(extensionDir,
"target/mng-5591-workspace-reader-extension-0.1.jar").getCanonicalPath());
verifier.addCliArgument("compile");
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java
index 6a6a05a2b8..022baa98d0 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java
@@ -41,13 +41,13 @@ public class MavenITmng5742BuildExtensionClassloaderTest
extends AbstractMavenIn
Verifier verifier;
// install the test plugin
- verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
// build the test project
- verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(projectDir.getAbsolutePath());
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java
index 4467a5c268..a44bb0b1ed 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java
@@ -42,7 +42,7 @@ public class
MavenITmng5753CustomMojoExecutionConfiguratorTest extends AbstractM
Verifier verifier;
// install the test plugin
- verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
@@ -51,7 +51,7 @@ public class
MavenITmng5753CustomMojoExecutionConfiguratorTest extends AbstractM
configurationFile.delete();
// build the test project
- verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(projectDir.getAbsolutePath());
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java
index ec90f225bd..b170b18c87 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java
@@ -35,12 +35,12 @@ public class MavenITmng5783PluginDependencyFiltering
extends AbstractMavenIntegr
@Test
public void testSLF4j() throws Exception {
File testDir = ResourceExtractor.simpleExtractResources(getClass(),
"/mng-5783-plugin-dependency-filtering");
- Verifier verifier = newVerifier(new File(testDir,
"plugin").getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(new File(testDir,
"plugin").getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
- verifier = newVerifier(new File(testDir, "slf4j").getAbsolutePath(),
"remote");
+ verifier = newVerifier(new File(testDir, "slf4j").getAbsolutePath());
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java
index 2d2bb87995..56931a1760 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java
@@ -32,12 +32,12 @@ public class MavenITmng5840ParentVersionRanges extends
AbstractMavenIntegrationT
public void testParentRangeRelativePathPointsToWrongVersion() throws
Exception {
File testDir = ResourceExtractor.simpleExtractResources(getClass(),
"/mng-5840-relative-path-range-negative");
- Verifier verifier = newVerifier(new File(testDir,
"parent-1").getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(new File(testDir,
"parent-1").getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
- verifier = newVerifier(new File(testDir, "child").getAbsolutePath(),
"remote");
+ verifier = newVerifier(new File(testDir, "child").getAbsolutePath());
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
@@ -47,12 +47,12 @@ public class MavenITmng5840ParentVersionRanges extends
AbstractMavenIntegrationT
public void testParentRangeRelativePathPointsToCorrectVersion() throws
Exception {
File testDir = ResourceExtractor.simpleExtractResources(getClass(),
"/mng-5840-relative-path-range-positive");
- Verifier verifier = newVerifier(new File(testDir,
"parent-1").getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(new File(testDir,
"parent-1").getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
- verifier = newVerifier(new File(testDir, "child").getAbsolutePath(),
"remote");
+ verifier = newVerifier(new File(testDir, "child").getAbsolutePath());
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java
index 29ef842a03..258acaec10 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java
@@ -32,12 +32,12 @@ public class MavenITmng5840RelativePathReactorMatching
extends AbstractMavenInte
public void testRelativePathPointsToWrongVersion() throws Exception {
File testDir = ResourceExtractor.simpleExtractResources(getClass(),
"/mng-5840-relative-path-reactor-matching");
- Verifier verifier = newVerifier(new File(testDir,
"parent-1").getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(new File(testDir,
"parent-1").getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
- verifier = newVerifier(new File(testDir, "child").getAbsolutePath(),
"remote");
+ verifier = newVerifier(new File(testDir, "child").getAbsolutePath());
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java
index b77b360b63..d274a6bf66 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java
@@ -41,7 +41,7 @@ public class
MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest extend
File testDir = ResourceExtractor.simpleExtractResources(
getClass(),
"/mng-5935-optional-lost-in-transtive-managed-dependencies");
- Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(testDir.getAbsolutePath());
verifier.setAutoclean(false);
verifier.deleteDirectory("target");
verifier.addCliArgument("validate");
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java
index 7cc7b8892d..67c96a3cb0 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java
@@ -45,7 +45,7 @@ public class MavenITmng6084Jsr250PluginTest extends
AbstractMavenIntegrationTest
//
// Build a plugin that uses JSR 250 annotations
//
- Verifier v0 = newVerifier(testDir.getAbsolutePath(), "remote");
+ Verifier v0 = newVerifier(testDir.getAbsolutePath());
v0.setAutoclean(false);
v0.deleteDirectory("target");
v0.deleteArtifacts("org.apache.maven.its.mng6084");
@@ -56,7 +56,7 @@ public class MavenITmng6084Jsr250PluginTest extends
AbstractMavenIntegrationTest
//
// Execute the JSR 250 plugin
//
- Verifier v1 = newVerifier(testDir.getAbsolutePath(), "remote");
+ Verifier v1 = newVerifier(testDir.getAbsolutePath());
v1.setAutoclean(false);
v1.addCliArgument("org.apache.maven.its.mng6084:jsr250-maven-plugin:0.0.1-SNAPSHOT:hello");
v1.execute();
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java
index e3d22e753a..6b06ab0492 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java
@@ -45,7 +45,7 @@ public class
MavenITmng6127PluginExecutionConfigurationInterferenceTest extends
Verifier verifier;
// install the test plugin
- verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
@@ -58,7 +58,7 @@ public class
MavenITmng6127PluginExecutionConfigurationInterferenceTest extends
modCconfigurationFile.delete();
// build the test project
- verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(projectDir.getAbsolutePath());
verifier.addCliArgument("verify");
verifier.addCliArgument("-X");
verifier.execute();
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java
index ffcef6fff9..1347857be3 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java
@@ -55,13 +55,13 @@ public class MavenITmng6240PluginExtensionAetherProvider
extends AbstractMavenIn
File pluginDir = new File(testDir, "plugin-extension");
File projectDir = new File(testDir, "project");
- Verifier verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.setEnvironmentVariable("CI", "false");
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
- verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(projectDir.getAbsolutePath());
verifier.setEnvironmentVariable("CI", "false");
verifier.addCliArgument("deploy");
verifier.execute();
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java
index 6f8d4c8b24..9991882ba0 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java
@@ -37,12 +37,12 @@ public class MavenITmng6506PackageAnnotationTest extends
AbstractMavenIntegratio
Verifier verifier;
- verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
- verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
+ verifier = newVerifier(projectDir.getAbsolutePath());
verifier.addCliArgument("verify");
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java
index 12cf1b0eaf..120f364284 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java
@@ -42,7 +42,7 @@ public class
MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest extends
testDir = ResourceExtractor.simpleExtractResources(getClass(),
RESOURCE_PATH);
File pluginDir = new File(testDir, "plugin");
- Verifier verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
+ Verifier verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7310LifecycleActivatedInSpecifiedModuleTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7310LifecycleActivatedInSpecifiedModuleTest.java
index 8c5b08b792..6b79b9ecf4 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7310LifecycleActivatedInSpecifiedModuleTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7310LifecycleActivatedInSpecifiedModuleTest.java
@@ -41,7 +41,7 @@ public class
MavenITmng7310LifecycleActivatedInSpecifiedModuleTest extends Abstr
File extensionTestDir =
ResourceExtractor.simpleExtractResources(getClass(), BASE_TEST_DIR +
"/extension");
File projectTestDir =
ResourceExtractor.simpleExtractResources(getClass(), BASE_TEST_DIR +
"/project");
- Verifier verifier = newVerifier(extensionTestDir.getAbsolutePath(),
"remote");
+ Verifier verifier = newVerifier(extensionTestDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
diff --git a/its/core-it-suite/src/test/resources-filtered/bootstrap.txt
b/its/core-it-suite/src/test/resources-filtered/bootstrap.txt
index 372cebd860..682bcf82dd 100644
--- a/its/core-it-suite/src/test/resources-filtered/bootstrap.txt
+++ b/its/core-it-suite/src/test/resources-filtered/bootstrap.txt
@@ -4,193 +4,3 @@
#3 It should be kept sorted alphabetically using the following commands:
#4 mv bootstrap.txt tmp.txt && cat tmp.txt | sort -u > bootstrap.txt && rm
tmp.txt
#5
-com.google.code.findbugs:jsr305:1.3.9
-com.google.errorprone:error_prone_annotations:2.16
-com.google.errorprone:error_prone_annotations:2.19.1
-com.google.guava:guava:10.0.1
-com.google.guava:guava:16.0.1
-com.thoughtworks.qdox:qdox:2.0-M9
-com.typesafe:config:1.4.2
-commons-codec:commons-codec:1.15
-commons-lang:commons-lang:2.6
-dom4j:dom4j:1.6.1
-javax.annotation:javax.annotation-api:1.2
-junit:junit:4.12
-org.apache.ant:ant:1.10.8
-org.apache.commons:commons-text:1.10.0
-org.apache.geronimo.specs:geronimo-jcdi_2.0_spec:1.3
-org.apache.groovy:groovy-ant:4.0.15
-org.apache.groovy:groovy:4.0.15
-org.apache.maven:maven-api-impl:4.0.0-beta-3
-org.apache.maven:maven-api-di:4.0.0-beta-3
-org.apache.maven:maven-api-spi:4.0.0-alpha-8
-org.apache.maven:maven-api-model:mdo:4.0.0-alpha-8
-org.apache.maven.extensions:maven-extensions:pom:41
-org.apache.maven.extensions:maven-build-cache-extension:1.2.0
-org.apache.maven.its.plugins.class-loader:dep-c:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-active-collection:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-all:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-ant-based:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-artifact:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-class-loader:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-configuration:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-context-passing:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-dependency-collection:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-error:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-expression:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-extension-consumer:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-extension-provider:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-extension1:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-extension2:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-fork:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-invalid-descriptor:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-log-file:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-log4j:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-no-default-comp:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-no-project:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-online:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-optional-mojos:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-packaging:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-plexus-component-api:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-plexus-utils-11:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-plexus-utils-new:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-plugin-dependency:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-project:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-setter:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-singleton-component:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-site:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-toolchain:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-touch:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-uses-properties:${project.version}
-org.apache.maven.its.plugins:maven-it-plugin-uses-wagon:${project.version}
-org.apache.maven.its.plugins:mng-5805-pkg-type-mojo-configuration-extension2:${project.version}
-org.apache.maven.its.plugins:mng-5805-pkg-type-mojo-configuration-extension:${project.version}
-org.apache.maven.its.plugins:mng-5805-pkg-type-mojo-configuration-plugin:${project.version}
-org.apache.maven.its.plugins:mng-5958-pkg-type-extension:${project.version}
-org.apache.maven.its:core-it-extension:${project.version}
-org.apache.maven.its:core-it-toolchain:${project.version}
-org.apache.maven.its:core-it-wagon:${project.version}
-org.apache.maven.its:maven-core-it-support:1.0
-org.apache.maven.its:maven-core-it-support:1.3
-org.apache.maven.its:maven-core-it-support:1.4
-org.apache.maven.plugin-tools:maven-plugin-annotations:3.3
-org.apache.maven.plugins:maven-antrun-plugin:3.0.0
-org.apache.maven.plugins:maven-antrun-plugin:3.1.0
-org.apache.maven.plugins:maven-assembly-plugin:3.1.0
-org.apache.maven.plugins:maven-assembly-plugin:3.4.0
-org.apache.maven.plugins:maven-clean-plugin:${stubPluginVersion}
-org.apache.maven.plugins:maven-clean-plugin:2.5
-org.apache.maven.plugins:maven-clean-plugin:3.1.0
-org.apache.maven.plugins:maven-clean-plugin:3.2.0
-org.apache.maven.plugins:maven-clean-plugin:3.3.2
-org.apache.maven.plugins:maven-compiler-plugin:${stubPluginVersion}
-org.apache.maven.plugins:maven-compiler-plugin:3.1
-org.apache.maven.plugins:maven-compiler-plugin:3.8.1
-org.apache.maven.plugins:maven-compiler-plugin:3.10.1
-org.apache.maven.plugins:maven-dependency-plugin:2.7
-org.apache.maven.plugins:maven-dependency-plugin:2.8
-org.apache.maven.plugins:maven-dependency-plugin:3.1.1
-org.apache.maven.plugins:maven-dependency-plugin:3.3.0
-org.apache.maven.plugins:maven-deploy-plugin:${stubPluginVersion}
-org.apache.maven.plugins:maven-deploy-plugin:2.7
-org.apache.maven.plugins:maven-deploy-plugin:3.0.0
-org.apache.maven.plugins:maven-ear-plugin:${stubPluginVersion}
-org.apache.maven.plugins:maven-ear-plugin:3.2.0
-org.apache.maven.plugins:maven-ejb-plugin:${stubPluginVersion}
-org.apache.maven.plugins:maven-ejb-plugin:3.1.0
-org.apache.maven.plugins:maven-enforcer-plugin:3.0.0
-org.apache.maven.plugins:maven-help-plugin:3.3.0
-org.apache.maven.plugins:maven-install-plugin:${stubPluginVersion}
-org.apache.maven.plugins:maven-install-plugin:3.0.1
-org.apache.maven.plugins:maven-jar-plugin:${stubPluginVersion}
-org.apache.maven.plugins:maven-jar-plugin:3.3.0
-org.apache.maven.plugins:maven-javadoc-plugin:${stubPluginVersion}
-org.apache.maven.plugins:maven-javadoc-plugin:3.6.3
-org.apache.maven.plugins:maven-plugin-plugin:${stubPluginVersion}
-org.apache.maven.plugins:maven-plugin-plugin:3.2
-org.apache.maven.plugins:maven-plugin-plugin:3.3
-org.apache.maven.plugins:maven-plugin-plugin:3.6.0
-org.apache.maven.plugins:maven-plugin-plugin:3.9.0
-org.apache.maven.plugins:maven-rar-plugin:${stubPluginVersion}
-org.apache.maven.plugins:maven-release-plugin:3.0.0-M5
-org.apache.maven.plugins:maven-remote-resources-plugin:1.7.0
-org.apache.maven.plugins:maven-resources-plugin:${stubPluginVersion}
-org.apache.maven.plugins:maven-resources-plugin:3.2.0
-org.apache.maven.plugins:maven-resources-plugin:3.3.0
-org.apache.maven.plugins:maven-site-plugin:${stubPluginVersion}
-org.apache.maven.plugins:maven-site-plugin:3.9.1
-org.apache.maven.plugins:maven-shade-plugin:3.5.0
-org.apache.maven.plugins:maven-source-plugin:${stubPluginVersion}
-org.apache.maven.plugins:maven-surefire-plugin:${stubPluginVersion}
-org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M5
-org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M7
-org.apache.maven.plugins:maven-surefire-plugin:3.2.2
-org.apache.maven.plugins:maven-war-plugin:${stubPluginVersion}
-org.apache.maven.plugins:maven-war-plugin:3.3.2
-org.apache.maven.plugins:maven-wrapper-plugin:3.1.0
-org.apache.maven.reporting:maven-reporting-exec:1.1
-org.apache.maven.resolver:maven-resolver-api:1.7.3
-org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3
-org.apache.maven.resolver:maven-resolver-impl:1.7.3
-org.apache.maven.resolver:maven-resolver-spi:1.7.3
-org.apache.maven.resolver:maven-resolver-util:1.7.3
-org.apache.maven.shared:maven-artifact-transfer:0.11.0
-org.apache.maven.shared:maven-common-artifact-filters:3.1.0
-org.apache.maven.shared:maven-shared-utils:3.3.3
-org.apache.maven.skins:maven-default-skin:1.3
-org.apache.maven.surefire:surefire-junit4:3.0.0-M7
-org.apache.maven.surefire:surefire-junit-platform:3.0.0-M7
-org.apache.maven.wagon:wagon-webdav-jackrabbit:2.10
-org.apache.maven.wagon:wagon-webdav:1.0-beta-2
-org.apache.maven:maven-core:3.8.6
-org.apache.maven:maven-plugin-api:3.1.0
-org.apache.maven:maven-plugin-api:3.2.5
-org.apache.maven:maven-plugin-registry:2.1.0
-org.apache.maven:maven-profile:2.1.0
-org.apache.maven:maven-project:2.1.0
-org.apache.maven:maven-repository-metadata:2.1.0
-org.apache.maven:maven-repository-metadata:3.1.1
-org.apache.maven:maven-resolver-provider:3.8.6
-org.apache.maven:maven-script-ant:2.1.0
-org.apache.maven:maven-settings-builder:3.1.1
-org.apache.maven:maven-settings:3.1.1
-org.apache.maven.plugin-testing:maven-plugin-testing-harness:3.3.0
-org.checkerframework:checker-qual:3.21.2
-org.checkerframework:checker-qual:3.35.0
-org.codehaus.gmavenplus:gmavenplus-plugin:1.11.0
-org.codehaus.modello:modello-maven-plugin:2.1.1
-org.codehaus.mojo:build-helper-maven-plugin:3.2.0
-org.codehaus.mojo:flatten-maven-plugin:1.0.0
-org.codehaus.mojo:versions-maven-plugin:2.15.0
-org.codehaus.plexus:plexus-classworlds:2.5.1
-org.codehaus.plexus:plexus-component-annotations:1.5.5
-org.codehaus.plexus:plexus-component-metadata:1.5.5
-org.codehaus.plexus:plexus-container-default:1.5.5
-org.codehaus.plexus:plexus-io:1.0
-org.codehaus.plexus:plexus-java:1.0.5
-org.codehaus.plexus:plexus-utils:1.1
-org.codehaus.plexus:plexus-utils:1.4.5
-org.codehaus.plexus:plexus-utils:1.5.1
-org.codehaus.plexus:plexus-utils:1.5.5
-org.codehaus.plexus:plexus-utils:1.5.6
-org.codehaus.plexus:plexus-utils:2.0.4
-org.codehaus.plexus:plexus-utils:2.0.5
-org.codehaus.plexus:plexus-utils:3.0.9
-org.codehaus.plexus:plexus-utils:3.0.10
-org.eclipse.aether:aether-impl:0.9.0.M2
-org.eclipse.aether:aether-spi:0.9.0.M2
-org.eclipse.sisu:org.eclipse.sisu.inject:0.0.0.M5
-org.eclipse.sisu:org.eclipse.sisu.plexus:0.0.0.M5
-org.eclipse.sisu:sisu-maven-plugin:0.3.5
-org.junit:junit-bom:pom:5.9.1
-org.junit.jupiter:junit-jupiter:5.9.1
-org.junit.jupiter:junit-jupiter-engine:5.9.1
-org.junit.platform:junit-platform-launcher:1.9.1
-org.ow2.asm:asm:4.1
-org.ow2.asm:asm:6.2
-org.ow2.asm:asm:7.2
-org.slf4j:slf4j-api:1.6.1
-org.slf4j:slf4j-api:1.7.36
-org.slf4j:slf4j-api:2.0.16
-org.sonatype.sisu:sisu-guice:jar:no_aop:3.1.0
diff --git a/its/core-it-suite/src/test/resources/bootstrap/bootstrap/pom.xml
b/its/core-it-suite/src/test/resources/bootstrap/bootstrap/pom.xml
deleted file mode 100644
index a96ba19fc9..0000000000
--- a/its/core-it-suite/src/test/resources/bootstrap/bootstrap/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.its.bootstrap</groupId>
- <artifactId>maven-it-boostrap</artifactId>
- <version>1.0</version>
- </parent>
-
- <artifactId>bootstrap</artifactId>
- <packaging>pom</packaging>
-
- <name>Maven Integration Test :: Boostrap :: boostrap</name>
-
- <!-- We do want the file here -->
- <properties>
- <file>${bootstrap}</file>
- </properties>
-</project>
diff --git
a/its/core-it-suite/src/test/resources/bootstrap/packaging-jar/pom.xml
b/its/core-it-suite/src/test/resources/bootstrap/packaging-jar/pom.xml
deleted file mode 100644
index 294b032012..0000000000
--- a/its/core-it-suite/src/test/resources/bootstrap/packaging-jar/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.its.bootstrap</groupId>
- <artifactId>maven-it-boostrap</artifactId>
- <version>1.0</version>
- </parent>
-
- <artifactId>packaging-jar</artifactId>
- <packaging>jar</packaging>
-
- <name>Maven Integration Test :: Boostrap :: packaging-jar</name>
-</project>
diff --git
a/its/core-it-suite/src/test/resources/bootstrap/packaging-maven-plugin/pom.xml
b/its/core-it-suite/src/test/resources/bootstrap/packaging-maven-plugin/pom.xml
deleted file mode 100644
index ed3305477f..0000000000
---
a/its/core-it-suite/src/test/resources/bootstrap/packaging-maven-plugin/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.its.bootstrap</groupId>
- <artifactId>maven-it-boostrap</artifactId>
- <version>1.0</version>
- </parent>
-
- <artifactId>packaging-maven-plugin</artifactId>
- <packaging>maven-plugin</packaging>
-
- <name>Maven Integration Test :: Boostrap :: packaging-maven-plugin</name>
-</project>
diff --git
a/its/core-it-suite/src/test/resources/bootstrap/packaging-war/pom.xml
b/its/core-it-suite/src/test/resources/bootstrap/packaging-war/pom.xml
deleted file mode 100644
index 22b1a407e8..0000000000
--- a/its/core-it-suite/src/test/resources/bootstrap/packaging-war/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.its.bootstrap</groupId>
- <artifactId>maven-it-boostrap</artifactId>
- <version>1.0</version>
- </parent>
-
- <artifactId>packaging-war</artifactId>
- <packaging>war</packaging>
-
- <name>Maven Integration Test :: Boostrap :: packaging-war</name>
-</project>
diff --git a/its/core-it-suite/src/test/resources/bootstrap/pom.xml
b/its/core-it-suite/src/test/resources/bootstrap/pom.xml
index a6b7465158..8f30834426 100644
--- a/its/core-it-suite/src/test/resources/bootstrap/pom.xml
+++ b/its/core-it-suite/src/test/resources/bootstrap/pom.xml
@@ -35,13 +35,6 @@ under the License.
- boostrap - resolves all artifacts provided in bootstrap file
- packaging-* - resolves build plugins provided by tested Maven
default lifecycle(s)</description>
- <modules>
- <module>bootstrap</module>
- <module>packaging-jar</module>
- <module>packaging-maven-plugin</module>
- <module>packaging-war</module>
- </modules>
-
<build>
<plugins>
<!-- This merely locks the plugin versions to disable auto-update -->
diff --git
a/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
b/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
index 43eca27a87..4aa94b23c0 100644
---
a/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
+++
b/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
@@ -248,7 +248,7 @@ public abstract class AbstractMavenIntegrationTestCase {
}
protected Verifier newVerifier(String basedir, boolean debug) throws
VerificationException {
- return newVerifier(basedir, "", debug);
+ return newVerifier(basedir, "remote", debug);
}
protected Verifier newVerifier(String basedir, String settings, boolean
debug) throws VerificationException {
