diff --git a/bom/pom.xml b/bom/pom.xml index deecb3d0ff..2f5706d326 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -13,127 +13,127 @@ - com.mastercard.test.flow + ${project.groupId} api ${project.version} - com.mastercard.test.flow + ${project.groupId} assert-core ${project.version} - com.mastercard.test.flow + ${project.groupId} assert-filter ${project.version} - com.mastercard.test.flow + ${project.groupId} assert-junit4 ${project.version} - com.mastercard.test.flow + ${project.groupId} assert-junit5 ${project.version} - com.mastercard.test.flow + ${project.groupId} builder ${project.version} - com.mastercard.test.flow + ${project.groupId} coppice ${project.version} - com.mastercard.test.flow + ${project.groupId} duct ${project.version} - com.mastercard.test.flow + ${project.groupId} message-core ${project.version} - com.mastercard.test.flow + ${project.groupId} message-http ${project.version} - com.mastercard.test.flow + ${project.groupId} message-json ${project.version} - com.mastercard.test.flow + ${project.groupId} message-sql ${project.version} - com.mastercard.test.flow + ${project.groupId} message-text ${project.version} - com.mastercard.test.flow + ${project.groupId} message-web ${project.version} - com.mastercard.test.flow + ${project.groupId} message-xml ${project.version} - com.mastercard.test.flow + ${project.groupId} model ${project.version} - com.mastercard.test.flow + ${project.groupId} report-core ${project.version} - com.mastercard.test.flow + ${project.groupId} report-ng ${project.version} - com.mastercard.test.flow + ${project.groupId} validation-core ${project.version} - com.mastercard.test.flow + ${project.groupId} validation-junit4 ${project.version} - com.mastercard.test.flow + ${project.groupId} validation-junit5 ${project.version} diff --git a/doc/src/test/java/com/mastercard/test/flow/doc/BomTest.java b/doc/src/test/java/com/mastercard/test/flow/doc/BomTest.java index 3fc5c34a54..18d005e6e9 100644 --- a/doc/src/test/java/com/mastercard/test/flow/doc/BomTest.java +++ b/doc/src/test/java/com/mastercard/test/flow/doc/BomTest.java @@ -44,7 +44,11 @@ void check() { + "\t\t\t\t%s\n" + "\t\t\t\t%s\n" + "\t\t\t", - artifact.groupId(), artifact.artifactId(), artifact.version() ) ) + artifact.groupId() + .replace( bom.groupId(), "${project.groupId}" ), + artifact.artifactId(), + artifact.version() + .replace( bom.version(), "${project.version}" ) ) ) .collect( joining( "\n\n", "" @@ -63,7 +67,11 @@ void check() { + "\t\t\t\t%s\n" + "\t\t\t\t%s\n" + "\t\t\t", - dep.groupId(), dep.artifactId(), dep.version() ) ) + dep.groupId() + .replace( bom.groupId(), "${project.groupId}" ), + dep.artifactId(), + dep.version() + .replace( bom.version(), "${project.version}" ) ) ) .collect( joining( "\n\n", "" diff --git a/doc/src/test/java/com/mastercard/test/flow/doc/PomData.java b/doc/src/test/java/com/mastercard/test/flow/doc/PomData.java index bc6a352351..9208e6f5f0 100644 --- a/doc/src/test/java/com/mastercard/test/flow/doc/PomData.java +++ b/doc/src/test/java/com/mastercard/test/flow/doc/PomData.java @@ -58,7 +58,7 @@ class PomData { .orElseGet( () -> parent.groupId() ); version = Optional.of( xpath.evaluate( "/project/version", doc ) ) .filter( s -> !s.isEmpty() ) - .orElse( "${project.version}" ); + .orElseGet( () -> parent.version() ); packaging = xpath.evaluate( "/project/packaging", doc ); name = xpath.evaluate( "/project/name", doc ); description = xpath.evaluate( "/project/description", doc );