Merge branch 'main' of github.com:Dairdevil/quarkus into bugfix/26587…

…-openshift-route-named-port
Dairdevil · Sep 14, 2022 · 2928919 · 2928919
2 parents 71ae072 + 9402450
commit 2928919
Show file tree

Hide file tree

Showing 139 changed files with 5,628 additions and 597 deletions.
diff --git a/.github/quarkus-github-bot.yml b/.github/quarkus-github-bot.yml
@@ -2,6 +2,17 @@
 # The format of this file is documented here:
 # https://github.com/quarkusio/quarkus-bot#triage-issues
 features: [ALL]
+workflows:
+  rules:
+    - allow:
+        users:
+          minContributions: 10
+        files:
+          - "**/*.md"
+          - "**/*.adoc"
+      unless:
+        files:
+          - ".github/**"
 workflowRunAnalysis:
   workflows: ["Quarkus CI"]
 projectsClassic:

diff --git a/.github/workflows/ci-actions-incremental.yml b/.github/workflows/ci-actions-incremental.yml
@@ -331,7 +331,7 @@ jobs:
           java-version: ${{ matrix.java.java-version }}
 
       - name: Download Maven Repo
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: maven-repo
           path: .
@@ -413,7 +413,7 @@ jobs:
         run: git config --global core.longpaths true
       - uses: actions/checkout@v3
       - name: Download Maven Repo
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: maven-repo
           path: .
@@ -488,7 +488,7 @@ jobs:
         run: git config --global core.longpaths true
       - uses: actions/checkout@v3
       - name: Download Maven Repo
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: maven-repo
           path: .
@@ -554,7 +554,7 @@ jobs:
         run: git config --global core.longpaths true
       - uses: actions/checkout@v3
       - name: Download Maven Repo
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: maven-repo
           path: .
@@ -610,7 +610,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Download Maven Repo
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: maven-repo
           path: .
@@ -661,7 +661,7 @@ jobs:
           distribution: temurin
           java-version: 11
       - name: Download Maven Repo
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: maven-repo
           path: .
