Merge branch 'main' into quarkusiogh-18820

.github/dependabot.yml

@@ -108,7 +108,6 @@ updates:
       - dependency-name: org.eclipse:yasson
       # AWS
       - dependency-name: com.amazonaws:*
-      - dependency-name: com.amazonaws.serverless:*
       # Azure
       - dependency-name: com.microsoft.azure.functions:*
       # Apache Commons

.github/native-tests.json

@@ -105,7 +105,7 @@
         {
             "category": "Misc2",
             "timeout": 65,
-            "test-modules": "hibernate-validator, test-extension, logging-gelf, bootstrap-config, mailer, native-config-profile",
+            "test-modules": "hibernate-validator, test-extension, logging-gelf, bootstrap-config, mailer, native-config-profile, locales",
             "os-name": "ubuntu-latest"
         },
         {

.github/quarkus-bot.yml

@@ -55,51 +55,50 @@ triage:
         - devtools/platform-descriptor-json/src/main/resources/templates/
     - labels: [area/hibernate-reactive, area/persistence]
       title: "hibernate.reactive"
+      expression: |
+        matches("hibernate", title) && matches("reactive", title)
+        && !matches("hibernate.validator", title)
+        && !matches("hibernate.search", titleBody)
       notify: [DavideD, gavinking, Sanne]
       directories:
         - extensions/hibernate-reactive
     - labels: [area/hibernate-orm, area/persistence]
       expression: |
-              matches("hibernate", title)
-              && !matches("hibernate.validator", title)
-              && !matches("hibernate.search", title)
-              && !matches("hibernate.reactive", title)
+        matches("hibernate", title) && !matches("reactive", title)
+        && !matches("hibernate.validator", title)
+        && !matches("hibernate.search", titleBody)
+        && !matches("hibernate.reactive", titleBody)
       notify: [gsmet, Sanne, yrodiere]
       directories:
-        - extensions/hibernate-orm/
-        - integration-tests/common-jpa-entities/
-        - integration-tests/jpa-derby/
-        - integration-tests/jpa-h2/
-        - integration-tests/jpa-mariadb/
-        - integration-tests/jpa-mssql/
-        - integration-tests/jpa-mysql/
-        - integration-tests/jpa-postgresql/
-        - integration-tests/jpa-postgresql-withxml/
-        - integration-tests/jpa-without-entity/
-        - integration-tests/jpa/
-        - integration-tests/infinispan-cache-jpa/
+        # No trailing slashes: we also match sibling directories starting with these names
+        - extensions/hibernate-orm
+        - extensions/hibernate-envers
+        - integration-tests/common-jpa-entities
+        - integration-tests/jpa
+        - integration-tests/hibernate-envers
+        - integration-tests/hibernate-orm-tenancy
+        - integration-tests/infinispan-cache-jpa
     - labels: [area/hibernate-search]
       title: "hibernate.search"
       notify: [gsmet, yrodiere]
       directories:
-        - extensions/hibernate-search-orm-elasticsearch/
-        - extensions/hibernate-search-orm-elasticsearch-aws/
-        - integration-tests/hibernate-search-orm-elasticsearch/
-        - integration-tests/hibernate-search-orm-elasticsearch-aws/
-        - extensions/elasticsearch-rest-client/
-        - extensions/elasticsearch-rest-client-common/
+        # No trailing slashes: we also match sibling directories starting with these names
+        - extensions/hibernate-search
+        - integration-tests/hibernate-search
     - labels: [area/elasticsearch]
       title: "elasticsearch"
       notify: [gsmet, yrodiere, loicmathieu]
       directories:
+        # No trailing slashes: we also match sibling directories starting with these names
         - extensions/elasticsearch
         - integration-tests/elasticsearch
     - labels: [area/hibernate-validator]
       title: "hibernate.validator"
       notify: [gsmet, yrodiere]
       directories:
-        - extensions/hibernate-validator/
-        - integration-tests/hibernate-validator/
+        # No trailing slashes: we also match sibling directories starting with these names
+        - extensions/hibernate-validator
+        - integration-tests/hibernate-validator
     - labels: [area/jaeger]
       title: "jaeger"
       notify: [radcortez]
@@ -311,6 +310,15 @@ triage:
       directories:
         - extensions/awt/
         - integration-tests/awt/
+        - integration-tests/no-awt/
+    - labels: [area/securepipeline]
+      expression: |
+              matches("FIPS", titleBody)
+              || matches("SunPKCS11-NSS-FIPS", titleBody)
+              || matches("NSS module", titleBody)
+              || matches("libnss", titleBody)
+      notify: [jerboaa, Karm]
+      notifyInPullRequest: true
     - labels: [area/artemis]
       directories:
         - extensions/artemis-core/

bom/application/pom.xml

@@ -16,7 +16,7 @@
     <properties>
         <bouncycastle.version>1.70</bouncycastle.version>
         <bouncycastle.fips.version>1.0.2.3</bouncycastle.fips.version>
-        <bouncycastle.tls.fips.version>1.0.12.2</bouncycastle.tls.fips.version>
+        <bouncycastle.tls.fips.version>1.0.12.3</bouncycastle.tls.fips.version>
         <findbugs.version>3.0.2</findbugs.version>
         <jandex.version>2.4.2.Final</jandex.version>
         <resteasy.version>4.7.5.Final</resteasy.version>
@@ -27,22 +27,22 @@
         <opentelemetry.version>1.11.0</opentelemetry.version>
         <opentelemetry-alpha.version>1.11.0-alpha</opentelemetry-alpha.version>
         <jaeger.version>1.8.0</jaeger.version>
-        <quarkus-http.version>4.1.6</quarkus-http.version>
-        <micrometer.version>1.8.2</micrometer.version>
+        <quarkus-http.version>4.1.7</quarkus-http.version>
+        <micrometer.version>1.8.3</micrometer.version>
         <google-auth.version>0.22.0</google-auth.version>
-        <microprofile-config-api.version>2.0</microprofile-config-api.version>
+        <microprofile-config-api.version>2.0.1</microprofile-config-api.version>
         <microprofile-metrics-api.version>3.0.1</microprofile-metrics-api.version>
         <microprofile-context-propagation.version>1.2</microprofile-context-propagation.version>
         <microprofile-opentracing-api.version>2.0</microprofile-opentracing-api.version>
         <microprofile-reactive-streams-operators.version>1.0.1</microprofile-reactive-streams-operators.version>
         <microprofile-rest-client.version>2.0</microprofile-rest-client.version>
         <microprofile-jwt.version>1.2</microprofile-jwt.version>
         <microprofile-lra.version>1.0</microprofile-lra.version>
-        <smallrye-common.version>1.9.0</smallrye-common.version>
-        <smallrye-config.version>2.9.0</smallrye-config.version>
+        <smallrye-common.version>1.10.0</smallrye-common.version>
+        <smallrye-config.version>2.9.1</smallrye-config.version>
         <smallrye-health.version>3.2.0</smallrye-health.version>
         <smallrye-metrics.version>3.0.4</smallrye-metrics.version>
-        <smallrye-open-api.version>2.1.17</smallrye-open-api.version>
+        <smallrye-open-api.version>2.1.20</smallrye-open-api.version>
         <smallrye-graphql.version>1.4.3</smallrye-graphql.version>
         <smallrye-opentracing.version>2.1.0</smallrye-opentracing.version>
         <smallrye-fault-tolerance.version>5.3.1</smallrye-fault-tolerance.version>
@@ -52,7 +52,7 @@
         <smallrye-reactive-types-converter.version>2.6.0</smallrye-reactive-types-converter.version>
         <smallrye-mutiny-vertx-binding.version>2.18.1</smallrye-mutiny-vertx-binding.version>
         <smallrye-reactive-messaging.version>3.14.0</smallrye-reactive-messaging.version>
-        <smallrye-stork.version>1.0.0</smallrye-stork.version>
+        <smallrye-stork.version>1.1.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>
@@ -93,9 +93,9 @@
         <hibernate-search.version>6.1.1.Final</hibernate-search.version>
         <narayana.version>5.12.4.Final</narayana.version>
         <jboss-transaction-api_1.2_spec.version>1.1.1.Final</jboss-transaction-api_1.2_spec.version>
-        <agroal.version>1.14</agroal.version>
+        <agroal.version>1.15</agroal.version>
         <jboss-transaction-spi.version>7.6.0.Final</jboss-transaction-spi.version>
-        <elasticsearch-opensource-components.version>8.0.0</elasticsearch-opensource-components.version>
+        <elasticsearch-opensource-components.version>8.0.1</elasticsearch-opensource-components.version>
         <!-- for the now proprietary components of Elasticsearch, we use the last Open Source version -->
         <elasticsearch-proprietary-components-keeping-old-opensource-version.version>7.10.2</elasticsearch-proprietary-components-keeping-old-opensource-version.version>
         <rxjava.version>2.2.21</rxjava.version>
@@ -107,7 +107,13 @@
         <wildfly-client-config.version>1.0.1.Final</wildfly-client-config.version>
         <wildfly-elytron.version>1.18.3.Final</wildfly-elytron.version>
         <jboss-threads.version>3.4.2.Final</jboss-threads.version>
-        <vertx.version>4.2.4</vertx.version>
+        <vertx.version>4.2.5</vertx.version>
+        <!--
+        Temporary fix, the client 4.2.5 does not work in the context of Quarkus (bug in the client)
+        The fix is shipped with this path release.
+        This property needs to be removed when we will update to Vert.x 4.2.6 or Vert.x 4.3.0
+        -->
+        <vertx.oracle-client.version>4.2.5.1</vertx.oracle-client.version>
         <httpclient.version>4.5.13</httpclient.version>
         <httpcore.version>4.4.15</httpcore.version>
         <httpasync.version>4.1.5</httpasync.version>
@@ -126,7 +132,7 @@
         <junit.jupiter.version>5.8.2</junit.jupiter.version>
         <junit-pioneer.version>1.5.0</junit-pioneer.version>
         <testng.version>6.14.2</testng.version>
-        <infinispan.version>13.0.5.Final</infinispan.version>
+        <infinispan.version>13.0.6.Final</infinispan.version>
         <infinispan.protostream.version>4.4.1.Final</infinispan.protostream.version>
         <caffeine.version>2.9.3</caffeine.version>
         <netty.version>4.1.74.Final</netty.version>
@@ -141,7 +147,6 @@
         <scala.version>2.12.13</scala.version>
         <aws-lambda-java.version>1.2.1</aws-lambda-java.version>
         <aws-lambda-java-events.version>3.11.0</aws-lambda-java-events.version>
-        <aws-lambda-serverless-java-container.version>1.6.1</aws-lambda-serverless-java-container.version>
         <aws-xray.version>2.11.0</aws-xray.version>
         <azure-functions-java-library.version>1.4.2</azure-functions-java-library.version>
         <kotlin.version>1.6.10</kotlin.version>
@@ -151,10 +156,9 @@
         <maven-invoker.version>3.0.1</maven-invoker.version>
         <awaitility.version>4.1.1</awaitility.version>
         <jboss-logmanager.version>1.0.9</jboss-logmanager.version>
-        <flyway.version>8.5.0</flyway.version>
+        <flyway.version>8.5.1</flyway.version>
         <yasson.version>1.0.11</yasson.version>
-        <liquibase.version>4.7.1</liquibase.version>
-        <liquibase-mongodb.version>4.7.1</liquibase-mongodb.version>
+        <liquibase.version>4.8.0</liquibase.version>
         <snakeyaml.version>1.30</snakeyaml.version>
         <osgi.version>6.0.0</osgi.version>
         <mongo-client.version>4.3.4</mongo-client.version>
@@ -174,7 +178,7 @@
         <quarkus-security.version>1.1.4.Final</quarkus-security.version>
         <keycloak.version>16.1.0</keycloak.version>
         <logstash-gelf.version>1.15.0</logstash-gelf.version>
-        <checker-qual.version>3.21.2</checker-qual.version>
+        <checker-qual.version>3.21.3</checker-qual.version>
         <error-prone-annotations.version>2.11.0</error-prone-annotations.version>
         <jib-core.version>0.20.0</jib-core.version>
         <google-http-client.version>1.41.4</google-http-client.version>
@@ -184,7 +188,7 @@
         <commons-compress.version>1.21</commons-compress.version>
         <gson.version>2.9.0</gson.version>
         <log4j2-jboss-logmanager.version>1.1.1.Final</log4j2-jboss-logmanager.version>
-        <log4j2-api.version>2.17.1</log4j2-api.version>
+        <log4j2-api.version>2.17.2</log4j2-api.version>
         <log4j-jboss-logmanager.version>1.3.0.Final</log4j-jboss-logmanager.version>
         <avro.version>1.11.0</avro.version>
         <apicurio-registry.version>2.2.0.Final</apicurio-registry.version>
@@ -195,8 +199,8 @@
         <aesh-readline.version>2.2</aesh-readline.version>
         <aesh.version>2.6</aesh.version>
         <!-- these two artifacts needs to be compatible together -->
-        <strimzi-oauth.version>0.9.0</strimzi-oauth.version>
-        <strimzi-oauth.nimbus.version>9.19</strimzi-oauth.nimbus.version>
+        <strimzi-oauth.version>0.10.0</strimzi-oauth.version>
+        <strimzi-oauth.nimbus.version>9.20</strimzi-oauth.nimbus.version>
         <java-buildpack-client.version>0.0.4</java-buildpack-client.version>
     </properties>
 
@@ -282,6 +286,13 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+            <dependency>
+                <!-- Temporarily override the version of the Oracle client, as a bug prevents the usage of the 4.2.5
+                version in Quarkus, instead, use 4.2.5.1. -->
+                <groupId>io.vertx</groupId>
+                <artifactId>vertx-oracle-client</artifactId>
+                <version>${vertx.oracle-client.version}</version>
+            </dependency>
 
             <!-- gRPC dependencies, imported as a BOM -->
             <dependency>
@@ -2614,7 +2625,7 @@
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-junit5-vertx</artifactId>
+                <artifactId>quarkus-test-vertx</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -2772,6 +2783,12 @@
                 <version>${dekorate.version}</version>
                 <classifier>noapt</classifier>
             </dependency>
+            <dependency>
+                <groupId>io.dekorate</groupId>
+                <artifactId>helm-annotations</artifactId>
+                <version>${dekorate.version}</version>
+                <classifier>noapt</classifier>
+            </dependency>
             <dependency>
                 <groupId>org.jboss.logging</groupId>
                 <artifactId>jboss-logging</artifactId>
@@ -4902,25 +4919,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>com.amazonaws.serverless</groupId>
-                <artifactId>aws-serverless-java-container-core</artifactId>
-                <version>${aws-lambda-serverless-java-container.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>javax.servlet-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.ws.rs</groupId>
-                        <artifactId>javax.ws.rs-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
 
             <dependency>
                 <groupId>com.microsoft.azure.functions</groupId>
@@ -4938,6 +4936,16 @@
                 <artifactId>awaitility</artifactId>
                 <version>${awaitility.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.awaitility</groupId>
+                <artifactId>awaitility-kotlin</artifactId>
+                <version>${awaitility.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.awaitility</groupId>
+                <artifactId>awaitility-scala</artifactId>
+                <version>${awaitility.version}</version>
+            </dependency>
             <dependency>
                 <groupId>de.flapdoodle.embed</groupId>
                 <artifactId>de.flapdoodle.embed.mongo</artifactId>
@@ -4977,7 +4985,7 @@
             <dependency>
                 <groupId>org.liquibase.ext</groupId>
                 <artifactId>liquibase-mongodb</artifactId>
-                <version>${liquibase-mongodb.version}</version>
+                <version>${liquibase.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.yaml</groupId>

build-parent/pom.xml

@@ -50,7 +50,7 @@
 
         <!-- Dev tools -->
         <freemarker.version>2.3.31</freemarker.version>
-        <commonmark.version>0.18.1</commonmark.version>
+        <commonmark.version>0.18.2</commonmark.version>
 
         <!-- Arquillian BOM -->
         <arquillian.version>1.5.0.Final</arquillian.version>
@@ -116,8 +116,8 @@
 
 
         <asciidoctor-maven-plugin.version>2.0.0</asciidoctor-maven-plugin.version>
-        <docker-maven-plugin.version>0.39.0</docker-maven-plugin.version>
-        <formatter-maven-plugin.version>2.17.1</formatter-maven-plugin.version>
+        <docker-maven-plugin.version>0.39.1</docker-maven-plugin.version>
+        <formatter-maven-plugin.version>2.18.0</formatter-maven-plugin.version>
         <impsort-maven-plugin.version>1.6.2</impsort-maven-plugin.version>
         <maven-invoker-plugin.version>3.2.2</maven-invoker-plugin.version>
         <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>

core/deployment/src/main/java/io/quarkus/deployment/ApplicationArchive.java

@@ -66,7 +66,7 @@ public interface ApplicationArchive {
     PathsCollection getPaths();
 
     /**
-     * 
+     *
      * @return The paths representing the application root paths.
      */
     PathCollection getResolvedPaths();
@@ -85,7 +85,7 @@ public interface ApplicationArchive {
 
     /**
      * Applies a function to the content tree of the archive.
-     * 
+     *
      * @param <T> result type of the function
      * @param func function to apply
      * @return the result of the function
@@ -94,7 +94,7 @@ public interface ApplicationArchive {
 
     /**
      * Accepts a consumer for the content tree of the archive.
-     * 
+     *
      * @param func consumer
      */
     void accept(Consumer<OpenPathTree> func);

core/deployment/src/main/java/io/quarkus/deployment/BooleanSupplierFactoryBuildItem.java

@@ -49,7 +49,7 @@ protected BooleanSupplier computeValue(Class<?> type) {
                     final ConfigRoot annotation = parameterClass.getAnnotation(ConfigRoot.class);
                     final ConfigPhase phase = annotation.phase();
                     if (phase.isAvailableAtBuild()) {
-                        paramSuppList.add(() -> readResult.requireRootObjectForClass(parameterClass));
+                        paramSuppList.add(() -> readResult.requireObjectForClass(parameterClass));
                     } else if (phase.isReadAtMain()) {
                         throw reportError(parameter, phase + " configuration cannot be consumed here");
                     } else {
@@ -82,7 +82,7 @@ protected BooleanSupplier computeValue(Class<?> type) {
                     final ConfigPhase phase = annotation.phase();
                     if (phase.isAvailableAtBuild()) {
                         setup = setup.andThen(o -> ReflectUtil.setFieldVal(field, o,
-                                readResult.requireRootObjectForClass(fieldClass)));
+                                readResult.requireObjectForClass(fieldClass)));
                     } else if (phase.isReadAtMain()) {
                         throw reportError(field, phase + " configuration cannot be consumed here");
                     } else {