Workaround for MNG-7673

client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java

@@ -339,7 +339,8 @@ public class DaemonConnector {
         final Path mvndHome = parameters.mvndHome();
         final Path workingDir = parameters.userDir();
         String command = "";
-        try (DirectoryStream<Path> jarPaths = Files.newDirectoryStream(mvndHome.resolve("lib"))) {
+        try (DirectoryStream<Path> jarPaths =
+                Files.newDirectoryStream(mvndHome.resolve("lib").resolve("ext"))) {
             List<String> args = new ArrayList<>();
             // executable
             final String java = Os.current().isUnixLike() ? "bin/java" : "bin\\java.exe";

daemon/src/main/java/org/apache/maven/settings/SettingsUtilsV4.java

@@ -0,0 +1,300 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.settings;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.maven.api.model.ActivationFile;
+import org.apache.maven.api.settings.Activation;
+import org.apache.maven.api.settings.ActivationOS;
+import org.apache.maven.api.settings.ActivationProperty;
+import org.apache.maven.api.settings.Profile;
+import org.apache.maven.api.settings.Repository;
+import org.apache.maven.api.settings.RepositoryPolicy;
+import org.apache.maven.api.settings.Settings;
+import org.apache.maven.settings.v4.SettingsMerger;
+
+/**
+ * Several convenience methods to handle settings
+ *
+ * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
+ */
+public final class SettingsUtilsV4 {
+
+    private SettingsUtilsV4() {
+        // don't allow construction.
+    }
+
+    /**
+     * @param dominant
+     * @param recessive
+     */
+    public static Settings merge(Settings dominant, Settings recessive) {
+        return new SettingsMerger().merge(dominant, recessive, true, Collections.emptyMap());
+    }
+
+    /**
+     * @param modelProfile
+     * @return a profile
+     */
+    public static Profile convertToSettingsProfile(org.apache.maven.api.model.Profile modelProfile) {
+        Profile.Builder profile = Profile.newBuilder();
+
+        profile.id(modelProfile.getId());
+
+        org.apache.maven.api.model.Activation modelActivation = modelProfile.getActivation();
+
+        if (modelActivation != null) {
+            Activation.Builder activation = Activation.newBuilder();
+
+            activation.activeByDefault(modelActivation.isActiveByDefault());
+
+            activation.jdk(modelActivation.getJdk());
+
+            org.apache.maven.api.model.ActivationProperty modelProp = modelActivation.getProperty();
+
+            if (modelProp != null) {
+                ActivationProperty prop = ActivationProperty.newBuilder()
+                        .name(modelProp.getName())
+                        .value(modelProp.getValue())
+                        .build();
+                activation.property(prop);
+            }
+
+            org.apache.maven.api.model.ActivationOS modelOs = modelActivation.getOs();
+
+            if (modelOs != null) {
+                ActivationOS os = ActivationOS.newBuilder()
+                        .arch(modelOs.getArch())
+                        .family(modelOs.getFamily())
+                        .name(modelOs.getName())
+                        .version(modelOs.getVersion())
+                        .build();
+
+                activation.os(os);
+            }
+
+            ActivationFile modelFile = modelActivation.getFile();
+
+            if (modelFile != null) {
+                org.apache.maven.api.settings.ActivationFile file =
+                        org.apache.maven.api.settings.ActivationFile.newBuilder()
+                                .exists(modelFile.getExists())
+                                .missing(modelFile.getMissing())
+                                .build();
+
+                activation.file(file);
+            }
+
+            profile.activation(activation.build());
+        }
+
+        profile.properties(modelProfile.getProperties().entrySet().stream()
+                .collect(Collectors.toMap(
+                        e -> e.getKey().toString(), e -> e.getValue().toString())));
+
+        List<org.apache.maven.api.model.Repository> repos = modelProfile.getRepositories();
+        if (repos != null) {
+            List<Repository> repositories = new ArrayList<>();
+            for (org.apache.maven.api.model.Repository repo : repos) {
+                repositories.add(convertToSettingsRepository(repo));
+            }
+            profile.repositories(repositories);
+        }
+
+        List<org.apache.maven.api.model.Repository> pluginRepos = modelProfile.getPluginRepositories();
+        if (pluginRepos != null) {
+            List<Repository> repositories = new ArrayList<>();
+            for (org.apache.maven.api.model.Repository pluginRepo : pluginRepos) {
+                repositories.add(convertToSettingsRepository(pluginRepo));
+            }
+            profile.pluginRepositories(repositories);
+        }
+
+        return profile.build();
+    }
+
+    /**
+     * @param settingsProfile
+     * @return a profile
+     */
+    public static org.apache.maven.api.model.Profile convertFromSettingsProfile(Profile settingsProfile) {
+        org.apache.maven.api.model.Profile.Builder profile = org.apache.maven.api.model.Profile.newBuilder();
+
+        profile.id(settingsProfile.getId());
+
+        Activation settingsActivation = settingsProfile.getActivation();
+
+        if (settingsActivation != null) {
+            org.apache.maven.api.model.Activation.Builder activation =
+                    org.apache.maven.api.model.Activation.newBuilder();
+
+            activation.activeByDefault(settingsActivation.isActiveByDefault());
+
+            activation.jdk(settingsActivation.getJdk());
+
+            ActivationProperty settingsProp = settingsActivation.getProperty();
+            if (settingsProp != null) {
+                activation.property(org.apache.maven.api.model.ActivationProperty.newBuilder()
+                        .name(settingsProp.getName())
+                        .value(settingsProp.getValue())
+                        .build());
+            }
+
+            ActivationOS settingsOs = settingsActivation.getOs();
+            if (settingsOs != null) {
+                activation.os(org.apache.maven.api.model.ActivationOS.newBuilder()
+                        .arch(settingsOs.getArch())
+                        .family(settingsOs.getFamily())
+                        .name(settingsOs.getName())
+                        .version(settingsOs.getVersion())
+                        .build());
+            }
+
+            org.apache.maven.api.settings.ActivationFile settingsFile = settingsActivation.getFile();
+            if (settingsFile != null) {
+                activation.file(ActivationFile.newBuilder()
+                        .exists(settingsFile.getExists())
+                        .missing(settingsFile.getMissing())
+                        .build());
+            }
+
+            profile.activation(activation.build());
+        }
+
+        profile.properties(settingsProfile.getProperties());
+
+        List<Repository> repos = settingsProfile.getRepositories();
+        if (repos != null) {
+            profile.repositories(repos.stream()
+                    .map(SettingsUtilsV4::convertFromSettingsRepository)
+                    .collect(Collectors.toList()));
+        }
+
+        List<Repository> pluginRepos = settingsProfile.getPluginRepositories();
+        if (pluginRepos != null) {
+            profile.pluginRepositories(pluginRepos.stream()
+                    .map(SettingsUtilsV4::convertFromSettingsRepository)
+                    .collect(Collectors.toList()));
+        }
+
+        org.apache.maven.api.model.Profile value = profile.build();
+        value.setSource("settings.xml");
+        return value;
+    }
+
+    /**
+     * @param settingsRepo
+     * @return a repository
+     */
+    private static org.apache.maven.api.model.Repository convertFromSettingsRepository(Repository settingsRepo) {
+        org.apache.maven.api.model.Repository.Builder repo = org.apache.maven.api.model.Repository.newBuilder();
+
+        repo.id(settingsRepo.getId());
+        repo.layout(settingsRepo.getLayout());
+        repo.name(settingsRepo.getName());
+        repo.url(settingsRepo.getUrl());
+
+        if (settingsRepo.getSnapshots() != null) {
+            repo.snapshots(convertRepositoryPolicy(settingsRepo.getSnapshots()));
+        }
+        if (settingsRepo.getReleases() != null) {
+            repo.releases(convertRepositoryPolicy(settingsRepo.getReleases()));
+        }
+
+        return repo.build();
+    }
+
+    /**
+     * @param settingsPolicy
+     * @return a RepositoryPolicy
+     */
+    private static org.apache.maven.api.model.RepositoryPolicy convertRepositoryPolicy(
+            RepositoryPolicy settingsPolicy) {
+        org.apache.maven.api.model.RepositoryPolicy policy = org.apache.maven.api.model.RepositoryPolicy.newBuilder()
+                .enabled(Boolean.toString(settingsPolicy.isEnabled()))
+                .updatePolicy(settingsPolicy.getUpdatePolicy())
+                .checksumPolicy(settingsPolicy.getChecksumPolicy())
+                .build();
+        return policy;
+    }
+
+    /**
+     * @param modelRepo
+     * @return a repository
+     */
+    private static Repository convertToSettingsRepository(org.apache.maven.api.model.Repository modelRepo) {
+        Repository repo = Repository.newBuilder()
+                .id(modelRepo.getId())
+                .layout(modelRepo.getLayout())
+                .name(modelRepo.getName())
+                .url(modelRepo.getUrl())
+                .snapshots(modelRepo.getSnapshots() != null ? convertRepositoryPolicy(modelRepo.getSnapshots()) : null)
+                .releases(modelRepo.getReleases() != null ? convertRepositoryPolicy(modelRepo.getReleases()) : null)
+                .build();
+
+        return repo;
+    }
+
+    /**
+     * @param modelPolicy
+     * @return a RepositoryPolicy
+     */
+    private static RepositoryPolicy convertRepositoryPolicy(org.apache.maven.api.model.RepositoryPolicy modelPolicy) {
+        RepositoryPolicy policy = RepositoryPolicy.newBuilder()
+                .enabled(modelPolicy.isEnabled())
+                .updatePolicy(modelPolicy.getUpdatePolicy())
+                .checksumPolicy(modelPolicy.getChecksumPolicy())
+                .build();
+        return policy;
+    }
+
+    /**
+     * @param settings could be null
+     * @return a new instance of settings or null if settings was null.
+     */
+    public static org.apache.maven.settings.Settings copySettings(org.apache.maven.settings.Settings settings) {
+        if (settings == null) {
+            return null;
+        }
+        return new org.apache.maven.settings.Settings(settings.getDelegate());
+    }
+}

dist/src/main/provisio/maven-distro.xml

@@ -33,7 +33,7 @@
         </artifact>
     </artifactSet>
 
-    <artifactSet to="/lib">
+    <artifactSet to="/lib/ext">
         <artifact id="org.apache.maven.daemon:mvnd-daemon:${project.version}">
             <exclusion id="*:*"/>
         </artifact>
@@ -52,9 +52,6 @@
         <artifact id="org.apache.maven.daemon:mvnd-native:${project.version}">
             <exclusion id="*:*"/>
         </artifact>
-        <artifact id="ch.qos.logback:logback-classic">
-            <exclusion id="*:*"/>
-        </artifact>
         <artifact id="org.codehaus.plexus:plexus-interactivity-api">
             <exclusion id="*:*"/>
         </artifact>