Merge branch 'main' into bugfix-trustOptions-overwritten-by-keyCertOp…

…tions

.github/quarkus-github-bot.yml

@@ -121,7 +121,7 @@ triage:
         && !matches("hibernate.validator", title)
         && !matches("hibernate.search", titleBody)
         && !matches("hibernate.reactive", titleBody)
-      notify: [gsmet, yrodiere]
+      notify: [gsmet]
       notifyInPullRequest: true
       directories:
         # No trailing slashes: we also match sibling directories starting with these names
@@ -135,7 +135,7 @@ triage:
     - id: hibernate-search
       labels: [area/hibernate-search]
       title: "hibernate.search"
-      notify: [gsmet, marko-bekhta, yrodiere]
+      notify: [gsmet, marko-bekhta]
       notifyInPullRequest: true
       directories:
         # No trailing slashes: we also match sibling directories starting with these names
@@ -144,7 +144,7 @@ triage:
     - id: elasticsearch
       labels: [area/elasticsearch]
       title: "(elasticsearch|opensearch)"
-      notify: [gsmet, marko-bekhta, yrodiere, loicmathieu]
+      notify: [gsmet, marko-bekhta, loicmathieu]
       notifyInPullRequest: true
       directories:
         # No trailing slashes: we also match sibling directories starting with these names
@@ -153,7 +153,7 @@ triage:
     - id: hibernate-validator
       labels: [area/hibernate-validator]
       title: "hibernate.validator"
-      notify: [gsmet, marko-bekhta, yrodiere]
+      notify: [gsmet, marko-bekhta]
       directories:
         # No trailing slashes: we also match sibling directories starting with these names
         - extensions/hibernate-validator
@@ -405,14 +405,11 @@ triage:
       directories:
         - extensions/google-cloud-functions
         - integration-tests/google-cloud-functions
-    - id: mandrel
-      labels: [area/native-image]
-      titleBody: "mandrel"
-      notify: [galderz, zakkak, Karm]
     - id: native-image
       labels: [area/native-image]
-      title: "\\bnative\\b"
-      notify: [zakkak]
+      body: "Mandrel or GraalVM version"
+      notify: [zakkak, Karm, galderz]
+      notifyInPullRequest: true
     - id: awt
       labels: [area/graphics]
       expression: |
@@ -716,7 +713,7 @@ triage:
     - id: agroal
       labels: [area/agroal]
       title: "agroal"
-      notify: [barreiro, yrodiere]
+      notify: [barreiro]
       directories:
         - extensions/agroal/
     - id: continuous-testing
@@ -730,7 +727,7 @@ triage:
     - id: jdbc
       labels: [area/jdbc]
       title: "jdbc"
-      notify: [barreiro,yrodiere]
+      notify: [barreiro]
       directories:
         - extensions/jdbc/
     - id: reactive-sql-clients

.github/quarkus-github-lottery.yml

@@ -11,6 +11,7 @@ buckets:
       delay: PT0S
       timeout: P1D
       expiry: P14D
+      ignoreLabels: ["triage/on-ice"]
     feedback:
       labels: ["triage/needs-reproducer", "triage/needs-feedback"]
       needed:
@@ -22,18 +23,20 @@ buckets:
     stale:
       delay: P60D
       timeout: P14D
+      ignoreLabels: ["triage/on-ice"]
   stewardship:
     delay: P60D
     timeout: P14D
+    ignoreLabels: ["triage/on-ice"]
 participants:
   - username: "yrodiere"
     timezone: "Europe/Paris"
     triage:
       days: ["MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY"]
       maxIssues: 3
     maintenance:
-      labels: ["area/hibernate-orm", "area/hibernate-search", "area/elasticsearch", "area/jdbc"]
-      days: ["WEDNESDAY"]
+      labels: ["area/hibernate-orm", "area/hibernate-reactive", "area/hibernate-validator", "area/hibernate-search", "area/elasticsearch", "area/jdbc"]
+      days: ["MONDAY", "WEDNESDAY", "THURSDAY", "FRIDAY"] # Count me out on Tuesday.
       created:
         maxIssues: 3
       feedback:
@@ -57,6 +60,20 @@ participants:
           maxIssues: 10
       stale:
         maxIssues: 5
+  - username: "mbladel"
+    timezone: "Europe/Rome"
+    maintenance:
+      labels: [ "area/hibernate-orm", "area/jdbc" ]
+      days: [ "WEDNESDAY" ]
+      created:
+        maxIssues: 3
+      feedback:
+        needed:
+          maxIssues: 10
+        provided:
+          maxIssues: 10
+      stale:
+        maxIssues: 5
   - username: "gsmet"
     timezone: "Europe/Paris"
     triage:

.github/workflows/ci-actions-incremental.yml

