mirror of
https://github.com/apache/maven-mvnd.git
synced 2025-10-17 07:54:20 +00:00
Backport more fixes from mvn40 to mvn39 code
This commit is contained in:

committed by
Guillaume Nodet

parent
6bcb580529
commit
a15abc25df
@@ -185,8 +185,7 @@ public class DaemonMavenCli implements DaemonCli {
|
|||||||
slf4jLogger = slf4jLoggerFactory.getLogger(this.getClass().getName());
|
slf4jLogger = slf4jLoggerFactory.getLogger(this.getClass().getName());
|
||||||
plexusLoggerManager = new Slf4jLoggerManager();
|
plexusLoggerManager = new Slf4jLoggerManager();
|
||||||
|
|
||||||
ClassLoader cl = Thread.currentThread().getContextClassLoader();
|
this.classWorld = ((ClassRealm) Thread.currentThread().getContextClassLoader()).getWorld();
|
||||||
classWorld = new ClassWorld("plexus.core", cl);
|
|
||||||
|
|
||||||
container = container();
|
container = container();
|
||||||
|
|
||||||
@@ -480,6 +479,7 @@ public class DaemonMavenCli implements DaemonCli {
|
|||||||
|
|
||||||
List<File> extClassPath = Stream.of(
|
List<File> extClassPath = Stream.of(
|
||||||
Environment.MVND_EXT_CLASSPATH.asString().split(","))
|
Environment.MVND_EXT_CLASSPATH.asString().split(","))
|
||||||
|
.filter(s -> s != null && !s.isEmpty())
|
||||||
.map(File::new)
|
.map(File::new)
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user