From 0dc1fbf38c9c2b048ff16c1936f6530aab127fb0 Mon Sep 17 00:00:00 2001
From: Francisco Javier Tirado Sarti
 <65240126+fjtirado@users.noreply.github.com>
Date: Wed, 20 Nov 2024 14:23:54 +0100
Subject: [PATCH] [Fix #3782] Properly resolving root dir in all CI
 environments (#3783)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Fix #3782] Properly resolving root dir in all CI environments

* Update kogito-build/kogito-build-no-bom-parent/pom.xml

Co-authored-by: Gonzalo Muñoz <gonzalo51429@gmail.com>

* Use relative path for resources

* Change phase to validate

* [Fix #3782] Using relative path

---------

Co-authored-by: Gonzalo Muñoz <gonzalo51429@gmail.com>
Co-authored-by: gmunozfe <gmunozfe@redhat.com>
---
 .../kogito-build-no-bom-parent/pom.xml        | 22 ++++++++++++++++++-
 .../pom.xml                                   |  2 +-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/kogito-build/kogito-build-no-bom-parent/pom.xml b/kogito-build/kogito-build-no-bom-parent/pom.xml
index 9b5f70cc27a..f64f018012f 100644
--- a/kogito-build/kogito-build-no-bom-parent/pom.xml
+++ b/kogito-build/kogito-build-no-bom-parent/pom.xml
@@ -87,7 +87,6 @@
       possible to measure cross-module test coverage -->
     <jacoco.exec.file>${project.root.dir}/target/jacoco.exec</jacoco.exec.file>
     <!--suppress UnresolvedMavenProperty -->
-    <project.root.dir>${maven.multiModuleProjectDirectory}</project.root.dir>
     <quarkus.logging.manager>org.jboss.logmanager.LogManager</quarkus.logging.manager>
     <tests.surefire.include>**/*Test.java</tests.surefire.include>
     <tests.failsafe.include>**/*IT.java</tests.failsafe.include>
@@ -671,10 +670,31 @@
             <legacyMode>true</legacyMode>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.commonjava.maven.plugins</groupId>
+          <artifactId>directory-maven-plugin</artifactId>
+          <version>1.0</version>
+          <executions>
+            <execution>
+              <id>directories</id>
+              <goals>
+                <goal>highest-basedir</goal>
+               </goals>
+              <phase>validate</phase>
+              <configuration>
+                <property>project.root.dir</property>
+               </configuration>
+             </execution>
+          </executions>
+        </plugin>
       </plugins>
     </pluginManagement>
 
     <plugins>
+       <plugin>
+        <groupId>org.commonjava.maven.plugins</groupId>
+        <artifactId>directory-maven-plugin</artifactId>
+       </plugin>
       <plugin>
         <groupId>net.revelc.code.formatter</groupId>
         <artifactId>formatter-maven-plugin</artifactId>
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-image-integration-test/pom.xml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-image-integration-test/pom.xml
index 3e713938438..127c1210088 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-image-integration-test/pom.xml
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-image-integration-test/pom.xml
@@ -87,7 +87,7 @@
         <directory>src/main/resources</directory>
       </resource>
       <resource>
-        <directory>${project.root.dir}/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources</directory>
+        <directory>../kogito-quarkus-serverless-workflow-integration-test/src/main/resources</directory>
         <includes>
           <include>expression.sw.json</include>
           <include>schema/expressionInput.json</include>