@@ -21,6 +21,7 @@ on:
       - '.github/workflows/doc-build.yml'
       - '.github/workflows/preview.yml'
       - '.sdkmanrc'
+      - '.justfile'
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
     paths-ignore:
@@ -39,6 +40,7 @@ on:
       - '.github/workflows/doc-build.yml'
       - '.github/workflows/preview.yml'
       - '.sdkmanrc'
+      - '.justfile'
   workflow_dispatch:
 
 concurrency:
@@ -315,13 +317,14 @@ jobs:
           elif [ "${GIB_IMPACTED_MODULES}" != '_all_' ]
           then
             # Important: keep -pl ... in actual jobs in sync with the following grep commands!
-            if ! (echo -n "${GIB_IMPACTED_MODULES}" | grep -qPv 'integration-tests/(devtools|gradle|maven|devmode|kubernetes/.*)|tcks/.*'); then run_jvm=false; fi
-            if ! (echo -n "${GIB_IMPACTED_MODULES}" | grep -q 'integration-tests/devtools'); then run_devtools=false; fi
-            if ! (echo -n "${GIB_IMPACTED_MODULES}" | grep -q 'integration-tests/gradle'); then run_gradle=false; fi
-            if ! (echo -n "${GIB_IMPACTED_MODULES}" | grep -qP 'integration-tests/(maven|devmode)'); then run_maven=false; fi
-            if ! (echo -n "${GIB_IMPACTED_MODULES}" | grep -qP 'integration-tests/kubernetes/.*'); then run_kubernetes=false; fi
-            if ! (echo -n "${GIB_IMPACTED_MODULES}" | grep -qPv '(docs|integration-tests|tcks)/.*'); then run_quickstarts=false; fi
-            if ! (echo -n "${GIB_IMPACTED_MODULES}" | grep -q 'tcks/.*'); then run_tcks=false; fi
+            # do not use grep -q as it can exit before echo has finished outputting and cause broken pipes
+            if ! (echo -n "${GIB_IMPACTED_MODULES}" | grep -Pv 'integration-tests/(devtools|gradle|maven|devmode|kubernetes/.*)|tcks/.*' > /dev/null); then run_jvm=false; fi
+            if ! (echo -n "${GIB_IMPACTED_MODULES}" | grep 'integration-tests/devtools' > /dev/null); then run_devtools=false; fi
+            if ! (echo -n "${GIB_IMPACTED_MODULES}" | grep 'integration-tests/gradle' > /dev/null); then run_gradle=false; fi
+            if ! (echo -n "${GIB_IMPACTED_MODULES}" | grep -P 'integration-tests/(maven|devmode)' > /dev/null); then run_maven=false; fi
+            if ! (echo -n "${GIB_IMPACTED_MODULES}" | grep -P 'integration-tests/kubernetes/.*' > /dev/null); then run_kubernetes=false; fi
+            if ! (echo -n "${GIB_IMPACTED_MODULES}" | grep -Pv '(docs|integration-tests|tcks)/.*' > /dev/null); then run_quickstarts=false; fi
+            if ! (echo -n "${GIB_IMPACTED_MODULES}" | grep 'tcks/.*' > /dev/null); then run_tcks=false; fi
           fi
           echo "run_jvm=${run_jvm}, run_devtools=${run_devtools}, run_gradle=${run_gradle}, run_maven=${run_maven}, run_kubernetes=${run_kubernetes}, run_quickstarts=${run_quickstarts}, run_tcks=${run_tcks}"
           echo "run_jvm=${run_jvm}" >> $GITHUB_OUTPUT

.justfile

@@ -0,0 +1,22 @@
+
+mvncmd := env_var_or_default("QMVNCMD", "./mvnw -T0.8C")
+
+# build main project quickly
+build:
+   {{mvncmd}} -Dquickly
+
+# build main project fast - skip docs, tests, ITs, invoker, extension validation, gradle tests, truststore
+build-fast:
+    {{mvncmd}} -e -DskipDocs -DskipTests -DskipITs -Dinvoker.skip -DskipExtensionValidation -Dskip.gradle.tests -Dtruststore.skip clean install
+
+# build docs (including config doc for all modules), skipping as much unnecessary as possible. 
+build-docs:
+    {{mvncmd}} -e -DskipTests -DskipITs -Dinvoker.skip -DskipExtensionValidation -Dskip.gradle.tests -Dtruststore.skip -Dno-test-modules -Dasciidoctor.fail-if=DEBUG clean install
+
+# format code according to Quarkus coding conventions
+format:
+    {{mvncmd}} process-sources -Denforcer.skip -Dprotoc.skip
+
+# run Quarkus CLI from locally built snapshot
+qss:
+    java -jar ./devtools/cli/target/quarkus-cli-999-SNAPSHOT-runner.jar

CONTRIBUTING.md

