Skip to content

Commit

Permalink
[Fix apache#3782] Properly resolving root dir in all CI environments (a…
Browse files Browse the repository at this point in the history
…pache#3783)

* [Fix apache#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 <[email protected]>

* Use relative path for resources

* Change phase to validate

* [Fix apache#3782] Using relative path

---------

Co-authored-by: Gonzalo Muñoz <[email protected]>
Co-authored-by: gmunozfe <[email protected]>
  • Loading branch information
3 people committed Nov 26, 2024
1 parent b1b1f62 commit 0dc1fbf
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
22 changes: 21 additions & 1 deletion kogito-build/kogito-build-no-bom-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 0dc1fbf

Please sign in to comment.