Use proper term: directory

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%"

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(),

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

maven-core/src/test/projects/project-builder/it0063/jdk/jre/placeholder.txt

@@ -1 +1 @@
-need it so that empty folder does not get deleted
+need it so that empty directory does not get deleted

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
+need it so that empty directory does not get deleted