You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2024/05/03 10:04:20 UTC
(maven-invoker-plugin) branch master updated: [MINVOKER-336] Create empty .mvn directory in cloned projects
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 66a536f [MINVOKER-336] Create empty .mvn directory in cloned projects
66a536f is described below
commit 66a536f3ba1e94b2cbb40cfb23c60d2b067f628c
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Thu May 2 20:18:43 2024 +0200
[MINVOKER-336] Create empty .mvn directory in cloned projects
---
src/it/clone-clean/{verify.bsh => setup.groovy} | 16 +++++--------
src/it/clone-clean/{setup.bsh => verify.groovy} | 16 ++++---------
.../maven/plugins/invoker/AbstractInvokerMojo.java | 26 ++++++++++++++++++++++
3 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/src/it/clone-clean/verify.bsh b/src/it/clone-clean/setup.groovy
similarity index 79%
rename from src/it/clone-clean/verify.bsh
rename to src/it/clone-clean/setup.groovy
index f2ece44..02466de 100644
--- a/src/it/clone-clean/verify.bsh
+++ b/src/it/clone-clean/setup.groovy
@@ -17,15 +17,9 @@
* under the License.
*/
-import java.io.*;
+File itRoot = new File(basedir, "target/it/clone-clean")
+itRoot.mkdirs()
+assert new File(itRoot, "foobar.log").createNewFile()
+
+assert !new File(basedir, 'src/it/clone-clean/.mvn').exists()
-try
-{
- File itRoot = new File( basedir, "target/it/clone-clean" );
- return !new File( itRoot, "foobar.log" ).exists();
-}
-catch( Throwable t )
-{
- t.printStackTrace();
- return false;
-}
diff --git a/src/it/clone-clean/setup.bsh b/src/it/clone-clean/verify.groovy
similarity index 77%
rename from src/it/clone-clean/setup.bsh
rename to src/it/clone-clean/verify.groovy
index b0296e2..9bb1d43 100644
--- a/src/it/clone-clean/setup.bsh
+++ b/src/it/clone-clean/verify.groovy
@@ -17,16 +17,8 @@
* under the License.
*/
-import java.io.*;
-try
-{
- File itRoot = new File( basedir, "target/it/clone-clean" );
- itRoot.mkdirs();
- return new File(itRoot, "foobar.log").createNewFile();
-}
-catch( Throwable t )
-{
- t.printStackTrace();
- return false;
-}
+File itRoot = new File(basedir, "target/it/clone-clean")
+assert !new File(itRoot, "foobar.log").exists()
+// .mnv will be created
+assert new File(itRoot, ".mvn").isDirectory()
diff --git a/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java b/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java
index 70ca4fe..3c454b2 100644
--- a/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java
+++ b/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java
@@ -820,6 +820,7 @@ public abstract class AbstractInvokerMojo extends AbstractMojo {
if (cloneProjectsTo != null) {
cloneProjects(collectedProjects);
+ addMissingDotMvnDirectory(cloneProjectsTo, buildJobs);
projectsDir = cloneProjectsTo;
} else {
getLog().warn("Filtering of parent/child POMs is not supported without cloning the projects");
@@ -856,6 +857,31 @@ public abstract class AbstractInvokerMojo extends AbstractMojo {
processResults(new InvokerSession(buildJobs));
}
+ /**
+ * We need add missing {@code .mnvn} directories for executing projects
+ *
+ * @param projectsDir base of projects
+ * @param buildJobs list of discovered jobs
+ */
+ private void addMissingDotMvnDirectory(File projectsDir, List<BuildJob> buildJobs) throws MojoExecutionException {
+ for (BuildJob buildJob : buildJobs) {
+ Path projectPath = projectsDir.toPath().resolve(buildJob.getProject());
+
+ if (Files.isRegularFile(projectPath)) {
+ projectPath = projectPath.getParent();
+ }
+
+ Path mvnDotPath = projectPath.resolve(".mvn");
+ if (!Files.exists(mvnDotPath)) {
+ try {
+ Files.createDirectories(mvnDotPath);
+ } catch (IOException e) {
+ throw new MojoExecutionException(e.getMessage(), e);
+ }
+ }
+ }
+ }
+
private void setupActualMavenVersion() throws MojoExecutionException {
if (mavenHome != null) {
try {