apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-09-28 08:47:29 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Re-layout the distro so that mvn is not in bin #91

Browse Source
This commit is contained in:
Peter Palaga
2020-10-16 15:41:07 +02:00
parent 4ae7d3ad11
commit 56d5643ff8
12 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/main/java/org/jboss/fuse/mvnd/common/ServerMain.java
View File

@@ -26,11 +26,11 @@ public class ServerMain {
public static void main(String[] args) throws Exception {
final String uidStr = Environment.DAEMON_UID.systemProperty().orFail().asString();
final Path mavenHome = Environment.MVND_HOME.systemProperty().orFail().asPath();
final Path mvndHome = Environment.MVND_HOME.systemProperty().orFail().asPath();
URL[] classpath = Stream.concat(
/* jars */
Stream.of("lib/ext", "lib", "boot")
.map(mavenHome::resolve)
Stream.of("mvn/lib/ext", "mvn/lib", "mvn/boot")
.map(mvndHome::resolve)
.flatMap((Path p) -> {
try {
return Files.list(p);
@@ -41,7 +41,7 @@ public class ServerMain {
.filter(p -> p.getFileName().toString().endsWith(".jar"))
.filter(Files::isRegularFile),
/* resources */
Stream.of(mavenHome.resolve("conf"), mavenHome.resolve("conf/logging")))
Stream.of(mvndHome.resolve("mvn/conf"), mvndHome.resolve("mvn/conf/logging")))
.map(Path::normalize)
.map(Path::toUri)