Move servers block to deployment step

Author: rnc

deploy/tasks/maven-deployment.yaml

@@ -84,4 +84,3 @@ spec:
         - --mvn-repo=$(params.MVN_REPO)
         - --mvn-username=$(params.MVN_USERNAME)
         - --server-id=$(params.MVN_SERVER_ID)
-      #  - --mvn-settings=/var/workdir/settings/settings.xml

java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/build/preprocessor/AbstractPreprocessor.java

@@ -278,24 +278,7 @@ private String getMavenSetup() {
           </activeProfiles>
 
           <interactiveMode>false</interactiveMode>
-          <!--
-            Needed for Maven 3.9+. Switched to native resolver
-            https://maven.apache.org/guides/mini/guide-resolver-transport.html
-          -->
-          <servers>
-            <server>
-              <id>indy-mvn</id>
-              <configuration>
-                <connectionTimeout>60000</connectionTimeout>
-                <httpHeaders>
-                  <property>
-                    <name>Authorization</name>
-                    <value>Bearer ${ACCESS_TOKEN}</value>
-                  </property>
-                </httpHeaders>
-              </configuration>
-            </server>
-          </servers>
+
           <proxies>
             <proxy>
               <id>indy-http</id>

java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/deploy/DeployCommand.java

@@ -2,6 +2,7 @@
 
 import static org.apache.commons.lang3.ObjectUtils.isNotEmpty;
 
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Optional;
 
@@ -25,6 +26,9 @@ public class DeployCommand implements Runnable {
     @CommandLine.Option(names = "--mvn-username")
     String mvnUser;
 
+    @ConfigProperty(name = "access.token")
+    Optional<String> accessToken;
+
     @ConfigProperty(name = "maven.password")
     Optional<String> mvnPassword;
 
@@ -55,6 +59,38 @@ public void run() {
                 }
                 System.setProperty("maven.settings", mvnSettings);
             }
+            if (isNotEmpty(accessToken)) {
+                String servers = """
+                    <settings>
+                        <!--
+                            Needed for Maven 3.9+. Switched to native resolver
+                            https://maven.apache.org/guides/mini/guide-resolver-transport.html
+                        -->
+                        <servers>
+                            <server>
+                                <id>indy-mvn</id>
+                                <configuration>
+                                    <connectionTimeout>60000</connectionTimeout>
+                                    <httpHeaders>
+                                        <property>
+                                            <name>Authorization</name>
+                                            <value>Bearer ${ACCESS_TOKEN}</value>
+                                        </property>
+                                    </httpHeaders>
+                                </configuration>
+                            </server>
+                        </servers>
+                    </settings>
+                    """;
+                if (isNotEmpty(mvnSettings)) {
+                    // TODO: Would need to merge the two files. NYI for now as I don't think we need this pattern
+                    throw new RuntimeException("Merging settings.xml not supported");
+                } else {
+                    Path settings = Path.of(deploymentPath.getParent().toString(), "settings.xml");
+                    Files.write(settings, servers.getBytes());
+                    System.setProperty("maven.settings", settings.toString());
+                }
+            }
             if (isNotEmpty(mvnRepo)) {
                 // Maven Repo Deployment
                 MavenRepositoryDeployer deployer = new MavenRepositoryDeployer(mvnCtx, mvnUser, mvnPassword.orElse(""), mvnRepo, serverId, deploymentPath);