From 031134accc82cd1afda469322b3994657947b6c4 Mon Sep 17 00:00:00 2001
From: Rodrigo Antunes <contato@rodrigoantunes.com.br>
Date: Thu, 15 Aug 2024 08:59:54 -0300
Subject: [PATCH] Revert "Use default maven settings file for release (#6047)"

This reverts commit 1320d83a40b8a5659c2c2a7cb3e9daf924cce309.
---
 .ci/jenkins/Jenkinsfile.deploy | 42 +++++++++++++++-------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index e0bb64c0a73..b3d950ac957 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -114,32 +114,28 @@ pipeline {
         stage('Deploy drools') {
             steps {
                 script {
-                    def installOrDeploy
-                    if (shouldDeployToRepository()) {
-                        installOrDeploy = 'deploy -DdeployAtEnd -DretryFailedDeploymentCount=5'
-                    } else {
-                        installOrDeploy = 'install'
-                    }
-                    def mavenCommand = getMavenCommand()
-                        .withOptions(env.DROOLS_BUILD_MVN_OPTS ? [ env.DROOLS_BUILD_MVN_OPTS ] : [])
-                        .withOptions(env.BUILD_MVN_OPTS_CURRENT ? [ env.BUILD_MVN_OPTS_CURRENT ] : [])
-                        .withProperty('maven.test.failure.ignore', true)
-                        .skipTests(params.SKIP_TESTS)
-
-                    if (isRelease()) {
-                        releaseUtils.gpgImportKeyFromStringWithoutPassword(getReleaseGpgSignKeyCredsId())
-                        mavenCommand.withProfiles(['apache-release'])
-                    } else {
-                        configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]) {
-                            mavenCommand.withSettingsXmlFile(MAVEN_SETTINGS_FILE)
+                    withCredentials([usernamePassword(credentialsId: env.MAVEN_REPO_CREDS_ID, usernameVariable: 'REPOSITORY_USER', passwordVariable: 'REPOSITORY_TOKEN')]) {
+                        def installOrDeploy
+                        if (shouldDeployToRepository()) {
+                            installOrDeploy = "deploy -DdeployAtEnd -Dapache.repository.username=${REPOSITORY_USER} -Dapache.repository.password=${REPOSITORY_TOKEN} -DretryFailedDeploymentCount=5"
+                        } else {
+                            installOrDeploy = 'install'
+                        }
+                        def mavenCommand = getMavenCommand()
+                           .withOptions(env.DROOLS_BUILD_MVN_OPTS ? [ env.DROOLS_BUILD_MVN_OPTS ] : [])
+                           .withOptions(env.BUILD_MVN_OPTS_CURRENT ? [ env.BUILD_MVN_OPTS_CURRENT ] : [])
+                           .withProperty('maven.test.failure.ignore', true)
+                           .skipTests(params.SKIP_TESTS)
+
+                        if (isRelease()) {
+                            releaseUtils.gpgImportKeyFromStringWithoutPassword(getReleaseGpgSignKeyCredsId())
+                            mavenCommand.withProfiles(['apache-release'])
                         }
-                        withCredentials([usernamePassword(credentialsId: env.MAVEN_REPO_CREDS_ID, usernameVariable: 'REPOSITORY_USER', passwordVariable: 'REPOSITORY_TOKEN')]) {
-                            mavenCommand
-                                .withProperty('apache.repository.username', "${REPOSITORY_USER}")
-                                .withProperty('apache.repository.password', "${REPOSITORY_TOKEN}")
+
+                        configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]) {
+                            mavenCommand.withSettingsXmlFile(MAVEN_SETTINGS_FILE).run("clean $installOrDeploy")
                         }
                     }
-                    mavenCommand.run("clean $installOrDeploy")
                 }
             }
             post {