Merge branch 'quarkusio:main' into grpc-transcoding

zZHorizonZz · Apr 23, 2024 · f77df97 · f77df97
2 parents 2af788d + a3d1568
commit f77df97
Show file tree

Hide file tree

Showing 188 changed files with 5,817 additions and 774 deletions.
diff --git a/.github/native-tests.json b/.github/native-tests.json
@@ -86,8 +86,8 @@
         },
         {
             "category": "Cache",
-            "timeout": 65,
-            "test-modules": "infinispan-cache-jpa, infinispan-client, cache, redis-cache",
+            "timeout": 75,
+            "test-modules": "infinispan-cache-jpa, infinispan-client, cache, redis-cache, infinispan-cache",
             "os-name": "ubuntu-latest"
         },
         {
@@ -133,9 +133,9 @@
             "os-name": "ubuntu-latest"
         },
         {
-            "category": "Windows - RESTEasy Jackson",
-            "timeout": 25,
-            "test-modules": "resteasy-jackson",
+            "category": "Windows support",
+            "timeout": 50,
+            "test-modules": "resteasy-jackson, qute",
             "os-name": "windows-latest"
         },
         {

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -2,7 +2,7 @@
     <extension>
         <groupId>com.gradle</groupId>
         <artifactId>develocity-maven-extension</artifactId>
-        <version>1.21</version>
+        <version>1.21.2</version>
     </extension>
     <extension>
         <groupId>com.gradle</groupId>

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -15,7 +15,7 @@
 
     <properties>
         <angus-activation.version>2.0.2</angus-activation.version>
-        <bouncycastle.version>1.77</bouncycastle.version>
+        <bouncycastle.version>1.78.1</bouncycastle.version>
         <bouncycastle.fips.version>1.0.2.4</bouncycastle.fips.version>
         <bouncycastle.tls.fips.version>1.0.18</bouncycastle.tls.fips.version>
         <expressly.version>5.0.0</expressly.version>
@@ -26,7 +26,7 @@
         <parsson.version>1.1.5</parsson.version>
         <resteasy-microprofile.version>2.1.5.Final</resteasy-microprofile.version>
         <resteasy-spring-web.version>3.1.2.Final</resteasy-spring-web.version>
-        <resteasy.version>6.2.7.Final</resteasy.version>
+        <resteasy.version>6.2.8.Final</resteasy.version>
         <opentracing.version>0.33.0</opentracing.version>
         <opentracing-jdbc.version>0.2.4</opentracing-jdbc.version>
         <opentracing-kafka.version>0.1.15</opentracing-kafka.version>
@@ -120,7 +120,7 @@
         <slf4j-jboss-logmanager.version>2.0.0.Final</slf4j-jboss-logmanager.version>
         <wildfly-common.version>1.7.0.Final</wildfly-common.version>
         <wildfly-client-config.version>1.0.1.Final</wildfly-client-config.version>
-        <wildfly-elytron.version>2.3.1.Final</wildfly-elytron.version>
+        <wildfly-elytron.version>2.4.1.Final</wildfly-elytron.version>
         <jboss-threads.version>3.6.1.Final</jboss-threads.version>
         <vertx.version>4.5.7</vertx.version>
         <httpclient.version>4.5.14</httpclient.version>
@@ -167,7 +167,7 @@
         <maven-invoker.version>3.2.0</maven-invoker.version>
         <awaitility.version>4.2.1</awaitility.version>
         <jboss-logmanager.version>3.0.4.Final</jboss-logmanager.version>
-        <flyway.version>10.10.0</flyway.version>
+        <flyway.version>10.11.1</flyway.version>
         <yasson.version>3.0.3</yasson.version>
         <!-- liquibase-mongodb is not released everytime with liquibase anymore, but the two versions need to be compatible -->
         <liquibase.version>4.27.0</liquibase.version>
@@ -216,7 +216,7 @@
         <jansi.version>2.4.0</jansi.version> <!-- Keep in sync with aesh-readline and dekorate -->
         <jgit.version>6.9.0.202403050737-r</jgit.version>
         <!-- these two artifacts needs to be compatible together -->
-        <strimzi-oauth.version>0.14.0</strimzi-oauth.version>
+        <strimzi-oauth.version>0.15.0</strimzi-oauth.version>
         <strimzi-oauth.nimbus.version>9.37.3</strimzi-oauth.nimbus.version>
         <jose4j.version>0.9.6</jose4j.version>
         <java-buildpack-client.version>0.0.6</java-buildpack-client.version>
@@ -226,6 +226,8 @@
         <mutiny-zero.version>1.1.0</mutiny-zero.version>
         <pulsar-client.version>3.0.0</pulsar-client.version>
         <async-http-client.version>2.12.3</async-http-client.version>
+        <!-- keep in-sync, if possible, with Micrometer registry Prometheus -->
+        <prometheus.version>0.16.0</prometheus.version>
         <!-- Dev UI -->
         <importmap.version>1.0.10</importmap.version>
     </properties>
@@ -490,6 +492,18 @@
                 <scope>import</scope>
             </dependency>
 
+            <!-- Prometheus -->
+            <dependency>
+                <groupId>io.prometheus</groupId>
+                <artifactId>simpleclient</artifactId>
+                <version>${prometheus.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.prometheus</groupId>
+                <artifactId>simpleclient_common</artifactId>
+                <version>${prometheus.version}</version>
+            </dependency>
+
             <!-- Quarkus core -->
 
             <dependency>
@@ -1265,6 +1279,16 @@
                 <artifactId>quarkus-infinispan-client-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-infinispan-cache</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-infinispan-cache-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-jdbc-db2</artifactId>
@@ -2991,6 +3015,42 @@
                 <artifactId>quarkus-virtual-threads-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-observability-devservices-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-observability-devservices</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-observability-devservices-lgtm</artifactId>
+                <version>${project.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-observability-testcontainers</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-observability-devresource-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-observability-devresource-testcontainers</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-observability-devresource-lgtm</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
             <!-- Quarkus test dependencies -->
             <dependency>
@@ -3125,12 +3185,12 @@
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-webjars-locator</artifactId>
+                <artifactId>quarkus-web-dependency-locator</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-webjars-locator-deployment</artifactId>
+                <artifactId>quarkus-web-dependency-locator-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -6670,6 +6730,16 @@
                 <artifactId>quarkus-smallrye-reactive-messaging-rabbitmq-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-webjars-locator</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-webjars-locator-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <!-- End of Relocations, please put new extensions above this list -->
 
         </dependencies>

diff --git a/bom/dev-ui/pom.xml b/bom/dev-ui/pom.xml
@@ -14,7 +14,7 @@
 
     <properties>
         <vaadin.version>24.3.10</vaadin.version>
-        <lit.version>3.1.2</lit.version>
+        <lit.version>3.1.3</lit.version>
         <lit-element.version>4.0.4</lit-element.version>
         <lit-html.version>3.1.2</lit-html.version>
         <ssr-dom-shim.version>1.2.0</ssr-dom-shim.version>
@@ -28,7 +28,7 @@
         <vaadin-router.version>1.7.5</vaadin-router.version>
         <lit-state.version>1.7.0</lit-state.version>
         <echarts.version>5.5.0</echarts.version>
-        <codeblock.version>1.0.12</codeblock.version>
+        <codeblock.version>1.0.13</codeblock.version>
         <es-module-shims.version>1.8.3</es-module-shims.version>
         <path-to-regexp.version>2.4.0</path-to-regexp.version>
 

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/Feature.java b/core/deployment/src/main/java/io/quarkus/deployment/Feature.java
@@ -69,6 +69,7 @@ public enum Feature {
     NARAYANA_LRA,
     NARAYANA_STM,
     NEO4J,
+    OBSERVABILITY,
     OIDC,
     OIDC_CLIENT,
     RESTEASY_CLIENT_OIDC_FILTER,

diff --git a/...c/main/java/io/quarkus/deployment/builditem/nativeimage/NativeImageResourceBuildItem.java b/...c/main/java/io/quarkus/deployment/builditem/nativeimage/NativeImageResourceBuildItem.java
@@ -7,7 +7,11 @@
 import io.quarkus.builder.item.MultiBuildItem;
 
 /**
- * A build item that indicates that a static resource should be included in the native image
+ * A build item that indicates that a static resource should be included in the native image.
+ * <p>
+ * A static resource is a file that is not processed by the build steps, but is included in the native image as-is.
+ * The resource path passed to the constructor is a {@code /}-separated path name (with the same semantics as the parameters
+ * passed to {@link java.lang.ClassLoader#getResources(String)}.
  * <p>
  * Related build items:
  * <ul>

diff --git a/...yment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java b/...yment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java
@@ -1086,6 +1086,7 @@ public String getValue(final String propertyName) {
             builder.getSources().clear();
             builder.getSourceProviders().clear();
             builder.setAddDefaultSources(false)
+                    .withInterceptors(ConfigCompatibility.FrontEnd.nonLoggingInstance(), ConfigCompatibility.BackEnd.instance())
                     .addDiscoveredCustomizers()
                     .withProfiles(config.getProfiles())
                     .withSources(sourceProperties);
@@ -1099,6 +1100,7 @@ public String getValue(final String propertyName) {
             builder.getSources().clear();
             builder.getSourceProviders().clear();
             builder.setAddDefaultSources(false)
+                    .withInterceptors(ConfigCompatibility.FrontEnd.nonLoggingInstance(), ConfigCompatibility.BackEnd.instance())
                     .addDiscoveredCustomizers()
                     .withSources(sourceProperties)
                     .withSources(new MapBackedConfigSource(

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/ConfigCompatibility.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/ConfigCompatibility.java
@@ -114,9 +114,13 @@ public static final class FrontEnd implements ConfigSourceInterceptor {
         @Serial
         private static final long serialVersionUID = -3438497970389074611L;
 
-        private static final FrontEnd instance = new FrontEnd();
+        private static final FrontEnd instance = new FrontEnd(true);
+        private static final FrontEnd nonLoggingInstance = new FrontEnd(false);
 
-        private FrontEnd() {
+        private final boolean logging;
+
+        private FrontEnd(final boolean logging) {
+            this.logging = logging;
         }
 
         public ConfigValue getValue(final ConfigSourceInterceptorContext context, final String name) {
@@ -155,11 +159,13 @@ public boolean hasNext() {
                         // get the replacement names
                         List<String> list = fn.apply(context, new NameIterator(next));
                         subIter = list.iterator();
-                        // todo: print these warnings when mapping the configuration so they cannot appear more than once
-                        if (list.isEmpty()) {
-                            log.warnf("Configuration property '%s' has been deprecated and will be ignored", next);
-                        } else {
-                            log.warnf("Configuration property '%s' has been deprecated and replaced by: %s", next, list);
+                        if (logging) {
+                            // todo: print these warnings when mapping the configuration so they cannot appear more than once
+                            if (list.isEmpty()) {
+                                log.warnf("Configuration property '%s' has been deprecated and will be ignored", next);
+                            } else {
+                                log.warnf("Configuration property '%s' has been deprecated and replaced by: %s", next, list);
+                            }
                         }
                     }
                     return true;
@@ -179,6 +185,10 @@ public String next() {
         public static FrontEnd instance() {
             return instance;
         }
+
+        public static FrontEnd nonLoggingInstance() {
+            return nonLoggingInstance;
+        }
     }
 
     /**

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/console/StartupLogCompressor.java b/core/deployment/src/main/java/io/quarkus/deployment/console/StartupLogCompressor.java
@@ -3,6 +3,7 @@
 import java.io.Closeable;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiPredicate;
@@ -26,18 +27,28 @@ public class StartupLogCompressor implements Closeable, BiPredicate<String, Bool
     final List<String> toDump = new ArrayList<>();
     final AtomicInteger COUNTER = new AtomicInteger();
     final Predicate<Thread> additionalThreadPredicate;
+    final Predicate<String> linePredicate; // test if we always print the line / log
 
     public StartupLogCompressor(String name,
             @SuppressWarnings("unused") Optional<ConsoleInstalledBuildItem> consoleInstalledBuildItem,
             @SuppressWarnings("unused") LoggingSetupBuildItem loggingSetupBuildItem) {
-        this(name, consoleInstalledBuildItem, loggingSetupBuildItem, (s) -> false);
+        this(name, consoleInstalledBuildItem, loggingSetupBuildItem, s -> false);
     }
 
     public StartupLogCompressor(String name,
             @SuppressWarnings("unused") Optional<ConsoleInstalledBuildItem> consoleInstalledBuildItem,
             @SuppressWarnings("unused") LoggingSetupBuildItem loggingSetupBuildItem,
             Predicate<Thread> additionalThreadPredicate) {
-        this.additionalThreadPredicate = additionalThreadPredicate;
+        this(name, consoleInstalledBuildItem, loggingSetupBuildItem, additionalThreadPredicate, s -> false);
+    }
+
+    public StartupLogCompressor(String name,
+            @SuppressWarnings("unused") Optional<ConsoleInstalledBuildItem> consoleInstalledBuildItem,
+            @SuppressWarnings("unused") LoggingSetupBuildItem loggingSetupBuildItem,
+            Predicate<Thread> additionalThreadPredicate,
+            Predicate<String> linePredicate) {
+        this.additionalThreadPredicate = Objects.requireNonNull(additionalThreadPredicate);
+        this.linePredicate = Objects.requireNonNull(linePredicate);
         if (QuarkusConsole.INSTANCE.isAnsiSupported()) {
             QuarkusConsole.installRedirects();
             this.name = name;
@@ -74,8 +85,8 @@ public void closeAndDumpCaptured() {
 
     @Override
     public boolean test(String s, Boolean errorStream) {
-        if (thread == null) {
-            //not installed
+        if (thread == null || linePredicate.test(s)) {
+            //not installed or line predicate tested to true
             return true;
         }
         Thread current = Thread.currentThread();

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageResourceConfigStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageResourceConfigStep.java
@@ -4,6 +4,7 @@
 import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
+import java.util.regex.Pattern;
 
 import io.quarkus.builder.Json;
 import io.quarkus.builder.Json.JsonArrayBuilder;
@@ -16,7 +17,6 @@
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourcePatternsBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
 import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild;
-import io.quarkus.util.GlobUtil;
 
 public class NativeImageResourceConfigStep {
 
@@ -35,14 +35,13 @@ void generateResourceConfig(BuildProducer<GeneratedResourceBuildItem> resourceCo
         for (NativeImageResourceBuildItem i : resources) {
             for (String path : i.getResources()) {
                 JsonObjectBuilder pat = Json.object();
-                pat.put("pattern", GlobUtil.toRegexPattern(path));
+                pat.put("pattern", Pattern.quote(path));
                 includes.add(pat);
             }
-            addListToJsonArray(includes, i.getResources());
         }
 
         for (ServiceProviderBuildItem i : serviceProviderBuildItems) {
-            includes.add(Json.object().put("pattern", GlobUtil.toRegexPattern(i.serviceDescriptorFile())));
+            includes.add(Json.object().put("pattern", Pattern.quote(i.serviceDescriptorFile())));
         }
 
         for (NativeImageResourcePatternsBuildItem resourcePatternsItem : resourcePatterns) {