From f7f55c1a1dbd4f4a1f37aa59b808424eb9d6ec93 Mon Sep 17 00:00:00 2001 From: Nikolas Grottendieck Date: Fri, 15 Aug 2025 15:49:17 +0200 Subject: [PATCH] Add additional locations for auto-discovery to scan Resolves #129 --- .../plugins/toolchain/jdk/ToolchainDiscoverer.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/org/apache/maven/plugins/toolchain/jdk/ToolchainDiscoverer.java b/src/main/java/org/apache/maven/plugins/toolchain/jdk/ToolchainDiscoverer.java index 19199a5..b4facf9 100644 --- a/src/main/java/org/apache/maven/plugins/toolchain/jdk/ToolchainDiscoverer.java +++ b/src/main/java/org/apache/maven/plugins/toolchain/jdk/ToolchainDiscoverer.java @@ -428,6 +428,11 @@ private Set doFindJdks() { installedDirs.add(userHome.resolve(".jbang").resolve("cache").resolve("jdks")); installedDirs.add(userHome.resolve(".asdf").resolve("installs")); installedDirs.add(userHome.resolve(".jabba").resolve("jdk")); + installedDirs.add(userHome.resolve(".local") + .resolve("share") + .resolve("mise") + .resolve("installs") + .resolve("java")); // OS related directories String osname = System.getProperty("os.name").toLowerCase(Locale.ROOT); @@ -436,8 +441,10 @@ private Set doFindJdks() { if (macos) { installedDirs.add(Paths.get("/Library/Java/JavaVirtualMachines")); installedDirs.add(userHome.resolve("Library/Java/JavaVirtualMachines")); + installedDirs.add(userHome.resolve("hostedtoolcache")); } else if (win) { installedDirs.add(Paths.get("C:\\Program Files\\Java\\")); + installedDirs.add(Paths.get("C:\\hostedtoolcache\\windows\\")); Path scoop = userHome.resolve("scoop").resolve("apps"); if (Files.isDirectory(scoop)) { try (Stream stream = Files.list(scoop)) { @@ -449,8 +456,11 @@ private Set doFindJdks() { } else { installedDirs.add(Paths.get("/usr/jdk")); installedDirs.add(Paths.get("/usr/java")); + installedDirs.add(Paths.get("/usr/local/java")); installedDirs.add(Paths.get("/opt/java")); + installedDirs.add(Paths.get("/opt/hostedtoolcache")); installedDirs.add(Paths.get("/usr/lib/jvm")); + installedDirs.add(Paths.get("/usr/lib64/jvm")); } for (Path dest : installedDirs) {