From e9a54c6d0272b79c69ef60195b41c26d331ecef9 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Mon, 19 Jul 2021 23:45:50 +0200 Subject: [PATCH] Use proper term: directory --- apache-maven/src/assembly/shared/init.cmd | 2 +- .../maven/project/collector/MultiModuleCollectionStrategy.java | 2 +- .../maven/project/collector/PomlessCollectionStrategy.java | 2 +- .../projects/project-builder/it0063/jdk/jre/placeholder.txt | 2 +- .../it0063/jdk/jre/placeholder.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apache-maven/src/assembly/shared/init.cmd b/apache-maven/src/assembly/shared/init.cmd index 14ec5ba155..ef1e8ec86c 100755 --- a/apache-maven/src/assembly/shared/init.cmd +++ b/apache-maven/src/assembly/shared/init.cmd @@ -4,7 +4,7 @@ set MAVEN_CMD_LINE_ARGS=%* -@REM Find the project basedir, i.e., the directory that contains the folder ".mvn". +@REM Find the project basedir, i.e., the directory that contains the directory ".mvn". @REM Fallback to current working directory if not found. set "MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%" diff --git a/maven-core/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java b/maven-core/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java index 4d4413ebb4..30e77223ae 100644 --- a/maven-core/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java +++ b/maven-core/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java @@ -77,7 +77,7 @@ public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy else { LOGGER.debug( "Multi module project collection failed:{}" - + "Detected a POM file next to a .mvn folder in a parent directory ({}). " + + "Detected a POM file next to a .mvn directory in a parent directory ({}). " + "Maven assumed that POM file to be the parent of the requested project ({}), but it turned " + "out that it was not. Another project collection strategy will be executed as result.", System.lineSeparator(), moduleProjectPomFile.getAbsolutePath(), diff --git a/maven-core/src/main/java/org/apache/maven/project/collector/PomlessCollectionStrategy.java b/maven-core/src/main/java/org/apache/maven/project/collector/PomlessCollectionStrategy.java index 394743f82b..828485a995 100644 --- a/maven-core/src/main/java/org/apache/maven/project/collector/PomlessCollectionStrategy.java +++ b/maven-core/src/main/java/org/apache/maven/project/collector/PomlessCollectionStrategy.java @@ -35,7 +35,7 @@ import java.util.Arrays; import java.util.List; /** - * Strategy to collect projects for building when the Maven invocation is not in a folder that contains a pom.xml. + * Strategy to collect projects for building when the Maven invocation is not in a directory that contains a pom.xml. */ @Named( "PomlessCollectionStrategy" ) @Singleton diff --git a/maven-core/src/test/projects/project-builder/it0063/jdk/jre/placeholder.txt b/maven-core/src/test/projects/project-builder/it0063/jdk/jre/placeholder.txt index e26e86087c..4a9eb145a1 100644 --- a/maven-core/src/test/projects/project-builder/it0063/jdk/jre/placeholder.txt +++ b/maven-core/src/test/projects/project-builder/it0063/jdk/jre/placeholder.txt @@ -1 +1 @@ -need it so that empty folder does not get deleted \ No newline at end of file +need it so that empty directory does not get deleted diff --git a/maven-core/src/test/projects/project-dependencies-resolver/it0063/jdk/jre/placeholder.txt b/maven-core/src/test/projects/project-dependencies-resolver/it0063/jdk/jre/placeholder.txt index e26e86087c..4a9eb145a1 100644 --- a/maven-core/src/test/projects/project-dependencies-resolver/it0063/jdk/jre/placeholder.txt +++ b/maven-core/src/test/projects/project-dependencies-resolver/it0063/jdk/jre/placeholder.txt @@ -1 +1 @@ -need it so that empty folder does not get deleted \ No newline at end of file +need it so that empty directory does not get deleted