Merge pull request #31358 from gsmet/minor-fixes

quarkusio · Feb 23, 2023 · 76a246f · 76a246f
2 parents 3321322 + 1cb85f4
commit 76a246f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/extensions/kubernetes-client/deployment-internal/pom.xml b/extensions/kubernetes-client/deployment-internal/pom.xml
@@ -11,7 +11,7 @@
 
  <artifactId>quarkus-kubernetes-client-internal-deployment</artifactId>
  <name>Quarkus - Kubernetes Client - Internal - Deployment</name>
- <description>This module only exists as a separate module to so the kubernetes extension can share code with the kubernetes-client extension</description>
+ <description>This module only exists as a separate module so the kubernetes extension can share code with the kubernetes-client extension</description>
 
  <dependencies>
  <dependency>

diff --git a/...anilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesProcessor.java b/...anilla/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() {

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
@@ -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);