Skip to content

Commit d5076b7

Browse files
authored
Fix master ITs (#11371)
Fixes to master re ITs: * missing `.mvn` folder and parent from local repo * rename dangling IT that seems never to run
1 parent d213b58 commit d5076b7

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

its/core-it-suite/src/test/java/org/apache/maven/it/MavenITMissingNamespaceTest renamed to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITMissingNamespaceTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ public MavenITMissingNamespaceTest() {
3232
*/
3333
@Test
3434
public void testMissingNamespace() throws Exception {
35-
36-
boolean supportSpaceInXml = matchesVersionRange("[3.1.0,)");
37-
3835
File testDir = extractResources("/missing-namespace");
3936
Verifier verifier = newVerifier(testDir.getAbsolutePath());
4037
verifier.setAutoclean(false);

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
* implementations. Specifically tests the case where a plugin needs to inject ToolchainFactory
3030
* with a named qualifier.
3131
*
32+
* This IT manually manages {@code .mvn} directories, so instructs Verifier to NOT create any.
33+
*
3234
* @see <a href="https://github.com/apache/maven-toolchains-plugin/issues/128">maven-toolchains-plugin#128</a>
3335
*/
3436
public class MavenITgh11314PluginInjectionTest extends AbstractMavenIntegrationTestCase {
@@ -45,6 +47,13 @@ public class MavenITgh11314PluginInjectionTest extends AbstractMavenIntegrationT
4547
public void testV3MojoWithMavenContainerInjection() throws Exception {
4648
File testDir = extractResources("/gh-11314-v3-mojo-injection");
4749

50+
// Before, build and install the parent POM
51+
Verifier parentVerifier = newVerifier(testDir.getAbsolutePath(), false);
52+
parentVerifier.addCliArgument("-N");
53+
parentVerifier.addCliArgument("install");
54+
parentVerifier.execute();
55+
parentVerifier.verifyErrorFreeLog();
56+
4857
// First, build and install the test plugin
4958
File pluginDir = new File(testDir, "plugin");
5059
Verifier pluginVerifier = newVerifier(pluginDir.getAbsolutePath(), false);

its/core-it-suite/src/test/resources/gh-11314-v3-mojo-injection/.mvn/.placeholder

Whitespace-only changes.

0 commit comments

Comments
 (0)