Skip to content

Commit c4834ef

Browse files
gnodetgnodet
authored
Move everything out of bootstrap (#1909)
1 parent 1614226 commit c4834ef

File tree

63 files changed

+124
-455
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+124
-455
lines changed

‎its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public MavenIT0030DepPomDepMgmtInheritanceTest() {
3737
@Test
3838
public void testit0030() throws Exception {
3939
File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/it0030");
40-
Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
40+
Verifier verifier = newVerifier(testDir.getAbsolutePath());
4141
verifier.deleteArtifact("org.apache.maven.it", "maven-it-it0030", "1.0-SNAPSHOT", "jar");
4242
verifier.deleteArtifact("org.apache.maven.it", "maven-it-it0030-child-hierarchy", "1.0-SNAPSHOT", "jar");
4343
verifier.deleteArtifact("org.apache.maven.it", "maven-it-it0030-child-project1", "1.0-SNAPSHOT", "jar");

‎its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public MavenIT0041ArtifactTypeFromPluginExtensionTest() {
4343
public void testit0041() throws Exception {
4444
File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/it0041");
4545

46-
Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
46+
Verifier verifier = newVerifier(testDir.getAbsolutePath());
4747
verifier.setAutoclean(false);
4848
verifier.deleteArtifacts("org.apache.maven", "maven-core-it-support", "1.2");
4949
verifier.addCliArgument("--settings");

‎its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void testitBuildConfigDominantDuringBuild() throws Exception {
6767
public void testitBuildConfigIrrelevantForReports() throws Exception {
6868
File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-0469/test2");
6969

70-
Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
70+
Verifier verifier = newVerifier(testDir.getAbsolutePath());
7171
verifier.deleteDirectory("target");
7272
verifier.setAutoclean(false);
7373
if (matchesVersionRange("(,3.0-alpha-1)")) {

‎its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public MavenITmng0507ArtifactRelocationTest() {
4646
public void testitMNG507() throws Exception {
4747
File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-0507");
4848

49-
Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
49+
Verifier verifier = newVerifier(testDir.getAbsolutePath());
5050
verifier.setAutoclean(false);
5151
verifier.deleteDirectory("target");
5252
verifier.deleteArtifacts("org.apache.maven", "maven-core-it-support", "1.1");

‎its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public MavenITmng2135PluginBuildInReactorTest() {
4343
public void testit() throws Exception {
4444
File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-2135");
4545

46-
Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
46+
Verifier verifier = newVerifier(testDir.getAbsolutePath());
4747
verifier.setAutoclean(false);
4848
verifier.deleteDirectory("plugin/target");
4949
verifier.deleteDirectory("project/target");

‎its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void testValidParentVersionRangeWithInclusiveUpperBound() throws Exceptio
4343
File testDir = ResourceExtractor.simpleExtractResources(
4444
getClass(), "/mng-2199-parent-version-range/valid-inclusive-upper-bound");
4545

46-
verifier = newVerifier(testDir.getAbsolutePath(), "remote");
46+
verifier = newVerifier(testDir.getAbsolutePath());
4747
verifier.addCliArgument("-U");
4848
verifier.setAutoclean(false);
4949
verifier.addCliArgument("verify");
@@ -64,7 +64,7 @@ public void testValidParentVersionRangeWithExclusiveUpperBound() throws Exceptio
6464
File testDir = ResourceExtractor.simpleExtractResources(
6565
getClass(), "/mng-2199-parent-version-range/valid-exclusive-upper-bound");
6666

67-
verifier = newVerifier(testDir.getAbsolutePath(), "remote");
67+
verifier = newVerifier(testDir.getAbsolutePath());
6868
verifier.addCliArgument("-U");
6969
verifier.setAutoclean(false);
7070
verifier.addCliArgument("verify");
@@ -84,7 +84,7 @@ public void testInvalidParentVersionRangeWithoutUpperBound() throws Exception {
8484
File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-2199-parent-version-range/invalid");
8585

8686
try {
87-
verifier = newVerifier(testDir.getAbsolutePath(), "remote");
87+
verifier = newVerifier(testDir.getAbsolutePath());
8888
verifier.setAutoclean(false);
8989
verifier.addCliArgument("-U");
9090
verifier.addCliArgument("verify");
@@ -106,7 +106,7 @@ public void testValidParentVersionRangeInvalidVersionExpression() throws Excepti
106106
ResourceExtractor.simpleExtractResources(getClass(), "/mng-2199-parent-version-range/expression");
107107

108108
try {
109-
verifier = newVerifier(testDir.getAbsolutePath(), "remote");
109+
verifier = newVerifier(testDir.getAbsolutePath());
110110
verifier.setAutoclean(false);
111111
verifier.addCliArgument("-U");
112112
verifier.addCliArgument("verify");
@@ -126,7 +126,7 @@ public void testValidParentVersionRangeInvalidVersionInheritance() throws Except
126126
File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-2199-parent-version-range/inherited");
127127

128128
try {
129-
verifier = newVerifier(testDir.getAbsolutePath(), "remote");
129+
verifier = newVerifier(testDir.getAbsolutePath());
130130
verifier.setAutoclean(false);
131131
verifier.addCliArgument("-U");
132132
verifier.addCliArgument("verify");
@@ -190,7 +190,7 @@ public void testInvalidLocalParentVersionRangeFallingBackToRemote() throws Excep
190190
File testDir = ResourceExtractor.simpleExtractResources(
191191
getClass(), "/mng-2199-parent-version-range/local-fallback-to-remote/child");
192192

193-
verifier = newVerifier(testDir.getAbsolutePath(), "remote");
193+
verifier = newVerifier(testDir.getAbsolutePath());
194194
verifier.addCliArgument("verify");
195195
verifier.execute();
196196
verifier.verifyErrorFreeLog();

‎its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ public void testitMNG3259() throws Exception {
4444

4545
Verifier verifier;
4646

47-
verifier = newVerifier(new File(testDir, "parent").getAbsolutePath(), "remote");
47+
verifier = newVerifier(new File(testDir, "parent").getAbsolutePath());
4848

4949
verifier.addCliArgument("install");
5050
verifier.execute();
5151

5252
verifier.verifyErrorFreeLog();
5353

54-
verifier = newVerifier(testDir.getAbsolutePath(), "remote");
54+
verifier = newVerifier(testDir.getAbsolutePath());
5555

5656
verifier.addCliArgument("install");
5757
verifier.execute();

‎its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void testMultipleProfileParams() throws Exception {
4040

4141
Verifier verifier;
4242

43-
verifier = newVerifier(testDir.getAbsolutePath(), "remote");
43+
verifier = newVerifier(testDir.getAbsolutePath());
4444

4545
verifier.addCliArgument("-Pprofile1,profile2");
4646
verifier.addCliArgument("-Pprofile3");

‎its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void testitMNG3372() throws Exception {
4343
File project = new File(testBaseDir, "project");
4444
File settingsFile = new File(testBaseDir, "settings.xml");
4545

46-
Verifier verifier = newVerifier(plugin.getAbsolutePath(), "remote");
46+
Verifier verifier = newVerifier(plugin.getAbsolutePath());
4747

4848
verifier.deleteArtifacts("org.apache.maven.its.mng3372");
4949

@@ -69,7 +69,7 @@ public void testDependencyTreeInvocation() throws Exception {
6969
// file.
7070
File testBaseDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-3372/dependency-tree");
7171

72-
Verifier verifier = newVerifier(testBaseDir.getAbsolutePath(), "remote");
72+
Verifier verifier = newVerifier(testBaseDir.getAbsolutePath());
7373

7474
verifier.addCliArgument("-U");
7575

‎its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void testitMNG3396() throws Exception {
4040
String baseDir = "/mng-3396";
4141
File testDir = ResourceExtractor.simpleExtractResources(getClass(), baseDir + "/dependencies");
4242

43-
Verifier verifier = newVerifier(testDir.getAbsolutePath(), "remote");
43+
Verifier verifier = newVerifier(testDir.getAbsolutePath());
4444
verifier.deleteArtifact(GROUP_ID, "A", "1.0", "pom");
4545
verifier.deleteArtifact(GROUP_ID, "A", "1.0", "jar");
4646
verifier.deleteArtifact(GROUP_ID, "B", "1.0", "pom");
@@ -51,7 +51,7 @@ public void testitMNG3396() throws Exception {
5151

5252
testDir = ResourceExtractor.simpleExtractResources(getClass(), baseDir + "/plugin");
5353

54-
verifier = newVerifier(testDir.getAbsolutePath(), "remote");
54+
verifier = newVerifier(testDir.getAbsolutePath());
5555
verifier.deleteArtifact(GROUP_ID, "A", "1.0", "pom");
5656
verifier.deleteArtifact(GROUP_ID, "A", "1.0", "jar");
5757
verifier.deleteArtifact(GROUP_ID, "A", "3.0", "pom");
@@ -64,7 +64,7 @@ public void testitMNG3396() throws Exception {
6464

6565
testDir = ResourceExtractor.simpleExtractResources(getClass(), baseDir + "/pluginuser");
6666

67-
verifier = newVerifier(testDir.getAbsolutePath(), "remote");
67+
verifier = newVerifier(testDir.getAbsolutePath());
6868
verifier.deleteArtifact(GROUP_ID, "pluginuser", "1.0", "pom");
6969
verifier.deleteArtifact(GROUP_ID, "pluginuser", "1.0", "jar");
7070
verifier.addCliArgument("install");

0 commit comments

Comments
 (0)