From 0e3c2d4c26d401728f7be8582be6bd7132cebcae Mon Sep 17 00:00:00 2001
From: Toshiya Kobayashi <toshiyakobayashi@gmail.com>
Date: Mon, 29 Jul 2024 14:49:51 +0900
Subject: [PATCH 1/2] [incubator-kie-issues-1401] Fix build
 kogito-examples.build-and-test in kogito nightly.native folder - Completely
 disabled dmn-tracing-quarkus and trusty-tracing-quarkus-devservices

---
 kogito-quarkus-examples/pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/kogito-quarkus-examples/pom.xml b/kogito-quarkus-examples/pom.xml
index b64e75a425..e2c3fbaa05 100644
--- a/kogito-quarkus-examples/pom.xml
+++ b/kogito-quarkus-examples/pom.xml
@@ -133,7 +133,6 @@
         <module>dmn-quarkus-example</module>
         <module>dmn-resource-jar-quarkus-example</module>
         <module>dmn-multiple-models-quarkus-example</module>
-        <module>dmn-tracing-quarkus</module>
         <module>flexible-process-quarkus</module>
         <module>kogito-travel-agency</module>
         <module>onboarding-example</module>
@@ -174,7 +173,6 @@
         </property>
       </activation>
       <modules>
-        <module>trusty-tracing-quarkus-devservices</module>
       </modules>
     </profile>
 

From 70cb9acbb91f64b12d0e1a2456291cbc1a013ec6 Mon Sep 17 00:00:00 2001
From: Toshiya Kobayashi <toshiyakobayashi@gmail.com>
Date: Tue, 30 Jul 2024 15:47:40 +0900
Subject: [PATCH 2/2] - Improve version-update

---
 .ci/jenkins/Jenkinsfile.setup-branch | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index ad3eba6a76..9d1eb422af 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -93,9 +93,21 @@ pipeline {
             steps {
                 script {
                     dir(getRepoName()) {
-                        def oldKogitoVersion = readMavenPom(file: 'pom.xml').version
+                        def pom = readMavenPom(file: 'pom.xml');
+                        def oldKogitoVersion = pom.version
+                        if (oldKogitoVersion == null) {
+                            echo "pom version is null. Using parent pom version"
+                            oldKogitoVersion = pom.parent.version
+                        }
                         echo "Got old Kogito version ${oldKogitoVersion}"
                         configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]){
+                            // special case for serverless-workflow-examples-parent
+                            maven.mvnVersionsSet(
+                                    getMavenCommand('serverless-workflow-examples/serverless-workflow-examples-parent').withSettingsXmlFile(MAVEN_SETTINGS_FILE),
+                                    getKogitoVersion(),
+                                    true,
+                                    false
+                            )
                             maven.mvnVersionsUpdateParentAndChildModules(
                                 getMavenCommand().withSettingsXmlFile(MAVEN_SETTINGS_FILE),
                                 getKogitoVersion(),
@@ -119,9 +131,10 @@ pipeline {
                         }
 
                         if (getKogitoVersion() != oldKogitoVersion) {
-                            def status = sh(script: "grep -ir '${oldKogitoVersion}' --include='pom.xml'", returnStatus: true)
+                            def status = sh(script: "grep -ir '>${oldKogitoVersion}<' --include='pom.xml'", returnStatus: true)
                             if (status == 0) {
-                                error "Old Kogito version ${oldKogitoVersion} is still present into the project... Please review it..."
+                                // some orphaned projects may still have the old version. not an error
+                                echo "Old Kogito version ${oldKogitoVersion} is still present into the project... Please review it..."
                             }
                         }
                     }