You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/12/18 15:36:30 UTC
[maven] branch master updated: Directories, not folders
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new f0364acb2 Directories, not folders
f0364acb2 is described below
commit f0364acb2f547d0c946620ee1718d4b774941fb8
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Dec 18 16:36:16 2022 +0100
Directories, not folders
---
.../src/main/java/org/apache/maven/toolchain/java/JavaToolchain.java | 2 +-
.../main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchain.java b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchain.java
index dec3988ba..23fa8c7e8 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchain.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchain.java
@@ -60,5 +60,5 @@ public interface JavaToolchain extends Toolchain {
// *
// * @return List
// */
- // List getJavadocFolders();
+ // List getJavadocDirectories();
}
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java
index 3ec434510..ccbcb7a02 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java
@@ -60,8 +60,8 @@ class JavaToolchainImpl extends DefaultToolchain implements JavaToolchain {
return null;
}
- private static File findTool(String toolName, File installFolder) {
- File bin = new File(installFolder, "bin"); // NOI18N
+ private static File findTool(String toolName, File installDir) {
+ File bin = new File(installDir, "bin"); // NOI18N
if (bin.exists()) {
boolean isWindows = Os.isFamily("windows"); // NOI18N
if (isWindows) {