Merge pull request #48390 from gsmet/3.23.4-backports-1

[3.23] 3.23.4 backports 1

Author: gsmet

.github/dependabot.yml

@@ -81,12 +81,13 @@ updates:
       - dependency-name: org.awaitility:awaitility
       - dependency-name: com.thoughtworks.xstream:xstream
       - dependency-name: org.jacoco:*
-      # Maven plugins
+      # Maven plugins and extensions
       - dependency-name: org.apache.maven.plugins:*
       - dependency-name: org.codehaus.mojo:*
       - dependency-name: io.fabric8:docker-maven-plugin
       - dependency-name: net.revelc.code.formatter:formatter-maven-plugin
       - dependency-name: net.revelc.code:impsort-maven-plugin
+      - dependency-name: eu.maveniverse.maven.njord:*
       # Narayana
       - dependency-name: org.jboss.narayana.jta:*
       - dependency-name: org.jboss.narayana.jts:*

.mvn/extensions.xml

@@ -27,6 +27,6 @@
     <extension>
         <groupId>eu.maveniverse.maven.njord</groupId>
         <artifactId>extension</artifactId>
-        <version>0.7.4</version>
+        <version>0.7.5</version>
     </extension>
 </extensions>

bom/application/pom.xml

@@ -47,10 +47,10 @@
         <microprofile-lra.version>2.0.1</microprofile-lra.version>
         <microprofile-openapi.version>4.0.2</microprofile-openapi.version>
         <smallrye-common.version>2.12.0</smallrye-common.version>
-        <smallrye-config.version>3.13.1</smallrye-config.version>
+        <smallrye-config.version>3.13.2</smallrye-config.version>
         <smallrye-health.version>4.2.0</smallrye-health.version>
         <smallrye-metrics.version>4.0.0</smallrye-metrics.version>
-        <smallrye-open-api.version>4.0.10</smallrye-open-api.version>
+        <smallrye-open-api.version>4.0.11</smallrye-open-api.version>
         <smallrye-graphql.version>2.13.0</smallrye-graphql.version>
         <smallrye-fault-tolerance.version>6.9.1</smallrye-fault-tolerance.version>
         <smallrye-jwt.version>4.6.2</smallrye-jwt.version>
@@ -119,7 +119,7 @@
         <quartz.version>2.5.0</quartz.version>
         <h2.version>2.3.230</h2.version> <!-- When updating, needs to be matched in io.quarkus.hibernate.orm.runtime.config.DialectVersions
                                               and the dependency jts-core needs to be updated in extensions/jdbc/jdbc-h2/runtime/pom.xml -->
-        <postgresql-jdbc.version>42.7.6</postgresql-jdbc.version>
+        <postgresql-jdbc.version>42.7.7</postgresql-jdbc.version>
         <mariadb-jdbc.version>3.5.3</mariadb-jdbc.version>
         <mysql-jdbc.version>8.3.0</mysql-jdbc.version>
         <mssql-jdbc.version>12.8.1.jre11</mssql-jdbc.version>
@@ -194,7 +194,7 @@
         <log4j2-api.version>2.24.3</log4j2-api.version>
         <log4j-jboss-logmanager.version>1.3.1.Final</log4j-jboss-logmanager.version>
         <avro.version>1.12.0</avro.version>
-        <apicurio-registry.version>2.6.9.Final</apicurio-registry.version>
+        <apicurio-registry.version>2.6.12.Final</apicurio-registry.version>
         <apicurio-common-rest-client.version>0.1.18.Final</apicurio-common-rest-client.version> <!-- must be the version Apicurio Registry uses -->
         <testcontainers.version>1.21.1</testcontainers.version> <!-- Make sure to also update docker-java.version to match its needs -->
         <docker-java.version>3.4.2</docker-java.version> <!-- must be the version Testcontainers use: https://central.sonatype.com/artifact/org.testcontainers/testcontainers -->

build-parent/pom.xml

