Merge pull request #51343 from gsmet/3.30.2-backports-1

[3.30] 3.30.2 backports 1

Author: gsmet

bom/application/pom.xml

@@ -54,10 +54,10 @@
         <smallrye-graphql.version>2.16.0</smallrye-graphql.version>
         <smallrye-fault-tolerance.version>6.9.3</smallrye-fault-tolerance.version>
         <smallrye-jwt.version>4.6.2</smallrye-jwt.version>
-        <smallrye-context-propagation.version>2.2.1</smallrye-context-propagation.version>
+        <smallrye-context-propagation.version>2.3.0</smallrye-context-propagation.version>
         <smallrye-reactive-streams-operators.version>1.0.13</smallrye-reactive-streams-operators.version>
         <smallrye-reactive-types-converter.version>3.0.3</smallrye-reactive-types-converter.version>
-        <smallrye-mutiny-vertx-binding.version>3.20.3</smallrye-mutiny-vertx-binding.version>
+        <smallrye-mutiny-vertx-binding.version>3.20.4</smallrye-mutiny-vertx-binding.version>
         <smallrye-reactive-messaging.version>4.31.0</smallrye-reactive-messaging.version>
         <smallrye-stork.version>2.7.3</smallrye-stork.version>
         <jakarta.activation.version>2.1.4</jakarta.activation.version>
@@ -98,7 +98,7 @@
         <!-- See root POM for hibernate-orm.version, hibernate-reactive.version, hibernate-validator.version,
              hibernate-search.version, antlr.version, bytebuddy.version -->
         <narayana.version>7.3.3.Final</narayana.version>
-        <narayana-lra.version>1.0.2.Final</narayana-lra.version>
+        <narayana-lra.version>1.0.3.Final</narayana-lra.version>
         <agroal.version>2.8</agroal.version>
         <jboss-transaction-spi.version>8.0.0.Final</jboss-transaction-spi.version>
         <elasticsearch-opensource-components.version>9.1.5</elasticsearch-opensource-components.version>
@@ -137,7 +137,7 @@
         <brotli4j.version>1.16.0</brotli4j.version>
         <reactive-streams.version>1.0.4</reactive-streams.version>
         <jboss-logging.version>3.6.1.Final</jboss-logging.version>
-        <mutiny.version>3.0.1</mutiny.version>
+        <mutiny.version>3.0.3</mutiny.version>
         <jctools-core.version>4.0.5</jctools-core.version>
         <kafka3.version>4.0.1</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 -->

build-parent/pom.xml

@@ -31,7 +31,7 @@
 
         <!-- Jandex versions -->
         <jandex.version>3.5.2</jandex.version>
-        <jandex-gradle-plugin.version>1.0.0</jandex-gradle-plugin.version>
+        <jandex-gradle-plugin.version>2.3.0</jandex-gradle-plugin.version>
 
         <asciidoctorj.version>2.5.13</asciidoctorj.version>
         <htmlunit.version>4.18.0</htmlunit.version>

core/deployment/src/main/java/io/quarkus/deployment/builditem/DevServicesRegistryBuildItem.java

@@ -125,7 +125,7 @@ private void reallyStart(DevServicesResultBuildItem request, List<DevServicesCus
             startable.start();
 
             RunningService service = new RunningService(request.getName(), request.getDescription(),
-                    request.getConfig(startable), startable.getContainerId(), startable);
+                    request.getConfig(startable), request.getOverrideConfig(startable), startable.getContainerId(), startable);
             this.addRunningService(request.getName(), request.getServiceName(), request.getServiceConfig(), service);
 
             compressor.close();

core/deployment/src/main/java/io/quarkus/deployment/builditem/DevServicesResultBuildItem.java

