2.0.0.Final backports 5

.github/workflows/release-build.yml

@@ -12,6 +12,7 @@ jobs:
     if: github.repository == 'quarkusio/quarkus'
     env:
       MAVEN_OPTS: -Xmx2048m -XX:MaxMetaspaceSize=1000m
+      JBANG_REPO: $HOME/release/repository
     steps:
       - uses: actions/checkout@v2
         with:

README.md

@@ -4,7 +4,7 @@
 [![GitHub Actions Status](<https://img.shields.io/github/workflow/status/QuarkusIO/quarkus/Quarkus CI?logo=GitHub&style=for-the-badge>)](https://github.com/quarkusio/quarkus/actions?query=workflow%3A%22Quarkus+CI%22)
 [![License](https://img.shields.io/github/license/quarkusio/quarkus?style=for-the-badge&logo=apache)](https://www.apache.org/licenses/LICENSE-2.0)
 [![Project Chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg?style=for-the-badge&logo=zulip)](https://quarkusio.zulipchat.com/)
-[![Supported JVM Versions](https://img.shields.io/badge/JVM-8--11--16-brightgreen.svg?style=for-the-badge&logo=Java)](https://github.com/quarkusio/quarkus/actions/runs/113853915/)
+[![Supported JVM Versions](https://img.shields.io/badge/JVM-11--16-brightgreen.svg?style=for-the-badge&logo=Java)](https://github.com/quarkusio/quarkus/actions/runs/113853915/)
 
 # Quarkus - Supersonic Subatomic Java
 

bom/application/pom.xml

@@ -52,7 +52,8 @@
         <smallrye-jwt.version>3.2.0</smallrye-jwt.version>
         <smallrye-context-propagation.version>1.2.0</smallrye-context-propagation.version>
         <smallrye-reactive-streams-operators.version>1.0.13</smallrye-reactive-streams-operators.version>
-        <smallrye-reactive-utils.version>2.6.0</smallrye-reactive-utils.version>
+        <smallrye-reactive-types-converter.version>2.6.0</smallrye-reactive-types-converter.version>
+        <smallrye-reactive-utils.version>2.7.0</smallrye-reactive-utils.version>
         <smallrye-reactive-messaging.version>3.5.0</smallrye-reactive-messaging.version>
         <jakarta.activation.version>1.2.1</jakarta.activation.version>
         <jakarta.annotation-api.version>1.3.5</jakarta.annotation-api.version>
@@ -87,7 +88,7 @@
         <plexus-component-annotations.version>2.1.0</plexus-component-annotations.version>
         <!-- What we actually depend on for the annotations, as latest Graal is not available in Maven fast enough: -->
         <graal-sdk.version>21.1.0</graal-sdk.version>
-        <gizmo.version>1.0.8.Final</gizmo.version>
+        <gizmo.version>1.0.9.Final</gizmo.version>
         <jackson.version>2.12.3</jackson.version>
         <commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
@@ -187,7 +188,7 @@
         <jna.version>5.3.1</jna.version><!-- should satisfy both testcontainers and mongodb -->
         <antlr.version>4.8</antlr.version>
         <quarkus-security.version>1.1.4.Final</quarkus-security.version>
-        <keycloak.version>12.0.4</keycloak.version>
+        <keycloak.version>14.0.0</keycloak.version>
         <logstash-gelf.version>1.14.1</logstash-gelf.version>
         <jsch.version>0.1.55</jsch.version>
         <jzlib.version>1.1.3</jzlib.version>
@@ -370,6 +371,11 @@
                 <artifactId>quarkus-development-mode-spi</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-junit4-mock</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-class-change-agent</artifactId>
@@ -4831,17 +4837,17 @@
             <dependency>
                 <groupId>io.smallrye.reactive</groupId>
                 <artifactId>smallrye-reactive-converter-api</artifactId>
-                <version>${smallrye-reactive-utils.version}</version>
+                <version>${smallrye-reactive-types-converter.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.smallrye.reactive</groupId>
                 <artifactId>smallrye-reactive-converter-mutiny</artifactId>
-                <version>${smallrye-reactive-utils.version}</version>
+                <version>${smallrye-reactive-types-converter.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.smallrye.reactive</groupId>
                 <artifactId>smallrye-reactive-converter-rxjava2</artifactId>
-                <version>${smallrye-reactive-utils.version}</version>
+                <version>${smallrye-reactive-types-converter.version}</version>
             </dependency>
 
             <dependency>

build-parent/pom.xml

@@ -88,7 +88,7 @@
 
         <!-- The image to use for tests that run Keycloak -->
         <!-- IMPORTANT: If this is changed you must also update bom/application/pom.xml to match the version -->
-        <keycloak.docker.image>quay.io/keycloak/keycloak:12.0.3</keycloak.docker.image>
+        <keycloak.docker.image>quay.io/keycloak/keycloak:14.0.0</keycloak.docker.image>
 
         <unboundid-ldap.version>4.0.13</unboundid-ldap.version>
 
@@ -494,11 +494,13 @@
                                             <exclude>io.quarkus:quarkus-test-*</exclude>
                                             <exclude>io.rest-assured:*</exclude>
                                             <exclude>org.assertj:*</exclude>
+                                            <exclude>junit:junit</exclude>
                                         </excludes>
                                         <includes>
                                             <include>io.quarkus:quarkus-test-*:*:*:test</include>
                                             <include>io.rest-assured:*:*:*:test</include>
                                             <include>org.assertj:*:*:*:test</include>
+                                            <include>junit:junit:*:*:test</include>
                                         </includes>
                                         <message>Found test dependencies with wrong scope:</message>
                                     </bannedDependencies>

core/deployment/src/main/java/io/quarkus/deployment/dev/console/AeshConsole.java

@@ -19,8 +19,7 @@ public class AeshConsole extends QuarkusConsole {
     private Size size;
     private Attributes attributes;
 
-    private String statusMessage;
-    private String promptMessage;
+    private String[] messages = new String[0];
     private int totalStatusLines = 0;
     private int lastWriteCursorX;
     /**
@@ -60,27 +59,6 @@ public void run() {
         }, "Console Shutdown Hoot"));
     }
 
-    private AeshConsole setStatusMessage(String statusMessage) {
-        synchronized (this) {
-            StringBuilder buffer = new StringBuilder();
-            clearStatusMessages(buffer);
-            int newLines = countLines(statusMessage) + countLines(promptMessage);
-            if (statusMessage == null) {
-                if (promptMessage != null) {
-                    newLines += 2;
-                }
-            } else if (promptMessage == null) {
-                newLines += 2;
-            } else {
-                newLines += 3;
-            }
-            this.statusMessage = statusMessage;
-            updatePromptOnChange(buffer, newLines);
-        }
-        deadlockSafeWrite();
-        return this;
-    }
-
     private void updatePromptOnChange(StringBuilder buffer, int newLines) {
         if (newLines > totalStatusLines) {
             StringBuilder nb = new StringBuilder();
@@ -106,29 +84,41 @@ public AeshInputHolder createHolder(InputHandler inputHandler) {
     }
 
     private AeshConsole setPromptMessage(String promptMessage) {
+        if (!inputSupport) {
+            return this;
+        }
+        setMessage(0, promptMessage);
+        return this;
+    }
+
+    private AeshConsole setMessage(int position, String message) {
         synchronized (this) {
-            if (!inputSupport) {
-                return this;
+            if (messages.length <= position) {
+                String[] old = messages;
+                messages = new String[position + 1];
+                System.arraycopy(old, 0, this.messages, 0, old.length);
             }
+            messages[position] = message;
+            int newLines = countTotalStatusLines();
             StringBuilder buffer = new StringBuilder();
             clearStatusMessages(buffer);
-            int newLines = countLines(statusMessage) + countLines(promptMessage);
-            if (statusMessage == null) {
-                if (promptMessage != null) {
-                    newLines += 2;
-                }
-            } else if (promptMessage == null) {
-                newLines += 2;
-            } else {
-                newLines += 3;
-            }
-            this.promptMessage = promptMessage;
             updatePromptOnChange(buffer, newLines);
         }
         deadlockSafeWrite();
         return this;
     }
 
+    private int countTotalStatusLines() {
+        int total = 0;
+        for (String i : messages) {
+            if (i != null) {
+                total++;
+                total += countLines(i);
+            }
+        }
+        return total == 0 ? total : total + 1;
+    }
+
     private void end(Connection conn) {
         conn.setAttributes(attributes);
         StringBuilder sb = new StringBuilder();
@@ -227,15 +217,21 @@ private void printStatusAndPrompt(StringBuilder buffer) {
             bottomBlankSpace = 0;
         }
         buffer.append("\n--\n");
-        if (statusMessage != null) {
-            buffer.append(statusMessage);
-            if (promptMessage != null) {
-                buffer.append("\n");
+        for (int i = messages.length - 1; i >= 0; --i) {
+            String msg = messages[i];
+            if (msg != null) {
+                buffer.append(msg);
+                if (i > 0) {
+                    //if there is any more messages to print we add a newline
+                    for (int j = 0; j < i; ++j) {
+                        if (messages[j] != null) {
+                            buffer.append("\n");
+                            break;
+                        }
+                    }
+                }
             }
         }
-        if (promptMessage != null) {
-            buffer.append(promptMessage);
-        }
     }
 
     private void clearStatusMessages(StringBuilder buffer) {
@@ -352,13 +348,27 @@ protected AeshInputHolder(InputHandler handler) {
 
         @Override
         protected void setPromptMessage(String prompt) {
-            AeshConsole.this.setPromptMessage(prompt);
+            if (!inputSupport) {
+                return;
+            }
+            setMessage(0, prompt);
+        }
+
+        @Override
+        protected void setResultsMessage(String results) {
+            setMessage(1, results);
+        }
+
+        @Override
+        protected void setCompileErrorMessage(String results) {
+            setMessage(3, results);
         }
 
         @Override
         protected void setStatusMessage(String status) {
-            AeshConsole.this.setStatusMessage(status);
+            setMessage(2, status);
 
         }
+
     }
 }