Apache/maven
1
0
Fork 0
mirror of https://github.com/apache/maven.git synced 2025-02-06 10:09:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move everything out of bootstrap (#1909)

Browse Source
This commit is contained in:
Guillaume Nodet 2024-11-16 18:50:22 +01:00 committed by GitHub
parent 1614226c68
commit c4834efdba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
63 changed files with 124 additions and 455 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java
View File

@ -37,7 +37,7 @@ public MavenIT0030DepPomDepMgmtInheritanceTest() {
@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");

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
View File

@ -43,7 +43,7 @@ public MavenIT0041ArtifactTypeFromPluginExtensionTest() {
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");

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
View File

@ -67,7 +67,7 @@ public void testitBuildConfigDominantDuringBuild() throws Exception {
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)")) {

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
View File

@ -46,7 +46,7 @@ public MavenITmng0507ArtifactRelocationTest() {
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");

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java
View File

@ -43,7 +43,7 @@ public MavenITmng2135PluginBuildInReactorTest() {
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");

12
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java
View File

@ -43,7 +43,7 @@ public void testValidParentVersionRangeWithInclusiveUpperBound() throws Exceptio
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 void testValidParentVersionRangeWithExclusiveUpperBound() throws Exceptio
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 void testInvalidParentVersionRangeWithoutUpperBound() throws Exception {
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 void testValidParentVersionRangeInvalidVersionExpression() throws Excepti
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 void testValidParentVersionRangeInvalidVersionInheritance() throws Except
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 void testInvalidLocalParentVersionRangeFallingBackToRemote() throws Excep
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();

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java
View File

@ -44,14 +44,14 @@ public void testitMNG3259() throws Exception {
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();

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java
View File

@ -40,7 +40,7 @@ public void testMultipleProfileParams() throws Exception {
Verifier verifier;
verifier = newVerifier(testDir.getAbsolutePath(), "remote");
verifier = newVerifier(testDir.getAbsolutePath());
verifier.addCliArgument("-Pprofile1,profile2");
verifier.addCliArgument("-Pprofile3");

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
View File

@ -43,7 +43,7 @@ public void testitMNG3372() throws Exception {
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 void testDependencyTreeInvocation() throws Exception {
// file.
File testBaseDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-3372/dependency-tree");
Verifier verifier = newVerifier(testBaseDir.getAbsolutePath(), "remote");
Verifier verifier = newVerifier(testBaseDir.getAbsolutePath());
verifier.addCliArgument("-U");

6
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java
View File

@ -40,7 +40,7 @@ public void testitMNG3396() throws Exception {
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 void testitMNG3396() throws Exception {
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 void testitMNG3396() throws Exception {
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");

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java
View File

@ -51,7 +51,7 @@ public void testitMNG3441() throws Exception {
Verifier verifier;
verifier = newVerifier(testDir.getAbsolutePath(), "remote");
verifier = newVerifier(testDir.getAbsolutePath());
verifier.addCliArgument("-s");
verifier.addCliArgument("settings.xml");

27
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java
View File

@ -29,6 +29,7 @@
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 @@ public MavenITmng3477DependencyResolutionErrorMessageTest() {
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 @@ void connectionProblemsPlugin() throws Exception {
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 @@ void notFoundProblems() throws Exception {
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 @@ void notFoundProblemsPlugin() throws Exception {
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");

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
View File

@ -39,7 +39,7 @@ public void testitMNG3485() throws Exception {
Verifier verifier;
verifier = newVerifier(testDir.getAbsolutePath(), "remote");
verifier = newVerifier(testDir.getAbsolutePath());
verifier.addCliArgument("deploy");
verifier.execute();

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java
View File

@ -46,7 +46,7 @@ public void testitMNG3498() throws Exception {
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");

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java
View File

@ -51,7 +51,7 @@ public MavenITmng3506ArtifactHandlersFromPluginsTest() {
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);

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java
View File

@ -38,7 +38,7 @@ public MavenITmng3536AppendedAbsolutePathsTest() {
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();

20
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
View File

@ -108,12 +108,12 @@ public void testmng3652_UnConfiguredHttp() throws Exception {
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 void testmng3652_UnConfiguredDAV() throws Exception {
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 void testmng3652_ConfigurationInSettingsWithoutUserAgent() throws Excepti
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 void testmng3652_UserAgentConfiguredInSettings() throws Exception {
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 void testmng3652_AdditionnalHttpHeaderConfiguredInSettings() throws Excep
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

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java
View File

@ -41,13 +41,13 @@ public void testitMNG3684() throws Exception {
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();

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java
View File

@ -45,7 +45,7 @@ public void testitMNG3693() throws Exception {
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();

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java
View File

@ -42,7 +42,7 @@ public void testitMNG3694() throws Exception {
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();

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
View File

@ -44,7 +44,7 @@ public void testForkFromMojo() throws Exception {
Verifier verifier;
verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
@ -68,7 +68,7 @@ public void testForkFromReport() throws Exception {
Verifier verifier;
verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java
View File

@ -48,7 +48,7 @@ public void testitMNG3710_POMInheritance() throws Exception {
Verifier verifier;
verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
@ -78,7 +78,7 @@ public void testitMNG3710_OriginalModel() throws Exception {
Verifier verifier;
verifier = newVerifier(pluginsDir.getAbsolutePath(), "remote");
verifier = newVerifier(pluginsDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java
View File

@ -45,7 +45,7 @@ public void testitMNG3716() throws Exception {
Verifier verifier;
verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java
View File

@ -50,7 +50,7 @@ public void testitMNG3723() throws Exception {
Verifier verifier;
verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java
View File

@ -45,7 +45,7 @@ public void testitMNG3724() throws Exception {
Verifier verifier;
verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java
View File

@ -59,7 +59,7 @@ public void testitMNG3729() throws Exception {
Verifier verifier;
verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java
View File

@ -47,7 +47,7 @@ public void testitMNG3740() throws Exception {
Verifier verifier;
verifier = newVerifier(v1.getAbsolutePath(), "remote");
verifier = newVerifier(v1.getAbsolutePath());
verifier.addCliArgument("install");
verifier.execute();
verifier.verifyErrorFreeLog();

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java
View File

@ -46,7 +46,7 @@ public void testitMNG3746_UsingDefaultSystemProperty() throws Exception {
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 void testitMNG3746_UsingCLIProperty() throws Exception {
Verifier verifier;
verifier = newVerifier(pluginDir.getAbsolutePath(), "remote");
verifier = newVerifier(pluginDir.getAbsolutePath());
verifier.setLogFileName("log-cli.txt");
verifier.addCliArgument("install");
verifier.execute();

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java
View File

@ -44,7 +44,7 @@ public MavenITmng4207PluginWithLog4JTest() {
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");

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
View File

@ -50,7 +50,7 @@ public MavenITmng4238ArtifactHandlerExtensionUsageTest() {
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);

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java
View File

@ -52,7 +52,7 @@ public MavenITmng4270ArtifactHandlersFromPluginDepsTest() {
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);

6
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java
View File

@ -42,7 +42,7 @@ public MavenITmng4463DependencyManagementImportVersionRanges() {
@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 void testInclusiveUpperBoundResolvesToHighestVersion() throws Exception {
@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 void testExclusiveUpperBoundResolvesToHighestVersion() throws Exception {
@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);

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java
View File

@ -50,7 +50,7 @@ public MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest() {
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");

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java
View File

@ -66,7 +66,7 @@ public MavenITmng4633DualCompilerExecutionsWeaveModeTest() {
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");

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java
View File

@ -44,7 +44,7 @@ public MavenITmng4654ArtifactHandlerForMainArtifactTest() {
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");

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java
View File

@ -45,7 +45,7 @@ public MavenITmng4776ForkedReactorPluginVersionResolutionTest() {
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 void testitLifecycle() throws Exception {
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");

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java
View File

@ -47,7 +47,7 @@ public void testJsr330PluginExecution() throws Exception {
//
// 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 void testJsr330PluginExecution() throws Exception {
//
// 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();

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java
View File

@ -42,7 +42,7 @@ public void setUp() throws Exception {
@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");

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java
View File

@ -38,13 +38,13 @@ public void testit() throws Exception {
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();

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java
View File

@ -63,7 +63,7 @@ public void testPluginSite() throws IOException, VerificationException {
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");

14
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java
View File

@ -37,13 +37,13 @@ public void test_copyfiles() throws Exception {
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 void test_copyfiles_multithreaded() throws Exception {
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 void testExtension() throws Exception {
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");

18
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java
View File

@ -37,13 +37,13 @@ public void testBasic() throws Exception {
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 void testBasic_multithreaded() throws Exception {
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 void testBasic_buildExtension() throws Exception {
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 void testExtension() throws Exception {
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");

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java
View File

@ -58,7 +58,7 @@ public void testCustomLifecycle() throws Exception {
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);

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java
View File

@ -45,13 +45,13 @@ public void testWorkspaceReader() throws Exception {
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");

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java
View File

@ -41,13 +41,13 @@ public void testBuildExtensionClassloader() throws Exception {
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();

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java
View File

@ -42,7 +42,7 @@ public void testCustomMojoExecutionConfigurator() throws Exception {
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 void testCustomMojoExecutionConfigurator() throws Exception {
configurationFile.delete();
// build the test project
verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
verifier = newVerifier(projectDir.getAbsolutePath());
verifier.addCliArgument("validate");
verifier.execute();
verifier.verifyErrorFreeLog();

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java
View File

@ -35,12 +35,12 @@ public MavenITmng5783PluginDependencyFiltering() {
@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();

8
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java
View File

@ -32,12 +32,12 @@ public MavenITmng5840ParentVersionRanges() {
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 void testParentRangeRelativePathPointsToWrongVersion() throws Exception {
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();

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java
View File

@ -32,12 +32,12 @@ public MavenITmng5840RelativePathReactorMatching() {
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();

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java
View File

@ -41,7 +41,7 @@ public void testitMNG5935() throws Exception {
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");

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java
View File

@ -45,7 +45,7 @@ public void testJsr250PluginExecution() throws Exception {
//
// 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 void testJsr250PluginExecution() throws Exception {
//
// 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();

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java
View File

@ -45,7 +45,7 @@ public void testCustomMojoExecutionConfigurator() throws Exception {
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 void testCustomMojoExecutionConfigurator() throws Exception {
modCconfigurationFile.delete();
// build the test project
verifier = newVerifier(projectDir.getAbsolutePath(), "remote");
verifier = newVerifier(projectDir.getAbsolutePath());
verifier.addCliArgument("verify");
verifier.addCliArgument("-X");
verifier.execute();

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java
View File

@ -55,13 +55,13 @@ public void testPluginExtensionDependingOnMavenAetherProvider() throws Exception
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();

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java
View File

@ -37,12 +37,12 @@ public void testGetPackageAnnotation() throws Exception {
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();

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java
View File

@ -42,7 +42,7 @@ public void setUp() throws Exception {
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();

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7310LifecycleActivatedInSpecifiedModuleTest.java
View File

@ -41,7 +41,7 @@ public void testItShouldNotLoadAnExtensionInASiblingSubmodule() throws Exception
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();

190
its/core-it-suite/src/test/resources-filtered/bootstrap.txt
View File

@ -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

38
its/core-it-suite/src/test/resources/bootstrap/bootstrap/pom.xml
View File

@ -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>

33
its/core-it-suite/src/test/resources/bootstrap/packaging-jar/pom.xml
View File

@ -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>

33
its/core-it-suite/src/test/resources/bootstrap/packaging-maven-plugin/pom.xml
View File

@ -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>

33
its/core-it-suite/src/test/resources/bootstrap/packaging-war/pom.xml
View File

@ -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>

7
its/core-it-suite/src/test/resources/bootstrap/pom.xml
View File

@ -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 -->

2
its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
View File

@ -248,7 +248,7 @@ protected Verifier newVerifier(String basedir, String settings) throws Verificat
}
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 {