[AB]: Add option to specify maven settings.xml

Author: janinko

experimental/src/main/java/org/jboss/bacon/experimental/impl/config/DependencyResolutionConfig.java

@@ -1,5 +1,6 @@
 package org.jboss.bacon.experimental.impl.config;
 
+import java.nio.file.Path;
 import java.util.List;
 import java.util.Set;
 
@@ -67,4 +68,9 @@ public class DependencyResolutionConfig {
      * suffix). This is useful to make sure whole dependency tree is build correctly.
      */
     private boolean rebuildNonAutoBuilds = false;
+
+    /**
+     * Path to the maven settings.xml file to use instead of the system one.
+     */
+    private Path mavenSettings;
 }

experimental/src/main/java/org/jboss/bacon/experimental/impl/dependencies/DependencyResolver.java

@@ -31,6 +31,8 @@
 import io.quarkus.bom.decomposer.ReleaseId;
 import io.quarkus.bom.decomposer.ReleaseOrigin;
 import io.quarkus.bom.decomposer.ReleaseVersion;
+import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext;
+import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContextConfig;
 import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException;
 import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
 import io.quarkus.devtools.messagewriter.MessageWriter;
@@ -91,6 +93,16 @@ private void setupConfig(ProjectDependencyConfig.Mutable dominoConfig) {
     }
 
     public DependencyResult resolve(Path projectDir, Path dominoConfigFile) {
+        ProjectDependencyResolver resolver = configureResolver(projectDir, dominoConfigFile);
+
+        PrintStream origOut = System.out;
+        System.setOut(new PrintStream(new LogOutputStream()));
+        ReleaseCollection releaseCollection = resolver.getReleaseCollection();
+        System.setOut(origOut);
+        return parseReleaseCollection(releaseCollection);
+    }
+
+    private ProjectDependencyResolver configureResolver(Path projectDir, Path dominoConfigFile) {
         ProjectDependencyConfig.Mutable dominoConfig;
         if (dominoConfigFile == null) {
             dominoConfig = ProjectDependencyConfig.builder();
@@ -102,21 +114,19 @@ public DependencyResult resolve(Path projectDir, Path dominoConfigFile) {
             }
         }
         ProjectDependencyResolver.Builder resolverBuilder = ProjectDependencyResolver.builder();
+        if (config.getMavenSettings() != null) {
+            resolverBuilder.setUserMavenSettings(config.getMavenSettings());
+        }
         if (projectDir != null) {
             dominoConfig.setProjectDir(projectDir);
             resolverBuilder.setArtifactResolver(getArtifactResolver(projectDir));
         }
         setupConfig(dominoConfig);
         ProjectDependencyConfig conf = dominoConfig.build();
         logDominoConfig(conf);
-        ProjectDependencyResolver resolver = resolverBuilder.setMessageWriter(new Slf4jMessageWriter())
+        return resolverBuilder.setMessageWriter(new Slf4jMessageWriter())
                 .setDependencyConfig(conf)
                 .build();
-        PrintStream origOut = System.out;
-        System.setOut(new PrintStream(new LogOutputStream()));
-        ReleaseCollection releaseCollection = resolver.getReleaseCollection();
-        System.setOut(origOut);
-        return parseReleaseCollection(releaseCollection);
     }
 
     private void logDominoConfig(ProjectDependencyConfig conf) {
@@ -132,11 +142,14 @@ private void logDominoConfig(ProjectDependencyConfig conf) {
 
     protected MavenArtifactResolver getArtifactResolver(Path projectDir) {
         try {
-            return MavenArtifactResolver.builder()
+            MavenArtifactResolver.Builder builder = MavenArtifactResolver.builder()
                     .setCurrentProject(projectDir.toAbsolutePath().toString())
                     .setEffectiveModelBuilder(true)
-                    .setPreferPomsFromWorkspace(true)
-                    .build();
+                    .setPreferPomsFromWorkspace(true);
+            if (config.getMavenSettings() != null) {
+                builder.setUserSettings(config.getMavenSettings().toFile());
+            }
+            return builder.build();
         } catch (BootstrapMavenException e) {
             throw new RuntimeException("Failed to initialize Maven artifact resolver", e);
         }

pom.xml

@@ -80,7 +80,7 @@
         <commons-configuration2.version>2.12.0</commons-configuration2.version>
         <commons-io.version>2.19.0</commons-io.version>
         <compiler.plugin.version>3.12.1</compiler.plugin.version>
-        <domino.version>0.0.120</domino.version>
+        <domino.version>0.0.121</domino.version>
         <enforcer.plugin.version>3.5.0</enforcer.plugin.version>
         <glassfish-jaxb.version>2.3.1</glassfish-jaxb.version>
         <glassfish-json.version>1.1.4</glassfish-json.version>