From a3ee18021a11e7e7c1907fcc191946d7387038ea Mon Sep 17 00:00:00 2001 From: Daniel Berecz Date: Mon, 9 Sep 2024 11:09:18 +0200 Subject: [PATCH] Added isRHBQ method to check if the version contains string redhat --- .../src/main/java/io/quarkus/test/util/QuarkusCLIUtils.java | 2 +- .../test/services/quarkus/model/QuarkusProperties.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/quarkus-test-cli/src/main/java/io/quarkus/test/util/QuarkusCLIUtils.java b/quarkus-test-cli/src/main/java/io/quarkus/test/util/QuarkusCLIUtils.java index 76225af9b..15369825b 100644 --- a/quarkus-test-cli/src/main/java/io/quarkus/test/util/QuarkusCLIUtils.java +++ b/quarkus-test-cli/src/main/java/io/quarkus/test/util/QuarkusCLIUtils.java @@ -279,7 +279,7 @@ public static void changePropertiesInPom(QuarkusCliRestService app, Properties p */ public static void setCommunityBomIfNotRunningRHBQ(QuarkusCliRestService app, String communityQuarkusVersion) throws XmlPullParserException, IOException { - if (!QuarkusProperties.getVersion().contains("redhat")) { + if (!QuarkusProperties.isRHBQ()) { Properties communityBomProperties = new Properties(); communityBomProperties.put("quarkus.platform.group-id", "io.quarkus.platform"); communityBomProperties.put("quarkus.platform.version", communityQuarkusVersion); diff --git a/quarkus-test-core/src/main/java/io/quarkus/test/services/quarkus/model/QuarkusProperties.java b/quarkus-test-core/src/main/java/io/quarkus/test/services/quarkus/model/QuarkusProperties.java index e313d5d81..be49b8f6f 100644 --- a/quarkus-test-core/src/main/java/io/quarkus/test/services/quarkus/model/QuarkusProperties.java +++ b/quarkus-test-core/src/main/java/io/quarkus/test/services/quarkus/model/QuarkusProperties.java @@ -34,6 +34,10 @@ private QuarkusProperties() { } + public static boolean isRHBQ() { + return QuarkusProperties.getVersion().contains("redhat"); + } + public static String getVersion() { return defaultVersionIfEmpty(PLATFORM_VERSION.get()); }