Merge pull request #46735 from gsmet/3.19.3-backports-1

[3.19] 3.19.3 backports 1

Author: gsmet

bom/application/pom.xml

@@ -28,11 +28,11 @@
         <parsson.version>1.1.7</parsson.version>
         <resteasy-microprofile.version>3.0.1.Final</resteasy-microprofile.version>
         <resteasy-spring-web.version>3.2.0.Final</resteasy-spring-web.version>
-        <resteasy.version>6.2.11.Final</resteasy.version>
+        <resteasy.version>6.2.12.Final</resteasy.version>
         <opentelemetry-instrumentation.version>2.10.0-alpha</opentelemetry-instrumentation.version>
         <opentelemetry-semconv.version>1.29.0-alpha</opentelemetry-semconv.version>
         <quarkus-http.version>5.3.4</quarkus-http.version>
-        <micrometer.version>1.14.4</micrometer.version><!-- keep in sync with hdrhistogram: https://central.sonatype.com/artifact/io.micrometer/micrometer-core -->
+        <micrometer.version>1.14.5</micrometer.version><!-- keep in sync with hdrhistogram: https://central.sonatype.com/artifact/io.micrometer/micrometer-core -->
         <hdrhistogram.version>2.2.2</hdrhistogram.version><!-- keep in sync with micrometer -->
         <google-auth.version>0.22.0</google-auth.version>
         <graphql-java.version>22.2</graphql-java.version> <!-- keep in sync with smallrye-graphql -->
@@ -177,7 +177,7 @@
         <mockito.version>5.15.2</mockito.version>
         <jna.version>5.8.0</jna.version><!-- should satisfy both testcontainers and mongodb -->
         <quarkus-security.version>2.2.0</quarkus-security.version>
-        <keycloak-client.version>26.0.3</keycloak-client.version>
+        <keycloak-client.version>26.0.4</keycloak-client.version>
         <logstash-gelf.version>1.15.1</logstash-gelf.version>
         <checker-qual.version>3.49.0</checker-qual.version>
         <error-prone-annotations.version>2.36.0</error-prone-annotations.version>
@@ -195,7 +195,7 @@
         <avro.version>1.12.0</avro.version>
         <apicurio-registry.version>2.6.8.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.20.5</testcontainers.version> <!-- Make sure to also update docker-java.version to match its needs -->
