update

apache · Sep 6, 2023 · a332c33 · a332c33
1 parent ab28361
commit a332c33
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 297 deletions.
diff --git a/.ci/jenkins/Jenkinsfile.prod.nightly b/.ci/jenkins/Jenkinsfile.prod.nightly
diff --git a/.ci/jenkins/Jenkinsfile.turtle b/.ci/jenkins/Jenkinsfile.turtle
@@ -38,7 +38,7 @@ pipeline {
                 script {
                     new MavenCommand(this)
                             // Use the same settings.xml as for the nightly builds, including a maven mirror.
-                            .withSettingsXmlId('kogito_release_settings')
+                            .withSettingsXmlId('kie-release-settings')
                             .inDirectory(optaplannerRepo)
                             .withOptions(['-U', '-e', '-fae', '-ntp'])
                             .withProperty('full')

diff --git a/.ci/jenkins/config/branch.yaml b/.ci/jenkins/config/branch.yaml
@@ -47,7 +47,7 @@ buildchain_config:
     repository: optaplanner
     file_path: .ci/buildchain-config.yaml
 maven:
-  settings_file_id: kogito_release_settings
+  settings_file_id: kie-release-settings
   nexus:
     release_url: https://repository.jboss.org/nexus
     release_repository: jboss-releases-repository
@@ -68,6 +68,6 @@ cloud:
 jenkins:
   email_creds_id: OPTAPLANNER_CI_EMAIL
   default_tools:
-    jdk: kie-jdk17
-    maven: kie-maven-3.8.7
-    sonar_jdk: kie-jdk17
+    jdk: jdk_17_latest
+    maven: maven_3.8.6
+    sonar_jdk: jdk_17_latest
diff --git a/.ci/jenkins/project/Jenkinsfile.drools b/.ci/jenkins/project/Jenkinsfile.drools
@@ -151,7 +151,7 @@ void checkoutDroolsRepo() {
 
 MavenCommand getMavenCommand(String directory) {
     def mvnCmd = new MavenCommand(this, ['-fae', '-ntp'])
-                .withSettingsXmlId('kogito_release_settings')
+                .withSettingsXmlId('kie-release-settings')
                 .inDirectory(directory)
     if (env.BUILD_MVN_OPTS) {
         mvnCmd.withOptions([ env.BUILD_MVN_OPTS ])