From a15abc25dfea50cf1479307a2ac0af2db7730f68 Mon Sep 17 00:00:00 2001 From: Stefan Oehme Date: Thu, 30 Mar 2023 14:18:13 +0200 Subject: [PATCH] Backport more fixes from mvn40 to mvn39 code --- .../src/main/java/org/apache/maven/cli/DaemonMavenCli.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon-m39/src/main/java/org/apache/maven/cli/DaemonMavenCli.java b/daemon-m39/src/main/java/org/apache/maven/cli/DaemonMavenCli.java index 90de0749..ebc4dba0 100644 --- a/daemon-m39/src/main/java/org/apache/maven/cli/DaemonMavenCli.java +++ b/daemon-m39/src/main/java/org/apache/maven/cli/DaemonMavenCli.java @@ -185,8 +185,7 @@ public class DaemonMavenCli implements DaemonCli { slf4jLogger = slf4jLoggerFactory.getLogger(this.getClass().getName()); plexusLoggerManager = new Slf4jLoggerManager(); - ClassLoader cl = Thread.currentThread().getContextClassLoader(); - classWorld = new ClassWorld("plexus.core", cl); + this.classWorld = ((ClassRealm) Thread.currentThread().getContextClassLoader()).getWorld(); container = container(); @@ -480,6 +479,7 @@ public class DaemonMavenCli implements DaemonCli { List extClassPath = Stream.of( Environment.MVND_EXT_CLASSPATH.asString().split(",")) + .filter(s -> s != null && !s.isEmpty()) .map(File::new) .collect(Collectors.toList());