This is an automated email from the ASF dual-hosted git repository.

rantunes pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/incubator-kie-drools.git


The following commit(s) were added to refs/heads/10.0.x by this push:
     new 1320d83a40 Use default maven settings file for release (#6047)
1320d83a40 is described below

commit 1320d83a40b8a5659c2c2a7cb3e9daf924cce309
Author: Rodrigo Antunes <[email protected]>
AuthorDate: Wed Aug 14 16:40:09 2024 -0300

    Use default maven settings file for release (#6047)
---
 .ci/jenkins/Jenkinsfile.deploy | 42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index b3d950ac95..e0bb64c0a7 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -114,28 +114,32 @@ pipeline {
         stage('Deploy drools') {
             steps {
                 script {
-                    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'])
-                        }
-
+                    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).run("clean 
$installOrDeploy")
+                            
mavenCommand.withSettingsXmlFile(MAVEN_SETTINGS_FILE)
+                        }
+                        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}")
                         }
                     }
+                    mavenCommand.run("clean $installOrDeploy")
                 }
             }
             post {


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to