From 77752724ccd5efda7dbe18a432cc9e3de341050c Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Wed, 22 Feb 2023 19:37:02 +0100 Subject: [PATCH 1/3] Handle a corner case in Timing printing When using , the version can actually be passed as "null" so we need to filter out this case. Also display the app name if not null, even if the version is null. --- .../main/java/io/quarkus/bootstrap/runner/Timing.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/Timing.java b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/Timing.java index 93f32284fb9d5..fa1fd3bf50f87 100644 --- a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/Timing.java +++ b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/Timing.java @@ -97,15 +97,19 @@ public static void printStartupTime(String name, String version, String quarkusV //Use a BigDecimal so we can render in seconds with 3 digits precision, as requested: final BigDecimal secondsRepresentation = convertToBigDecimalSeconds(bootTimeNanoSeconds); String safeAppName = (name == null || name.trim().isEmpty()) ? UNSET_VALUE : name; - String safeAppVersion = (version == null || version.trim().isEmpty()) ? UNSET_VALUE : version; + String safeAppVersion = (version == null || version.trim().isEmpty() || "null".equals(version)) ? UNSET_VALUE : version; final String nativeOrJvm = ImageInfo.inImageRuntimeCode() ? "native" : "on JVM"; - if (UNSET_VALUE.equals(safeAppName) || UNSET_VALUE.equals(safeAppVersion)) { + + if (UNSET_VALUE.equals(safeAppName)) { logger.infof("Quarkus %s %s started in %ss. %s", quarkusVersion, nativeOrJvm, secondsRepresentation, t.httpServerInfo); } else { - logger.infof("%s %s %s (powered by Quarkus %s) started in %ss. %s", name, version, nativeOrJvm, quarkusVersion, + String appNameAndVersion = UNSET_VALUE.equals(safeAppVersion) ? name : name + " " + version; + + logger.infof("%s %s (powered by Quarkus %s) started in %ss. %s", appNameAndVersion, nativeOrJvm, quarkusVersion, secondsRepresentation, t.httpServerInfo); } + logger.infof("Profile%s %s activated. %s", profiles.size() > 1 ? "s" : "", String.join(",", profiles), liveCoding ? "Live Coding activated." : ""); logger.infof("Installed features: [%s]", features); From a2beed2e27eedf7ab3dd6a46b058ea3c850545e7 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Wed, 22 Feb 2023 19:38:05 +0100 Subject: [PATCH 2/3] Fix a typo in the description of kubernetes-client/deployment-internal --- extensions/kubernetes-client/deployment-internal/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/kubernetes-client/deployment-internal/pom.xml b/extensions/kubernetes-client/deployment-internal/pom.xml index a564ff686f0c2..2872c0d99a30a 100644 --- a/extensions/kubernetes-client/deployment-internal/pom.xml +++ b/extensions/kubernetes-client/deployment-internal/pom.xml @@ -11,7 +11,7 @@ quarkus-kubernetes-client-internal-deployment Quarkus - Kubernetes Client - Internal - Deployment - This module only exists as a separate module to so the kubernetes extension can share code with the kubernetes-client extension + This module only exists as a separate module so the kubernetes extension can share code with the kubernetes-client extension From 1cb85f4aa2753d30291b3166374e2b70700316d1 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Wed, 22 Feb 2023 19:38:23 +0100 Subject: [PATCH 3/3] Remove an unused constant from KubernetesProcessor --- .../io/quarkus/kubernetes/deployment/KubernetesProcessor.java | 1 - 1 file changed, 1 deletion(-) diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesProcessor.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesProcessor.java index ec65140a97419..80631fe9a2766 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesProcessor.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesProcessor.java @@ -64,7 +64,6 @@ class KubernetesProcessor { private static final Logger log = Logger.getLogger(KubernetesProcessor.class); private static final String COMMON = "common"; - private static final String OUTPUT_ARTIFACT_FORMAT = "%s%s.jar"; @BuildStep FeatureBuildItem produceFeature() {