This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch 3.27.x-product in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git
commit a6897a2eec481bfded8b8ed5f8f0b0d40c1ea182 Author: Peter Palaga <[email protected]> AuthorDate: Tue Jan 20 13:38:28 2026 +0100 3.27.1.SP1-redhat-00001 should not be ignored when selecting BOM versions syncing --- .github/actions/update-versions/pom.xml | 9 +++++-- .../camel/quarkus/test/UpdateVersionsTest.java | 31 +++++++++------------- .../java/com/redhat/camel/quarkus/test/Utils.java | 4 ++- .../com/redhat/camel/quarkus/test/UtilsTest.java | 2 +- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/.github/actions/update-versions/pom.xml b/.github/actions/update-versions/pom.xml index f3d99203..d184022b 100644 --- a/.github/actions/update-versions/pom.xml +++ b/.github/actions/update-versions/pom.xml @@ -30,7 +30,7 @@ <properties> <junit.version>6.0.0</junit.version> <assertj.version>3.27.6</assertj.version> - <cli-assert.version>0.0.1-alpha8</cli-assert.version> + <cli-assert.version>0.0.1-alpha15</cli-assert.version> <rest-assured.version>5.5.6</rest-assured.version> <slf4j.version>2.0.17</slf4j.version> <jgit.version>7.3.0.202506031305-r</jgit.version> @@ -55,6 +55,11 @@ <artifactId>cli-assured</artifactId> <version>${cli-assert.version}</version> </dependency> + <dependency> + <groupId>org.l2x6.cli-assured</groupId> + <artifactId>mvn-assured</artifactId> + <version>${cli-assert.version}</version> + </dependency> <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> @@ -119,7 +124,7 @@ </dependency> <dependency> <groupId>org.l2x6.cli-assured</groupId> - <artifactId>cli-assured</artifactId> + <artifactId>mvn-assured</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/.github/actions/update-versions/src/test/java/com/redhat/camel/quarkus/test/UpdateVersionsTest.java b/.github/actions/update-versions/src/test/java/com/redhat/camel/quarkus/test/UpdateVersionsTest.java index 0992f0ac..e140bd19 100644 --- a/.github/actions/update-versions/src/test/java/com/redhat/camel/quarkus/test/UpdateVersionsTest.java +++ b/.github/actions/update-versions/src/test/java/com/redhat/camel/quarkus/test/UpdateVersionsTest.java @@ -21,7 +21,6 @@ import java.util.UUID; import java.util.regex.Pattern; import java.util.stream.Collectors; -import org.assertj.core.api.Assertions; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.ResetCommand.ResetType; import org.eclipse.jgit.api.errors.GitAPIException; @@ -35,6 +34,7 @@ import org.eclipse.jgit.transport.FetchResult; import org.eclipse.jgit.transport.URIish; import org.junit.jupiter.api.Test; import org.l2x6.cli.assured.CliAssured; +import org.l2x6.mvn.assured.Mvn; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -74,8 +74,6 @@ public class UpdateVersionsTest { try { final String cqPluginVersion = Utils.getLatestCqPluginVersion(); - final Path mvnwPath = Path.of("mvnw").toAbsolutePath().normalize(); - Assertions.assertThat(mvnwPath).isRegularFile(); final String remoteAlias = "midstream"; final CredentialsProvider creds = new GitHubTokenCredentials(ghToken); @@ -129,15 +127,14 @@ public class UpdateVersionsTest { * -Pprod \ * -Dcq.quarkus.platform.version=${PLATFORM_VERSION} */ - final Path examplesMvnwPath = checkoutDir.resolve("mvnw"); + final Mvn mvnv = Mvn.fromMvnw(checkoutDir).installIfNeeded(); { - CliAssured.command( - examplesMvnwPath.toString(), - "org.l2x6.cq:cq-prod-maven-plugin:" + cqPluginVersion + ":sync-examples-from-upstream", - "-Dcq.quarkus.platform.version=" + platformVersion, - "-ntp", - "-B" - ) + mvnv + .args( + "org.l2x6.cq:cq-prod-maven-plugin:" + cqPluginVersion + ":sync-examples-from-upstream", + "-Dcq.quarkus.platform.version=" + platformVersion, + "-ntp", + "-B") .cd(checkoutDir) .then() .stdout() @@ -174,16 +171,14 @@ public class UpdateVersionsTest { for (Path exampleDir : exampleDirs) { Path logFile = Path.of("target/" + exampleDir.getFileName() + ".log").toAbsolutePath().normalize(); - CliAssured.given() - .cd(exampleDir) - .stderrToStdout() - .when() - .command( - checkoutDir.resolve("mvnw").toString(), + mvnv + .args( "clean", "verify", "-ntp", "-B") + .cd(exampleDir) + .stderrToStdout() .then() .stdout() .hasLinesContaining("BUILD SUCCESS") @@ -233,9 +228,9 @@ public class UpdateVersionsTest { final Writer stackTrace = new StringWriter(); try (PrintWriter pw = new PrintWriter(stackTrace)) { log.error("Failed", e); + e.printStackTrace(pw); } - /* Add comment */ String st = stackTrace.toString() .replace("\"", "\\\"") diff --git a/.github/actions/update-versions/src/test/java/com/redhat/camel/quarkus/test/Utils.java b/.github/actions/update-versions/src/test/java/com/redhat/camel/quarkus/test/Utils.java index a27b4530..0e25d730 100644 --- a/.github/actions/update-versions/src/test/java/com/redhat/camel/quarkus/test/Utils.java +++ b/.github/actions/update-versions/src/test/java/com/redhat/camel/quarkus/test/Utils.java @@ -4,6 +4,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.regex.Pattern; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.Status; @@ -15,6 +16,7 @@ import io.restassured.path.json.JsonPath; import io.restassured.path.xml.XmlPath; public class Utils { + private static final Pattern RED_HAT_VERSION_PATTERN = Pattern.compile(".*[\\.\\-]redhat-[0-9]{5}$"); public static String getLatestCqPluginVersion() { XmlPath body = RestAssured.get("https://repo1.maven.org/maven2/org/l2x6/cq/cq-prod-maven-plugin/maven-metadata.xml";) .then() @@ -56,7 +58,7 @@ public class Utils { UpdateVersionsTest.log.info("Skipping Platform version " + bomVersion + " because it is older than " + minimalCQVersion); return; } - if (bomVersion.contains(".redhat-")) { + if (RED_HAT_VERSION_PATTERN.matcher(bomVersion).matches()) { UpdateVersionsTest.log.info("Found Platform BOM " + bomVersion + " in " + ceqBomGav); result.put(branch, bomVersion); } else { diff --git a/.github/actions/update-versions/src/test/java/com/redhat/camel/quarkus/test/UtilsTest.java b/.github/actions/update-versions/src/test/java/com/redhat/camel/quarkus/test/UtilsTest.java index 1ee777a8..6384a839 100644 --- a/.github/actions/update-versions/src/test/java/com/redhat/camel/quarkus/test/UtilsTest.java +++ b/.github/actions/update-versions/src/test/java/com/redhat/camel/quarkus/test/UtilsTest.java @@ -20,7 +20,7 @@ public class UtilsTest { for (Entry<String, String> en : versions.entrySet()) { Assertions.assertThat(en.getKey()).matches("[\\d]+\\.[\\d]+\\.x-product"); - Assertions.assertThat(en.getValue()).matches("[\\d]+\\.[\\d]+\\.[\\d]+\\.redhat-[0-9]{5}"); + Assertions.assertThat(en.getValue()).matches(".*[\\.\\-]redhat-[0-9]{5}"); } }
