This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch maven-4.0.x
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/maven-4.0.x by this push:
new 03e6994399 Fix master ITs (#11371) (#11372)
03e6994399 is described below
commit 03e699439978c016aa34a6f32e4c9c344e5b6a0c
Author: Guillaume Nodet <[email protected]>
AuthorDate: Fri Oct 31 22:05:13 2025 +0100
Fix master ITs (#11371) (#11372)
Fixes to 4.0.x re ITs:
* missing `.mvn` folder and parent from local repo
* rename dangling IT that seems never to run
(cherry picked from commit d5076b7d54308c0497f188256b7fc706b79eef74)
# Conflicts:
#
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITMissingNamespaceTest
#
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITMissingNamespaceTest.java
#
its/core-it-support/core-it-plugins/mng5958-extension/src/main/java/org/apache/maven/its/mng5958/BadLifecycleMapping.java
Co-authored-by: Tamas Cservenak <[email protected]>
---
.../apache/maven/it/MavenITgh11314PluginInjectionTest.java | 11 ++++++++++-
.../resources/gh-11314-v3-mojo-injection/.mvn/.placeholder | 0
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11314PluginInjectionTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11314PluginInjectionTest.java
index 7706241e1c..1064987296 100644
---
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11314PluginInjectionTest.java
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11314PluginInjectionTest.java
@@ -29,12 +29,14 @@
* implementations. Specifically tests the case where a plugin needs to inject
ToolchainFactory
* with a named qualifier.
*
+ * This IT manually manages {@code .mvn} directories, so instructs Verifier to
NOT create any.
+ *
* @see <a
href="https://github.com/apache/maven-toolchains-plugin/issues/128">maven-toolchains-plugin#128</a>
*/
public class MavenITgh11314PluginInjectionTest extends
AbstractMavenIntegrationTestCase {
MavenITgh11314PluginInjectionTest() {
- super("[4.0.0,)");
+ super("(3.0,)");
}
/**
@@ -49,6 +51,13 @@ public class MavenITgh11314PluginInjectionTest extends
AbstractMavenIntegrationT
public void testV3MojoWithMavenContainerInjection() throws Exception {
File testDir = extractResources("/gh-11314-v3-mojo-injection");
+ // Before, build and install the parent POM
+ Verifier parentVerifier = newVerifier(testDir.getAbsolutePath(),
false);
+ parentVerifier.addCliArgument("-N");
+ parentVerifier.addCliArgument("install");
+ parentVerifier.execute();
+ parentVerifier.verifyErrorFreeLog();
+
// First, build and install the test plugin
File pluginDir = new File(testDir, "plugin");
Verifier pluginVerifier = newVerifier(pluginDir.getAbsolutePath(),
false);
diff --git
a/its/core-it-suite/src/test/resources/gh-11314-v3-mojo-injection/.mvn/.placeholder
b/its/core-it-suite/src/test/resources/gh-11314-v3-mojo-injection/.mvn/.placeholder
new file mode 100644
index 0000000000..e69de29bb2