@@ -462,6 +462,14 @@ alias qss="java -jar ${HOME}/git/quarkus/devtools/cli/target/quarkus-cli-999-SNA
 Using `./mvnw` is often not practical in this case as you might want to call these aliases from a nested directory.
 [gum](https://andresalmiray.com/gum-the-gradle-maven-wrapper/) might be useful in this case.
 
+##### Justfile
+
+As a convenience, we have a [justfile](.justfile)) that provides the suggested set of aliases to use to build Quarkus using [just](https://just.systems/).
+
+Run `just -l` to see the list of aliases.
+
+By default it uses `./mvnw`. If you use `mvnd` you can set the `QMVNCMD` environment variable to `mvnd` to use it instead.
+
 #### Building all modules of an extension
 
 Let's say you want to make changes to the `Jackson` extension. This extension contains the `deployment`, `runtime`

bom/application/pom.xml

@@ -47,14 +47,14 @@
         <microprofile-lra.version>2.0</microprofile-lra.version>
         <microprofile-openapi.version>4.0.2</microprofile-openapi.version>
         <smallrye-common.version>2.9.0</smallrye-common.version>
-        <smallrye-config.version>3.10.2</smallrye-config.version>
-        <smallrye-health.version>4.1.0</smallrye-health.version>
+        <smallrye-config.version>3.11.1</smallrye-config.version>
+        <smallrye-health.version>4.1.1</smallrye-health.version>
         <smallrye-metrics.version>4.0.0</smallrye-metrics.version>
-        <smallrye-open-api.version>4.0.5</smallrye-open-api.version>
-        <smallrye-graphql.version>2.11.0</smallrye-graphql.version>
-        <smallrye-fault-tolerance.version>6.7.1</smallrye-fault-tolerance.version>
+        <smallrye-open-api.version>4.0.6</smallrye-open-api.version>
+        <smallrye-graphql.version>2.12.0</smallrye-graphql.version>
+        <smallrye-fault-tolerance.version>6.7.3</smallrye-fault-tolerance.version>
         <smallrye-jwt.version>4.6.1</smallrye-jwt.version>
-        <smallrye-context-propagation.version>2.1.2</smallrye-context-propagation.version>
+        <smallrye-context-propagation.version>2.2.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.1</smallrye-reactive-types-converter.version>
         <smallrye-mutiny-vertx-binding.version>3.17.1</smallrye-mutiny-vertx-binding.version>
@@ -91,7 +91,7 @@
         <jackson-bom.version>2.18.2</jackson-bom.version>
         <commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>
         <commons-lang3.version>3.17.0</commons-lang3.version>
-        <commons-codec.version>1.17.1</commons-codec.version>
+        <commons-codec.version>1.17.2</commons-codec.version>
         <classmate.version>1.7.0</classmate.version>
         <!-- See root POM for hibernate-orm.version, hibernate-reactive.version, hibernate-validator.version,
              hibernate-search.version, antlr.version, bytebuddy.version, hibernate-commons-annotations.version -->
@@ -108,7 +108,7 @@
         <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.6.0.Final</wildfly-elytron.version>
-        <jboss-marshalling.version>2.2.1.Final</jboss-marshalling.version>
+        <jboss-marshalling.version>2.2.2.Final</jboss-marshalling.version>
         <jboss-threads.version>3.8.0.Final</jboss-threads.version>
         <vertx.version>4.5.11</vertx.version>
         <httpclient.version>4.5.14</httpclient.version>
@@ -125,7 +125,7 @@
         <adal4j.version>1.6.7</adal4j.version>
         <oracle-jdbc.version>23.5.0.24.07</oracle-jdbc.version>
         <derby-jdbc.version>10.16.1.1</derby-jdbc.version>
-        <db2-jdbc.version>11.5.8.0</db2-jdbc.version>
+        <db2-jdbc.version>12.1.0.0</db2-jdbc.version>
         <shrinkwrap.version>1.2.6</shrinkwrap.version>
         <hamcrest.version>2.2</hamcrest.version><!-- The version needs to be compatible with both REST Assured and Awaitility -->
         <junit.jupiter.version>5.10.5</junit.jupiter.version>
@@ -143,7 +143,7 @@
         <snappy.version>1.1.10.5</snappy.version>
         <strimzi-test-container.version>0.107.0</strimzi-test-container.version>
         <!-- Scala is used by Kafka so we need to choose a compatible version -->
-        <scala.version>2.13.15</scala.version>
+        <scala.version>2.13.16</scala.version>
         <aws-lambda-java.version>1.2.3</aws-lambda-java.version>
         <aws-lambda-java-events.version>3.14.0</aws-lambda-java-events.version>
         <aws-xray.version>2.18.2</aws-xray.version>
@@ -158,14 +158,14 @@
         <maven-invoker.version>3.2.0</maven-invoker.version>
         <awaitility.version>4.2.2</awaitility.version>
         <jboss-logmanager.version>3.1.1.Final</jboss-logmanager.version>
-        <flyway.version>11.1.0</flyway.version>
+        <flyway.version>11.1.1</flyway.version>
         <yasson.version>3.0.4</yasson.version>
         <!-- liquibase-mongodb is not released everytime with liquibase anymore, but the two versions need to be compatible -->
         <liquibase.version>4.29.1</liquibase.version>
         <liquibase-mongodb.version>4.29.1</liquibase-mongodb.version>
         <snakeyaml.version>2.3</snakeyaml.version>
         <osgi.version>6.0.0</osgi.version>
-        <mongo-client.version>5.2.1</mongo-client.version>
+        <mongo-client.version>5.3.0</mongo-client.version>
         <proton-j.version>0.34.1</proton-j.version>
         <javaparser.version>3.26.3</javaparser.version>
         <hibernate-quarkus-local-cache.version>0.3.0</hibernate-quarkus-local-cache.version>
@@ -174,12 +174,12 @@
         <quarkus-spring-data-api.version>3.2.SP2</quarkus-spring-data-api.version>
         <quarkus-spring-security-api.version>6.2</quarkus-spring-security-api.version>
         <quarkus-spring-boot-api.version>3.2</quarkus-spring-boot-api.version>
-        <mockito.version>5.14.2</mockito.version>
+        <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>
         <logstash-gelf.version>1.15.1</logstash-gelf.version>
-        <checker-qual.version>3.48.3</checker-qual.version>
+        <checker-qual.version>3.48.4</checker-qual.version>
         <error-prone-annotations.version>2.36.0</error-prone-annotations.version>
         <jib-core.version>0.27.2</jib-core.version>
         <google-http-client.version>1.45.3</google-http-client.version>
@@ -206,7 +206,7 @@
         <jgit.version>7.1.0.202411261347-r</jgit.version>
         <!-- these two artifacts needs to be compatible together -->
         <strimzi-oauth.version>0.15.0</strimzi-oauth.version>
-        <strimzi-oauth.nimbus.version>9.48</strimzi-oauth.nimbus.version>
+        <strimzi-oauth.nimbus.version>10.0</strimzi-oauth.nimbus.version>
         <jose4j.version>0.9.6</jose4j.version>
         <java-buildpack-client.version>0.0.12</java-buildpack-client.version>
         <org-crac.version>0.1.3</org-crac.version>
@@ -3373,11 +3373,6 @@
                 <artifactId>quarkus-test-kubernetes-client</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-test-openshift-client</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-test-amazon-lambda</artifactId>

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.4.10</vaadin.version>
+        <vaadin.version>24.6.1</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>
@@ -27,8 +27,8 @@
         <dedupe-mixin.version>1.4.0</dedupe-mixin.version>
         <vaadin-router.version>1.7.5</vaadin-router.version>
         <lit-state.version>1.7.0</lit-state.version>
-        <echarts.version>5.5.1</echarts.version>
-        <es-module-shims.version>1.10.0</es-module-shims.version>
+        <echarts.version>5.6.0</echarts.version>
+        <es-module-shims.version>2.0.0</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>

build-parent/pom.xml

@@ -33,7 +33,7 @@
         <jandex-gradle-plugin.version>1.0.0</jandex-gradle-plugin.version>
 
         <asciidoctorj.version>2.5.13</asciidoctorj.version>
-        <htmlunit.version>4.7.0</htmlunit.version>
+        <htmlunit.version>4.8.0</htmlunit.version>
         <javaparser-core.version>3.26.3</javaparser-core.version>
         <jdeparser.version>2.0.3.Final</jdeparser.version>
         <subethasmtp.version>6.0.1</subethasmtp.version>
@@ -85,7 +85,7 @@
         <!-- Database images for JDBC/Reactive/Hibernate tests and devservices -->
         <postgres.image>docker.io/postgres:17</postgres.image>
         <mariadb.image>docker.io/mariadb:10.11</mariadb.image>
-        <db2.image>icr.io/db2_community/db2:11.5.9.0</db2.image>
+        <db2.image>icr.io/db2_community/db2:12.1.0.0</db2.image>
         <mssql.image>mcr.microsoft.com/mssql/server:2022-latest</mssql.image>
         <mysql.image>docker.io/mysql:8.4</mysql.image>
         <oracle.image>docker.io/gvenzl/oracle-free:23-slim-faststart</oracle.image>
@@ -102,7 +102,7 @@
 
         <unboundid-ldap.version>7.0.2</unboundid-ldap.version>
 
-        <assertj.version>3.27.0</assertj.version>
+        <assertj.version>3.27.2</assertj.version>
 
         <wiremock.version>3.10.0</wiremock.version>
         <wiremock-maven-plugin.version>7.3.0</wiremock-maven-plugin.version>