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-optaplanner.git


The following commit(s) were added to refs/heads/10.0.x by this push:
     new 9b81dd9c9a [10.0.x] NO-ISSUE: Use release settings to update version 
and parent versions (#3120)
9b81dd9c9a is described below

commit 9b81dd9c9ad6bd949556742dda22898bd80f35e9
Author: Rodrigo Antunes <[email protected]>
AuthorDate: Tue Aug 20 10:28:06 2024 -0300

    [10.0.x] NO-ISSUE: Use release settings to update version and parent 
versions (#3120)
    
    Use release settings to update version and parent version
---
 .ci/jenkins/Jenkinsfile.deploy | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index a828be9b41..7684fa089e 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -118,10 +118,12 @@ pipeline {
             }
             steps {
                 script {
-                    if (getDroolsVersion()) {
-                        
maven.mvnSetVersionProperty(getOptaplannerMavenCommand(), 'version.org.drools', 
getDroolsVersion())
+                    configFileProvider([configFile(fileId: 
env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]) {
+                        if (getDroolsVersion()) {
+                            
maven.mvnSetVersionProperty(getOptaplannerMavenCommand().withSettingsXmlFile(MAVEN_SETTINGS_FILE),
 'version.org.drools', getDroolsVersion())
+                        }
+                        
maven.mvnVersionsSet(getOptaplannerMavenCommand().withSettingsXmlFile(MAVEN_SETTINGS_FILE),
 getProjectVersion(), !isRelease())
                     }
-                    maven.mvnVersionsSet(getOptaplannerMavenCommand(), 
getProjectVersion(), !isRelease())
                     mavenCleanInstallOptaPlannerParents()
                     updateQuickstartsVersions()
                 }
@@ -273,8 +275,11 @@ List getIntegrationTestProfiles() {
 }
 
 void updateQuickstartsVersions() {
-    maven.mvnSetVersionProperty(getOptaplannerQuickstartsMavenCommand(), 
'version.org.optaplanner', getProjectVersion())
-    
maven.mvnVersionsUpdateParentAndChildModules(getOptaplannerQuickstartsMavenCommand(),
 getProjectVersion(), !isRelease())
+    configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, 
variable: 'MAVEN_SETTINGS_FILE')]) {
+        
maven.mvnSetVersionProperty(getOptaplannerQuickstartsMavenCommand().withSettingsXmlFile(MAVEN_SETTINGS_FILE),
 'version.org.optaplanner', getProjectVersion())
+        
maven.mvnVersionsUpdateParentAndChildModules(getOptaplannerQuickstartsMavenCommand().withSettingsXmlFile(MAVEN_SETTINGS_FILE),
 getProjectVersion(), !isRelease())
+    }
+
     gradleVersionsUpdate(quickstartsFolder, getProjectVersion())
 
     if (isRelease()) {
@@ -406,16 +411,12 @@ MavenCommand getOptaplannerQuickstartsMavenCommand() {
  * Builds the parent modules and the BOM so that project depending on these 
artifacts can resolve.
  */
 void mavenCleanInstallOptaPlannerParents() {
-    withCredentials([usernamePassword(credentialsId: env.MAVEN_REPO_CREDS_ID, 
usernameVariable: 'REPOSITORY_USER', passwordVariable: 'REPOSITORY_TOKEN')]) {
-        configFileProvider([configFile(fileId: 
env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]) {
-            getOptaplannerMavenCommand()
-                    .skipTests(true)
-                    .withOptions(['-U', '-pl 
org.optaplanner:optaplanner-build-parent,org.optaplanner:optaplanner-bom', 
'-am'])
-                    .withSettingsXmlFile(MAVEN_SETTINGS_FILE)
-                    .withProperty('apache.repository.username', 
"${REPOSITORY_USER}")
-                    .withProperty('apache.repository.password', 
"${REPOSITORY_TOKEN}")
-                    .run('clean install')
-        }
+    configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, 
variable: 'MAVEN_SETTINGS_FILE')]) {
+        getOptaplannerMavenCommand()
+                .skipTests(true)
+                .withOptions(['-U', '-pl 
org.optaplanner:optaplanner-build-parent,org.optaplanner:optaplanner-bom', 
'-am'])
+                .withSettingsXmlFile(MAVEN_SETTINGS_FILE)
+                .run('clean install')
     }
 }
 


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

Reply via email to