@@ -136,9 +136,6 @@
         <!-- The message that is appended to the end of the plugin error output when the API problems fail the build -->
         <revapi.buildFailureMessage>Run "jbang revapi-update" to update api-changes.xml file and also add the justification for those changes in that file.</revapi.buildFailureMessage>
 
-        <!-- Forbidden API checks -->
-        <forbiddenapis-maven-plugin.version>3.4</forbiddenapis-maven-plugin.version>
-
         <!-- platform properties - this is a floating tag -->
         <platform.quarkus.native.builder-image>mandrel</platform.quarkus.native.builder-image>
 
@@ -622,7 +619,6 @@
                 <plugin>
                     <groupId>de.thetaphi</groupId>
                     <artifactId>forbiddenapis</artifactId>
-                    <version>${forbiddenapis-maven-plugin.version}</version>
                     <executions>
                         <execution>
                             <id>verify-forbidden-apis</id>

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/QuarkusPlugin.java

@@ -249,9 +249,9 @@ private void registerTasks(Project project, QuarkusPluginExtension quarkusExt) {
                 QuarkusBuildDependencies.class,
                 task -> {
                     configureQuarkusBuildTask(project, task, quarkusBuildAppModelTask, serviceProvider);
-
                     task.getOutputs().doNotCacheIf("Dependencies are never cached", t -> true);
                 });
+        project.afterEvaluate(evaluated -> addDependencyOnJandexIfConfigured(evaluated, quarkusBuildDependencies));
 
         Property<Boolean> cacheLargeArtifacts = quarkusExt.getCacheLargeArtifacts();
 
@@ -646,7 +646,7 @@ private void visitProjectDep(Project project, Project dep, Set<String> visited)
     }
 
     private void setupQuarkusBuildTaskDeps(Project project, Project dep, Set<String> visited) {
-        if (!visited.add(dep.getGroup() + ":" + dep.getName())) {
+        if (!visited.add(dep.getPath())) {
             return;
         }
 
@@ -663,18 +663,24 @@ private void setupQuarkusBuildTaskDeps(Project project, Project dep, Set<String>
                 });
 
         getLazyTask(project, QUARKUS_DEV_TASK_NAME).ifPresent(quarkusDev -> {
-            for (String taskName : new String[] { JavaPlugin.PROCESS_RESOURCES_TASK_NAME,
-                    // This is the task of the 'org.kordamp.gradle.jandex' Gradle plugin
-                    "jandex",
-                    // This is the task of the 'com.github.vlsi.jandex' Gradle plugin
-                    "processJandexIndex" }) {
-                getLazyTask(dep, taskName).ifPresent(t -> quarkusDev.configure(qd -> qd.dependsOn(t)));
-            }
+            getLazyTask(project, JavaPlugin.PROCESS_RESOURCES_TASK_NAME)
+                    .ifPresent(t -> quarkusDev.configure(qd -> qd.dependsOn(t)));
+            addDependencyOnJandexIfConfigured(dep, quarkusDev);
         });
 
         visitProjectDependencies(project, dep, visited);
     }
 