@@ -746,7 +746,7 @@ jobs:
         run: |
           cat <<< $(jq '.HttpHeaders += {"User-Agent": "Quarkus-CI-Docker-Client"}' ~/.docker/config.json) > ~/.docker/config.json
       - name: Download Maven Repo
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v3
         with:
           name: maven-repo
           path: .

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -35,6 +35,7 @@ fixes, documentation, examples... But first, read this page (including the small
         - [Automatic incremental build](#automatic-incremental-build)
             * [Special case `bom-descriptor-json`](#special-case--bom-descriptor-json-)
             * [Usage by CI](#usage-by-ci)
+* [Release your own version](#release)
 * [Documentation](#documentation)
     + [Building the documentation](#building-the-documentation)
     + [Referencing a new guide in the index](#referencing-a-new-guide-in-the-index)
@@ -502,6 +503,33 @@ CI is using a slightly different GIB config than locally:
 
 For more details see the `Get GIB arguments` step in `.github/workflows/ci-actions-incremental.yml`.
 
+## Release your own version
+
+You might want to release your own patched version of Quarkus to an internal repository.
+
+To do so, you will first need to update the version in the source code:
+
+```shell
+./update-version.sh "x.y.z-yourcompany"
+```
+
+We use a shell script as we also need to update the version in various descriptors and test files.
+The shell script calls `./mvnw versions:set` under the hood, among other things.
+
+Commit the changes, then run:
+
+```shell
+./mvnw --settings your-maven-settings.xml \
+    clean deploy \
+    -DskipTests -DskipITs \
+    -DperformRelease=true \
+    -Prelease \
+    -Ddokka \
+    -Dgpg.skip
+```
+
+If your Maven settings are in your global Maven settings file located in the `.m2/` directory, you can drop the `--settings your-maven-settings.xml` part.
+
 ## Documentation
 
 The documentation is hosted in the [`docs` module](https://github.com/quarkusio/quarkus/tree/main/docs) of the main

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -28,7 +28,7 @@
         <opentelemetry-alpha.version>1.17.0-alpha</opentelemetry-alpha.version>
         <jaeger.version>1.8.1</jaeger.version>
         <quarkus-http.version>4.1.9</quarkus-http.version>
-        <micrometer.version>1.9.3</micrometer.version><!-- keep in sync with hdrhistogram -->
+        <micrometer.version>1.9.4</micrometer.version><!-- keep in sync with hdrhistogram -->
         <hdrhistogram.version>2.1.12</hdrhistogram.version><!-- keep in sync with micrometer -->
         <google-auth.version>0.22.0</google-auth.version>
         <microprofile-config-api.version>2.0.1</microprofile-config-api.version>
@@ -41,7 +41,7 @@
         <microprofile-lra.version>1.0</microprofile-lra.version>
         <smallrye-common.version>1.13.1</smallrye-common.version>
         <smallrye-config.version>2.12.0</smallrye-config.version>
-        <smallrye-health.version>3.2.1</smallrye-health.version>
+        <smallrye-health.version>3.3.0</smallrye-health.version>
         <smallrye-metrics.version>3.0.5</smallrye-metrics.version>
         <smallrye-open-api.version>2.2.1</smallrye-open-api.version>
         <smallrye-graphql.version>1.7.1</smallrye-graphql.version>
@@ -53,7 +53,7 @@
         <smallrye-reactive-types-converter.version>2.7.0</smallrye-reactive-types-converter.version>
         <smallrye-mutiny-vertx-binding.version>2.26.0</smallrye-mutiny-vertx-binding.version>
         <smallrye-reactive-messaging.version>3.18.0</smallrye-reactive-messaging.version>
-        <smallrye-stork.version>1.1.2</smallrye-stork.version>
+        <smallrye-stork.version>1.2.0</smallrye-stork.version>
         <jakarta.activation.version>1.2.1</jakarta.activation.version>
         <jakarta.annotation-api.version>1.3.5</jakarta.annotation-api.version>
         <jakarta.el-impl.version>3.0.4</jakarta.el-impl.version>
@@ -138,7 +138,7 @@
         <reactive-streams.version>1.0.3</reactive-streams.version>
         <jboss-logging.version>3.5.0.Final</jboss-logging.version>
         <mutiny.version>1.7.0</mutiny.version>
-        <kafka3.version>3.2.1</kafka3.version>
+        <kafka3.version>3.2.2</kafka3.version>
         <lz4.version>1.8.0</lz4.version> <!-- dependency of the kafka-clients that could be overridden by other imported BOMs in the platform -->
         <snappy.version>1.1.8.4</snappy.version>
         <strimzi-test-container.version>0.100.0</strimzi-test-container.version>
@@ -158,7 +158,7 @@
         <jboss-logmanager.version>1.0.10</jboss-logmanager.version>
         <flyway.version>9.3.0</flyway.version>
         <yasson.version>1.0.11</yasson.version>
-        <liquibase.version>4.15.0</liquibase.version>
+        <liquibase.version>4.16.0</liquibase.version>
         <snakeyaml.version>1.32</snakeyaml.version>
         <osgi.version>6.0.0</osgi.version>
         <mongo-client.version>4.7.1</mongo-client.version>

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -134,6 +134,8 @@
 
         <!-- Webjars used by the Dev UI -->
         <webjar.bootstrap.version>4.6.1</webjar.bootstrap.version>
+        <webjar.bootstrap-multiselect.version>0.9.15</webjar.bootstrap-multiselect.version>
+        <webjar.bootstrap-icons.version>1.9.1</webjar.bootstrap-icons.version>
         <webjar.font-awesome.version>6.1.2</webjar.font-awesome.version>
         <webjar.jquery.version>3.6.1</webjar.jquery.version>
         <webjar.codemirror.version>5.62.2</webjar.codemirror.version>
@@ -309,6 +311,16 @@
                 <artifactId>bootstrap</artifactId>
                 <version>${webjar.bootstrap.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.webjars</groupId>
+                <artifactId>bootstrap-multiselect</artifactId>
+                <version>${webjar.bootstrap-multiselect.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars.npm</groupId>
+                <artifactId>bootstrap-icons</artifactId>
+                <version>${webjar.bootstrap-icons.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.webjars</groupId>
                 <artifactId>font-awesome</artifactId>

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/IsDockerWorking.java b/core/deployment/src/main/java/io/quarkus/deployment/IsDockerWorking.java
@@ -1,11 +1,8 @@
 
 package io.quarkus.deployment;
 
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.lang.reflect.InvocationTargetException;
 import java.net.InetSocketAddress;
 import java.net.Socket;
@@ -15,7 +12,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.function.BooleanSupplier;
-import java.util.function.Function;
 import java.util.function.Supplier;
 
 import org.eclipse.microprofile.config.ConfigProvider;
@@ -176,29 +172,6 @@ public Result get() {
             }
         }
 
-        public static class OutputFilter implements Function<InputStream, Runnable> {
-            private final StringBuilder builder = new StringBuilder();
-
-            @Override
-            public Runnable apply(InputStream is) {
-                return () -> {
-
-                    try (InputStreamReader isr = new InputStreamReader(is);
-                            BufferedReader reader = new BufferedReader(isr)) {
-
-                        for (String line = reader.readLine(); line != null; line = reader.readLine()) {
-                            builder.append(line);
-                        }
-                    } catch (IOException e) {
-                        throw new RuntimeException("Error reading stream.", e);
-                    }
-                };
-            }
-
-            public String getOutput() {
-                return builder.toString();
-            }
-        }
     }
 
     private enum Result {

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/OutputFilter.java b/core/deployment/src/main/java/io/quarkus/deployment/OutputFilter.java
@@ -0,0 +1,31 @@
+package io.quarkus.deployment;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.function.Function;
+
+public class OutputFilter implements Function<InputStream, Runnable> {
+    private final StringBuilder builder = new StringBuilder();
+
+    @Override
+    public Runnable apply(InputStream is) {
+        return () -> {
+
+            try (InputStreamReader isr = new InputStreamReader(is);
+                    BufferedReader reader = new BufferedReader(isr)) {
+
+                for (String line = reader.readLine(); line != null; line = reader.readLine()) {
+                    builder.append(line);
+                }
+            } catch (IOException e) {
+                throw new RuntimeException("Error reading stream.", e);
+            }
+        };
+    }
+
+    public String getOutput() {
+        return builder.toString();
+    }
+}