From 28673ed4d893dc9ac3bc187dbea6dbdc8ab080cb Mon Sep 17 00:00:00 2001
From: Dominik Guhr <dguhr@redhat.com>
Date: Thu, 2 Dec 2021 11:49:40 +0100
Subject: [PATCH] KEYCLOAK-19832 Update to Quarkus 2.5.1

---
 distribution/server-x-dist/src/main/content/bin/kc.sh       | 2 +-
 quarkus/pom.xml                                             | 6 +++---
 .../org/keycloak/quarkus/runtime/cli/command/Build.java     | 2 +-
 .../java/org/keycloak/it/junit5/extension/CLIResult.java    | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/distribution/server-x-dist/src/main/content/bin/kc.sh b/distribution/server-x-dist/src/main/content/bin/kc.sh
index d8960c8bab0..64e78155e3a 100644
--- a/distribution/server-x-dist/src/main/content/bin/kc.sh
+++ b/distribution/server-x-dist/src/main/content/bin/kc.sh
@@ -63,7 +63,7 @@ done
 # Specify options to pass to the Java VM.
 #
 if [ "x$JAVA_OPTS" = "x" ]; then
-   JAVA_OPTS="-Xms64m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m -Djava.net.preferIPv4Stack=true -Dquarkus-log-max-startup-records=10000"
+   JAVA_OPTS="-Xms64m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m -Djava.net.preferIPv4Stack=true"
 else
    echo "JAVA_OPTS already set in environment; overriding default settings with values: $JAVA_OPTS"
 fi
diff --git a/quarkus/pom.xml b/quarkus/pom.xml
index 513738977ab..887da8b8098 100644
--- a/quarkus/pom.xml
+++ b/quarkus/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <!-- Quarkus version -->
-        <quarkus.version>2.4.2.Final</quarkus.version>
+        <quarkus.version>2.5.1.Final</quarkus.version>
 
         <!--
             Override versions based on Quarkus dependencies.
@@ -44,8 +44,8 @@
         <jackson.version>2.12.5</jackson.version>
         <jackson.databind.version>${jackson.version}</jackson.databind.version>
         <hibernate.core.version>5.6.1.Final</hibernate.core.version>
-        <mysql.driver.version>8.0.26</mysql.driver.version>
-        <postgresql.version>42.2.24</postgresql.version>
+        <mysql.driver.version>8.0.27</mysql.driver.version>
+        <postgresql.version>42.3.1</postgresql.version>
         <microprofile-metrics-api.version>3.0</microprofile-metrics-api.version>
         <wildfly.common.version>1.5.4.Final-format-001</wildfly.common.version>
         <infinispan.version>13.0.0.Final</infinispan.version>
diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Build.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Build.java
index 1f7f59dd7be..9dda96497a6 100644
--- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Build.java
+++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Build.java
@@ -47,7 +47,7 @@ import picocli.CommandLine.Mixin;
         },
         footerHeading = "Examples:",
         footer = "  Optimize the server based on a profile configuration:%n%n"
-                + "      $ ${PARENT-COMMAND-FULL-NAME:-$PARENTCOMMAND} ${COMMAND-NAME} --profile=prod%n%n"
+                + "      $ ${PARENT-COMMAND-FULL-NAME:-$PARENTCOMMAND} --profile=prod ${COMMAND-NAME}%n%n"
                 + "  Change database settings:%n%n"
                 + "      $ ${PARENT-COMMAND-FULL-NAME:-$PARENTCOMMAND} ${COMMAND-NAME} --db=postgres [--db-url][--db-username][--db-password]%n%n"
                 + "  Enable a feature:%n%n"
diff --git a/quarkus/tests/integration/src/main/java/org/keycloak/it/junit5/extension/CLIResult.java b/quarkus/tests/integration/src/main/java/org/keycloak/it/junit5/extension/CLIResult.java
index 8dac68cb642..a141fa25d99 100644
--- a/quarkus/tests/integration/src/main/java/org/keycloak/it/junit5/extension/CLIResult.java
+++ b/quarkus/tests/integration/src/main/java/org/keycloak/it/junit5/extension/CLIResult.java
@@ -61,6 +61,7 @@ public interface CLIResult extends LaunchResult {
     boolean isDistribution();
 
     default void assertStarted() {
+        assertFalse(getOutput().contains("The delayed handler's queue was overrun and log record(s) were lost (Did you forget to configure logging?)"), () -> "The standard Output:\n" + getOutput() + "should not contain a warning about log queue overrun.");
         assertTrue(getOutput().contains("Listening on:"), () -> "The standard output:\n" + getOutput() + "does include \"Listening on:\"");
         assertNotDevMode();
     }