+    private void addDependencyOnJandexIfConfigured(Project project, TaskProvider<? extends Task> quarkusTask) {
+        for (String taskName : new String[] {
+                // This is the task of the 'org.kordamp.gradle.jandex' Gradle plugin
+                "jandex",
+                // This is the task of the 'com.github.vlsi.jandex' Gradle plugin
+                "processJandexIndex" }) {
+            getLazyTask(project, taskName).ifPresent(t -> quarkusTask.configure(qd -> qd.mustRunAfter(t)));
+        }
+    }
+
     protected void visitProjectDependencies(Project project, Project dep, Set<String> visited) {
         final Configuration compileConfig = dep.getConfigurations().findByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME);
         if (compileConfig != null) {
@@ -711,13 +717,9 @@ protected void visitProjectDependencies(Project project, Project dep, Set<String
     private void visitLocalProject(Project project, Project localProject, Set<String> visited) {
         // local dependency, so we collect also its dependencies
         visitProjectDep(project, localProject, visited);
-
-        ExtensionDependency<?> extensionDependency = DependencyUtils
-                .getExtensionInfoOrNull(project, localProject);
-
-        if (extensionDependency instanceof ProjectExtensionDependency) {
-            visitProjectDep(project,
-                    ((ProjectExtensionDependency) extensionDependency).getDeploymentModule(), visited);
+        ExtensionDependency<?> extensionDependency = DependencyUtils.getExtensionInfoOrNull(project, localProject);
+        if (extensionDependency instanceof ProjectExtensionDependency projectExtDep) {
+            visitProjectDep(project, projectExtDep.getDeploymentModule(), visited);
         }
     }
 

devtools/gradle/gradle/libs.versions.toml

@@ -3,7 +3,7 @@ plugin-publish = "1.3.1"
 
 # updating Kotlin here makes QuarkusPluginTest > shouldNotFailOnProjectDependenciesWithoutMain(Path) fail
 kotlin = "2.0.21"
-smallrye-config = "3.13.1"
+smallrye-config = "3.13.2"
 
 junit5 = "5.12.2"
 assertj = "3.27.3"

docs/src/main/asciidoc/config-mappings.adoc

@@ -537,6 +537,7 @@ requires a spy:
 [source,java]
 ----
 @ConfigMapping(prefix = "app")
+@Unremovable
 public interface AppConfig {
     @WithDefault("app")
     String name();

docs/src/main/asciidoc/vertx-reference.adoc

@@ -704,7 +704,7 @@ The `EventBus` object provides methods to:
 [source, java]
 ----
 // Case 1
-bus.sendAndForget("greeting", name)
+bus.send("greeting", name)
 // Case 2
 bus.publish("greeting", name)
 // Case 3
@@ -730,7 +730,7 @@ Read xref:./virtual-threads.adoc[the virtual thread guide] for more details.
 
 === Use codecs
 
-The https://vertx.io/docs/vertx-core/java/#event_bus[Vert.x Event Bus] uses https://vertx.io/docs/vertx-core/java/#_message_codecs[codecs] to _serialize_ and _deserialize_ message objects.
+The link:++https://vertx.io/docs/vertx-core/java/#event_bus++[Vert.x Event Bus] uses link:++https://vertx.io/docs/vertx-core/java/#_message_codecs++[codecs] to _serialize_ and _deserialize_ message objects.
 Quarkus provides a default codec for local delivery.
 This codec is automatically used for return types and message body parameters of local consumers, i.e. methods annotated with `@ConsumeEvent` where `ConsumeEvent#local() == true` (which is the default).
 

extensions/devservices/common/src/main/java/io/quarkus/devservices/common/DatasourceServiceConfigurator.java

@@ -21,9 +21,13 @@ default String getJdbcUrl(ContainerAddress containerAddress, String databaseName
 
     String getJdbcPrefix();
 
+    default String getParametersStartCharacter() {
+        return "?";
+    }
+
     default String getParameters(Map<String, String> labels) {
         String parameters = labels.get(Labels.COMPOSE_JDBC_PARAMETERS);
-        return StringUtil.isNullOrEmpty(parameters) ? "" : "?" + parameters;
+        return StringUtil.isNullOrEmpty(parameters) ? "" : getParametersStartCharacter() + parameters;
     }
 
 }

extensions/devservices/deployment/src/main/java/io/quarkus/devservices/deployment/compose/ComposeServiceWaitStrategyTarget.java

@@ -5,6 +5,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 
@@ -31,7 +32,11 @@ public class ComposeServiceWaitStrategyTarget implements WaitStrategyTarget, Sup
     public ComposeServiceWaitStrategyTarget(DockerClient dockerClient, Container container) {
         this.dockerClient = dockerClient;
         this.container = container;
-        this.exposedPorts = Arrays.stream(container.getPorts()).map(ContainerPort::getPrivatePort).toList();
+        this.exposedPorts = Arrays.stream(container.getPorts())
+                .filter(port -> port.getPublicPort() != null)
+                .map(ContainerPort::getPrivatePort)
+                .filter(Objects::nonNull)
+                .toList();
     }
 
     @Override