+        <testcontainers.version>1.20.6</testcontainers.version> <!-- Make sure to also update docker-java.version to match its needs -->
         <docker-java.version>3.4.1</docker-java.version> <!-- must be the version Testcontainers use: https://central.sonatype.com/artifact/org.testcontainers/testcontainers -->
         <!-- Check the compatibility matrix (https://github.com/opensearch-project/opensearch-testcontainers) before upgrading: -->
         <opensearch-testcontainers.version>2.0.2</opensearch-testcontainers.version>

bom/dev-ui/pom.xml

@@ -13,7 +13,7 @@
     <description>Dependency management for dev-ui. Importable by third party extension developers.</description>
 
     <properties>
-        <vaadin.version>24.6.2</vaadin.version>
+        <vaadin.version>24.6.6</vaadin.version>
         <lit.version>3.2.1</lit.version>
         <lit-element.version>4.1.1</lit-element.version>
         <lit-html.version>3.2.1</lit-html.version>
@@ -31,7 +31,7 @@
         <es-module-shims.version>2.0.9</es-module-shims.version>
         <path-to-regexp.version>2.4.0</path-to-regexp.version>
         <codeblock.version>1.0.17</codeblock.version>
-        <qomponent.version>1.0.1</qomponent.version>
+        <qomponent.version>1.0.3</qomponent.version>
 
         <hpcc-js-wasm.version>2.15.3</hpcc-js-wasm.version>
         <yargs.version>17.7.2</yargs.version>

build-parent/pom.xml

@@ -95,7 +95,7 @@
         <junit4.version>4.13.2</junit4.version>
 
         <!-- The image to use for tests that run Keycloak -->
-        <keycloak.server.version>26.0.7</keycloak.server.version>
+        <keycloak.server.version>26.1.3</keycloak.server.version>
         <keycloak.wildfly.version>19.0.3</keycloak.wildfly.version>
         <keycloak.docker.image>quay.io/keycloak/keycloak:${keycloak.server.version}</keycloak.docker.image>
         <keycloak.docker.legacy.image>quay.io/keycloak/keycloak:${keycloak.wildfly.version}-legacy</keycloak.docker.legacy.image>

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

@@ -431,7 +431,6 @@ private DevModeCommandLine newLauncher(final AnalyticsService analyticsService)
         if (getModules().isPresent() && !getModules().get().isEmpty()) {
             builder.addModules(getModules().get());
         }
-
         for (Map.Entry<String, ?> e : project.getProperties().entrySet()) {
             if (e.getValue() instanceof String) {
                 builder.buildSystemProperty(e.getKey(), e.getValue().toString());
@@ -448,11 +447,14 @@ private DevModeCommandLine newLauncher(final AnalyticsService analyticsService)
         builder.extensionDevModeConfig(appModel.getExtensionDevModeConfig())
                 .extensionDevModeJvmOptionFilter(extensionJvmOptions);
 
+        builder.jvmArgs("-Dgradle.project.path="
+                + getProject().getLayout().getProjectDirectory().getAsFile().getAbsolutePath());
+
         analyticsService.sendAnalytics(
                 DEV_MODE,
                 appModel,
                 Map.of(GRADLE_VERSION, getProject().getGradle().getGradleVersion()),
-                getProject().getBuildDir().getAbsoluteFile());
+                getProject().getLayout().getBuildDirectory().getAsFile().get());
 
         final Set<ArtifactKey> projectDependencies = new HashSet<>();
         for (ResolvedDependency localDep : DependenciesFilter.getReloadableModules(appModel)) {
@@ -545,6 +547,7 @@ private void addQuarkusDevModeDeps(DevModeCommandLineBuilder builder, Applicatio
                         configuration.setCanBeConsumed(false);
                         configuration.extendsFrom(platformConfig);
                         configuration.getDependencies().add(getQuarkusGradleBootstrapResolver());
+                        configuration.getDependencies().add(getQuarkusMavenBootstrapResolver());
                         configuration.getDependencies().add(getQuarkusCoreDeployment(appModel));
                     });
             devModeDependencyConfiguration = getProject().getConfigurations()
@@ -568,7 +571,15 @@ private void addQuarkusDevModeDeps(DevModeCommandLineBuilder builder, Applicatio
     }
 
     private Dependency getQuarkusGradleBootstrapResolver() {
-        final String pomPropsPath = "META-INF/maven/io.quarkus/quarkus-bootstrap-gradle-resolver/pom.properties";
+        return getQuarkusBootstrapResolver("quarkus-bootstrap-gradle-resolver");
+    }
+
+    private Dependency getQuarkusMavenBootstrapResolver() {
+        return getQuarkusBootstrapResolver("quarkus-bootstrap-maven-resolver");
+    }
+
+    private Dependency getQuarkusBootstrapResolver(String artifactId) {
+        final String pomPropsPath = "META-INF/maven/io.quarkus/" + artifactId + "/pom.properties";
         final InputStream devModePomPropsIs = DevModeMain.class.getClassLoader().getResourceAsStream(pomPropsPath);
         if (devModePomPropsIs == null) {
             throw new GradleException("Failed to locate " + pomPropsPath + " on the classpath");
@@ -591,9 +602,8 @@ private Dependency getQuarkusGradleBootstrapResolver() {
         if (devModeVersion == null) {
             throw new GradleException("Classpath resource " + pomPropsPath + " is missing version");
         }
-        Dependency gradleResolverDep = getProject().getDependencies()
+        return getProject().getDependencies()
                 .create(String.format("%s:%s:%s", devModeGroupId, devModeArtifactId, devModeVersion));
-        return gradleResolverDep;
     }
 
     private Dependency getQuarkusCoreDeployment(ApplicationModel appModel) {

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

@@ -7,7 +7,7 @@ https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 include::_attributes.adoc[]
 :diataxis-type: howto
 :categories: core
-:summary: Optionally, use `application.yaml` instead of `application.properties` to configure your application.
+:summary: Optionally, use application.yaml instead of application.properties to configure your application.
 :topics: configuration
 :extensions: io.quarkus:quarkus-config-yaml
 

docs/src/main/asciidoc/maven-tooling.adoc

@@ -295,7 +295,7 @@ A user may choose to disable all the Java options provided by extensions by conf
                 <version>${quarkus.platform.version}</version>
                 <configuration>
                     <extensionJvmOptions>
-                        <disableAll>false</disableAll>
+                        <disableAll>true</disableAll>
                     </extensionJvmOptions>
                 </configuration>
             </plugin>

docs/src/main/asciidoc/rest.adoc

@@ -1407,7 +1407,7 @@ Instead of importing `io.quarkus:quarkus-rest`, you can import either of the fol
 |https://github.com/FasterXML/jackson[Jackson support]
 
 |`io.quarkus:quarkus-rest-jsonb`
-|https://eclipse-ee4j.github.io/jsonb-api/[JSON-B support]
+|https://github.com/jakartaee/jsonb-api/[JSON-B support]
 
 |===
 
@@ -1624,7 +1624,7 @@ public User userPrivate() {
 }
 ----
 
-When the result the `userPublic` method is serialized, the `id` field will not be contained in the response as the `Public` view does not include it.
+When the result of the `userPublic` method is serialized, the `id` field will not be contained in the response as the `Public` view does not include it.
 The result of `userPrivate` however will include the `id` as expected when serialized.
 
 ===== Reflection-free Jackson serialization

docs/src/main/asciidoc/security-keycloak-authorization.adoc

@@ -319,8 +319,7 @@ docker run --name keycloak \
   quay.io/keycloak/keycloak:{keycloak.version} \ <1>
   start --hostname-strict=false --https-key-store-file=/etc/keycloak-keystore.jks <2>
 ----
-
-<1> For `keycloak.version`, ensure the version is `26.0.7` or later.
+<1> For `keycloak.version`, ensure the version is `26.1.3` or later.
 <2> For Keycloak keystore, use the `keycloak-keystore.jks` file located at https://github.com/quarkusio/quarkus-quickstarts/blob/main/security-keycloak-authorization-quickstart/config/keycloak-keystore.jks[quarkus-quickstarts/security-keycloak-authorization-quickstart/config].
 
 .Accessing the Keycloak server

docs/src/main/asciidoc/security-oidc-bearer-token-authentication-tutorial.adoc

@@ -217,7 +217,7 @@ For more information, see the <<bearer-token-tutorial-keycloak-dev-mode>> sectio
 docker run --name keycloak -e KC_BOOTSTRAP_ADMIN_USERNAME=admin -e KC_BOOTSTRAP_ADMIN_PASSWORD=admin -p 8180:8080 quay.io/keycloak/keycloak:{keycloak.version} start-dev
 ----
 ====
-* Where the `keycloak.version` is set to version `26.0.7` or later.
+* Where the `keycloak.version` is set to version `26.1.3` or later.
 . You can access your Keycloak server at http://localhost:8180[localhost:8180].
 . To access the Keycloak Administration console, log in as the `admin` user by using the following login credentials:
 

docs/src/main/asciidoc/security-oidc-code-flow-authentication-tutorial.adoc

@@ -201,7 +201,7 @@ To start a Keycloak server, use Docker and run the following command:
 docker run --name keycloak -e KC_BOOTSTRAP_ADMIN_USERNAME=admin -e KC_BOOTSTRAP_ADMIN_PASSWORD=admin -p 8180:8080 quay.io/keycloak/keycloak:{keycloak.version} start-dev
 ----
 
-where `keycloak.version` is set to `26.0.7` or later.
+where `keycloak.version` is set to `26.1.3` or later.
 
 You can access your Keycloak Server at http://localhost:8180[localhost:8180].