Skip to content

Commit df2ecab

Browse files
Okeanosslawekjaranowski
authored andcommitted
Add additional locations for auto-discovery to scan
Resolves #129
1 parent 572a8c2 commit df2ecab

1 file changed

Lines changed: 10 additions & 0 deletions

File tree

src/main/java/org/apache/maven/plugins/toolchain/jdk/ToolchainDiscoverer.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,11 @@ private Set<Path> doFindJdks() {
428428
installedDirs.add(userHome.resolve(".jbang").resolve("cache").resolve("jdks"));
429429
installedDirs.add(userHome.resolve(".asdf").resolve("installs").resolve("java"));
430430
installedDirs.add(userHome.resolve(".jabba").resolve("jdk"));
431+
installedDirs.add(userHome.resolve(".local")
432+
.resolve("share")
433+
.resolve("mise")
434+
.resolve("installs")
435+
.resolve("java"));
431436

432437
// OS related directories
433438
String osname = System.getProperty("os.name").toLowerCase(Locale.ROOT);
@@ -436,8 +441,10 @@ private Set<Path> doFindJdks() {
436441
if (macos) {
437442
installedDirs.add(Paths.get("/Library/Java/JavaVirtualMachines"));
438443
installedDirs.add(userHome.resolve("Library/Java/JavaVirtualMachines"));
444+
installedDirs.add(userHome.resolve("hostedtoolcache"));
439445
} else if (win) {
440446
installedDirs.add(Paths.get("C:\\Program Files\\Java\\"));
447+
installedDirs.add(Paths.get("C:\\hostedtoolcache\\windows\\"));
441448
Path scoop = userHome.resolve("scoop").resolve("apps");
442449
if (Files.isDirectory(scoop)) {
443450
try (Stream<Path> stream = Files.list(scoop)) {
@@ -449,8 +456,11 @@ private Set<Path> doFindJdks() {
449456
} else {
450457
installedDirs.add(Paths.get("/usr/jdk"));
451458
installedDirs.add(Paths.get("/usr/java"));
459+
installedDirs.add(Paths.get("/usr/local/java"));
452460
installedDirs.add(Paths.get("/opt/java"));
461+
installedDirs.add(Paths.get("/opt/hostedtoolcache"));
453462
installedDirs.add(Paths.get("/usr/lib/jvm"));
463+
installedDirs.add(Paths.get("/usr/lib64/jvm"));
454464
}
455465

456466
for (Path dest : installedDirs) {

0 commit comments

Comments
 (0)