@@ -6,6 +6,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -77,6 +78,7 @@ public final class DevServicesResultBuildItem extends MultiBuildItem {
      * A map of application config that is dependent on the started service
      */
     private final Map<String, Function<Startable, String>> applicationConfigProvider;
+    private final Set<String> highPriorityConfig;
 
     public static DiscoveredServiceBuilder discovered() {
         return new DiscoveredServiceBuilder();
@@ -106,6 +108,7 @@ public DevServicesResultBuildItem(String name, String description, String contai
         this.serviceName = null;
         this.serviceConfig = null;
         this.applicationConfigProvider = null;
+        this.highPriorityConfig = null;
         this.startableSupplier = null;
         this.postStartAction = null;
     }
@@ -121,7 +124,7 @@ public DevServicesResultBuildItem(String name,
             Map<String, String> config,
             Supplier<Startable> startableSupplier,
             Consumer<Startable> postStartAction,
-            Map<String, Function<Startable, String>> applicationConfigProvider) {
+            Map<String, Function<Startable, String>> applicationConfigProvider, Set<String> highPriorityConfig) {
         this.name = name;
         this.description = description;
         this.containerId = null;
@@ -131,6 +134,7 @@ public DevServicesResultBuildItem(String name,
         this.startableSupplier = startableSupplier;
         this.postStartAction = postStartAction;
         this.applicationConfigProvider = applicationConfigProvider;
+        this.highPriorityConfig = highPriorityConfig;
     }
 
     public String getName() {
@@ -175,6 +179,7 @@ public Map<String, Function<Startable, String>> getApplicationConfigProvider() {
 
     public Map<String, String> getConfig(Startable startable) {
         SupplierMap<String, String> map = new SupplierMap<>();
+        // To make sure static config does make it into a config source, include it here
         if (config != null && !config.isEmpty()) {
             map.putAll(config);
         }
@@ -186,6 +191,22 @@ public Map<String, String> getConfig(Startable startable) {
         return map;
     }
 
+    /**
+     * @deprecated Subject to changes due to <a href="https://github.com/quarkusio/quarkus/pull/51209">#51209</a>
+     */
+    @Deprecated(forRemoval = true)
+    public Map<String, String> getOverrideConfig(Startable startable) {
+
+        SupplierMap<String, String> map = new SupplierMap<>();
+
+        if (highPriorityConfig != null) {
+            for (String key : highPriorityConfig) {
+                map.put(key, () -> applicationConfigProvider.get(key).apply(startable));
+            }
+        }
+        return map;
+    }
+
     public static class DiscoveredServiceBuilder {
         private String name;
         private String containerId;
@@ -226,10 +247,8 @@ public DevServicesResultBuildItem build() {
     }
 
     public static class OwnedServiceBuilder<T extends Startable> {
-
         private static final String IO_QUARKUS_DEVSERVICES_CONFIG_BUILDER_CLASS = "io.quarkus.devservice.runtime.config.DevServicesConfigBuilder";
-        private static final boolean CONFIG_BUILDER_AVAILABLE = isClassAvailable(
-                IO_QUARKUS_DEVSERVICES_CONFIG_BUILDER_CLASS);
+        private static final boolean CONFIG_BUILDER_AVAILABLE = isClassAvailable(IO_QUARKUS_DEVSERVICES_CONFIG_BUILDER_CLASS);
 
         private String name;
         private String description;
@@ -239,6 +258,7 @@ public static class OwnedServiceBuilder<T extends Startable> {
         private Supplier<? extends Startable> startableSupplier;
         private Consumer<? extends Startable> postStartAction;
         private Map<String, Function<Startable, String>> applicationConfigProvider;
+        private Set<String> highPriorityConfig;
 
         public OwnedServiceBuilder<T> name(String name) {
             this.name = name;
@@ -286,6 +306,15 @@ public OwnedServiceBuilder<T> postStartHook(Consumer<T> postStartAction) {
             return this;
         }
 
+        /**
+         * @deprecated Subject to changes due to <a href="https://github.com/quarkusio/quarkus/pull/51209">#51209</a>
+         */
+        @Deprecated(forRemoval = true)
+        public OwnedServiceBuilder<T> highPriorityConfig(Set<String> highPriorityConfig) {
+            this.highPriorityConfig = highPriorityConfig;
+            return this;
+        }
+
         /**
          * Provides config to inject into the config system. If you've got values that don't change, use config(), and if you've
          * got values that you'll only know after starting the container, use configProvider() and provide a map of
@@ -306,7 +335,7 @@ public DevServicesResultBuildItem build() {
             return new DevServicesResultBuildItem(name, description, serviceName, serviceConfig, config,
                     (Supplier<Startable>) startableSupplier,
                     (Consumer<Startable>) postStartAction,
-                    applicationConfigProvider);
+                    applicationConfigProvider, highPriorityConfig);
         }
 
         private static boolean isClassAvailable(String className) {

core/deployment/src/main/java/io/quarkus/deployment/console/StartupLogCompressor.java

@@ -69,15 +69,19 @@ public void close() {
             return;
         }
         QuarkusConsole.removeOutputFilter(this);
-        sl.close();
+        if (sl != null) {
+            sl.close();
+        }
     }
 
     public void closeAndDumpCaptured() {
         if (thread == null) {
             return;
         }
         QuarkusConsole.removeOutputFilter(this);
-        sl.close();
+        if (sl != null) {
+            sl.close();
+        }
         for (var i : toDump) {
             QuarkusConsole.INSTANCE.write(true, i);
         }
@@ -92,7 +96,9 @@ public boolean test(String s, Boolean errorStream) {
         Thread current = Thread.currentThread();
         if (current == this.thread || additionalThreadPredicate.test(current)) {
             toDump.add(s);
-            sl.setMessage(MessageFormat.BLUE + name + MessageFormat.RESET + " " + s.replace("\n", ""));
+            if (sl != null) {
+                sl.setMessage(MessageFormat.BLUE + name + MessageFormat.RESET + " " + s.replace("\n", ""));
+            }
             return false;
         }
         return true;

core/deployment/src/main/java/io/quarkus/deployment/images/ContainerImages.java

@@ -9,7 +9,7 @@
  * <p>
  * - {@code x_IMAGE_NAME} - the name of the image without the version (e.g. {@code registry.access.redhat.com/ubi9/ubi-minimal})
  * - {@code x_VERSION} - the version of the image (e.g. {@code 9.5})
- * - {@code x} - the full image name (e.g. {@code registry.access.redhat.com/ubi9/ubi-minimal:9.6})
+ * - {@code x} - the full image name (e.g. {@code registry.access.redhat.com/ubi9/ubi-minimal:9.7})
  */
 public class ContainerImages {
 
@@ -23,7 +23,7 @@ public class ContainerImages {
     /**
      * UBI 9 version
      */
-    public static final String UBI9_VERSION = "9.6";
+    public static final String UBI9_VERSION = "9.7";
 
     /**
      * Version used for more UBI8 Java images.

core/runtime/src/main/java/io/quarkus/devservices/crossclassloader/runtime/RunningService.java

@@ -16,14 +16,17 @@ public final class RunningService implements Closeable {
     private final String feature;
     private final String description;
     private final Map<String, String> configs;
+    private final Map<String, String> overrideConfigs;
     private final String containerId;
     private final Closeable closeable;
 
-    public RunningService(String feature, String description, Map<String, String> configs, String containerId,
+    public RunningService(String feature, String description, Map<String, String> configs, Map<String, String> overrideConfig,
+            String containerId,
             Closeable closeable) {
         this.feature = feature;
         this.description = description;
         this.configs = configs;
+        this.overrideConfigs = overrideConfig;
         this.containerId = containerId;
         this.closeable = closeable;
     }
@@ -45,8 +48,15 @@ public Map<String, String> configs() {
         return configs;
     }
 
+    /**
+     * @deprecated Subject to changes due to <a href="https://github.com/quarkusio/quarkus/pull/51209">#51209</a>
+     */
+    @Deprecated(forRemoval = true)
+    public Map<String, String> overrideConfigs() {
+        return overrideConfigs;
+    }
+
     public String containerId() {
         return containerId;
     }
-
 }

devtools/bom-descriptor-json/src/main/resources/catalog-overrides.json

@@ -147,7 +147,7 @@
       "codestart-data": {
         "tooling-dockerfiles.dockerfile.jvm.from-template": "registry.access.redhat.com/ubi9/openjdk-{java.version}:1.23",
         "tooling-dockerfiles.dockerfile.jvm.from": "registry.access.redhat.com/ubi9/openjdk-${recommended-java-version}:1.23",
-        "tooling-dockerfiles.dockerfile.native.from": "registry.access.redhat.com/ubi9/ubi-minimal:9.6",
+        "tooling-dockerfiles.dockerfile.native.from": "registry.access.redhat.com/ubi9/ubi-minimal:9.7",
         "tooling-dockerfiles.dockerfile.native-micro.from": "quay.io/quarkus/ubi9-quarkus-micro-image:2.0"
       },
       "properties": {

docs/src/main/asciidoc/deploying-to-openshift.adoc

@@ -58,7 +58,7 @@ The following table outlines the build strategies that {project-name} supports:
 == Bootstrapping the project
 
 First, you need a new project that contains the OpenShift extension.
-Then, before you build and deploy our application, you must log into an OpenShift cluster.
+Then, before you build and deploy your application, you must log into an OpenShift cluster.
 
 === Adding the OpenShift extension
 
@@ -104,7 +104,7 @@ However, if you want to continue to use `DeploymentConfig`, it is still possible
 +
 [source,bash,subs="+quotes,attributes+"]
 ----
-quarkus extension add 'quarkus-openshift'
+quarkus extension add quarkus-openshift
 ----
 
 == Logging in to an {openshift} cluster

docs/src/main/asciidoc/grpc-generation-reference.adoc

@@ -307,7 +307,7 @@ If you are using Gradle, you can use the following configuration:
 [source, gradle, subs=attributes+]
 ----
 plugins {
-    id 'org.kordamp.gradle.jandex' version '1.1.0'
+    id 'org.kordamp.gradle.jandex' version '{jandex-gradle-plugin-version}'
 }
 ----