Merge branch 'quarkusio:main' into main

.github/ModuleBuildDurationReport.java

@@ -49,9 +49,11 @@ public class ModuleBuildDurationReport implements Runnable {
       required = true)
   private String logFilePath;
 
-  @CommandLine.Option(names = { "-s",
-      "--sort" }, description = "Sort order"
-          + "%Possible values: ${COMPLETION-CANDIDATES}", defaultValue = "execution")
+  @CommandLine.Option(
+      names = { "-s", "--sort" },
+      description = "Sort order"
+          + "%nPossible values: ${COMPLETION-CANDIDATES}",
+      defaultValue = "execution")
   private Sort sort;
 
   public static void main(String... args) {

.github/dependabot.yml

@@ -6,7 +6,7 @@ updates:
       interval: daily
       time: "23:00"
       timezone: Europe/Paris
-    open-pull-requests-limit: 6
+    open-pull-requests-limit: 10
     labels:
       - area/dependencies
     allow:
@@ -62,6 +62,11 @@ updates:
       - dependency-name: io.smallrye.reactive:*
       # RX Java 2
       - dependency-name: io.reactivex.rxjava2:rxjava
+      # Hibernate
+      - dependency-name: org.hibernate.orm:*
+      - dependency-name: org.hibernate.reactive:*
+      - dependency-name: org.hibernate.validator:*
+      - dependency-name: org.hibernate.search:*
       # Test dependencies
       - dependency-name: net.sourceforge.htmlunit:htmlunit
       - dependency-name: io.rest-assured:*
@@ -202,6 +207,10 @@ updates:
         update-types: ["version-update:semver-major", "version-update:semver-minor"]
       - dependency-name: org.eclipse.microprofile.rest.client:microprofile-rest-client-tck
         update-types: ["version-update:semver-major", "version-update:semver-minor"]
+      # Major/minor upgrades require more work and synchronization, we do them manually.
+      # Only use dependabot for micros (patch versions).
+      - dependency-name: org.hibernate.*:*
+        update-types: ["version-update:semver-major", "version-update:semver-minor"]
     rebase-strategy: disabled
   - package-ecosystem: gradle
     directory: "/devtools/gradle"

.github/matrix-jvm-tests.json

@@ -1,11 +1,4 @@
 [ {
-  "name": "11",
-  "java-version": 11,
-  "maven_args": "$JVM_TEST_MAVEN_ARGS",
-  "maven_opts": "-Xmx2g -XX:MaxMetaspaceSize=1g",
-  "os-name": "ubuntu-latest"
-}
-, {
   "name": "17",
   "java-version": 17,
   "maven_args": "$JVM_TEST_MAVEN_ARGS",
@@ -24,6 +17,6 @@
   "name": "17 Windows",
   "java-version": 17,
   "maven_args": "-DskipDocs -Dformat.skip",
-  "maven_opts": "-Xmx2g -XX:MaxMetaspaceSize=1g -Xlog:gc*=debug:file=windows-java-17.txt",
+  "maven_opts": "-Xmx2g -XX:MaxMetaspaceSize=1g",
   "os-name": "windows-latest"
 }]

.github/native-tests.json

@@ -39,7 +39,7 @@
         {
             "category": "Data6",
             "timeout": 95,
-            "test-modules": "elasticsearch-rest-client, elasticsearch-java-client, hibernate-search-orm-elasticsearch, hibernate-search-orm-elasticsearch-tenancy, hibernate-search-orm-opensearch, hibernate-search-orm-elasticsearch-coordination-outbox-polling",
+            "test-modules": "elasticsearch-rest-client, elasticsearch-java-client, hibernate-search-orm-elasticsearch, hibernate-search-orm-elasticsearch-tenancy, hibernate-search-orm-opensearch, hibernate-search-orm-elasticsearch-outbox-polling",
             "os-name": "ubuntu-latest"
         },
         {
@@ -57,7 +57,7 @@
         {
             "category": "Messaging1",
             "timeout": 115,
-            "test-modules": "kafka, kafka-ssl, kafka-sasl, kafka-avro-apicurio2, kafka-snappy, kafka-streams, reactive-messaging-kafka, kafka-oauth-keycloak",
+            "test-modules": "kafka, kafka-ssl, kafka-sasl, kafka-avro-apicurio2, kafka-json-schema-apicurio2, kafka-snappy, kafka-streams, reactive-messaging-kafka, kafka-oauth-keycloak",
             "os-name": "ubuntu-latest"
         },
         {
@@ -111,7 +111,7 @@
         {
             "category": "Misc3",
             "timeout": 80,
-            "test-modules": "kubernetes-client, openshift-client, kubernetes-service-binding-jdbc, smallrye-config, smallrye-graphql, smallrye-graphql-client, smallrye-metrics, smallrye-opentracing",
+            "test-modules": "kubernetes-client, openshift-client, kubernetes-service-binding-jdbc, smallrye-config, smallrye-graphql, smallrye-graphql-client, smallrye-graphql-client-keycloak, smallrye-metrics",
             "os-name": "ubuntu-latest"
         },
         {

.github/quarkus-github-bot.yml

@@ -68,6 +68,11 @@ triage:
       title: "dev.?ui"
       notify: [phillip-kruger, cescoffier]
       notifyInPullRequest: true
+    - id: mvnpm
+      labels: [area/dev-ui]
+      title: "(mvnpm|mvnpm.org)"
+      notify: [phillip-kruger]
+      notifyInPullRequest: true
     - labels: [area/gradle]
       title: "gradle"
       notify: [quarkusio/devtools, glefloch]
@@ -107,7 +112,7 @@ triage:
         matches("hibernate", title) && matches("reactive", title)
         && !matches("hibernate.validator", title)
         && !matches("hibernate.search", titleBody)
-      notify: [DavideD, gavinking, Sanne]
+      notify: [DavideD, gavinking]
       directories:
         - extensions/hibernate-reactive
     - id: hibernate-orm
@@ -117,7 +122,7 @@ triage:
         && !matches("hibernate.validator", title)
         && !matches("hibernate.search", titleBody)
         && !matches("hibernate.reactive", titleBody)
-      notify: [gsmet, Sanne, yrodiere]
+      notify: [gsmet, yrodiere]
       notifyInPullRequest: true
       directories:
         # No trailing slashes: we also match sibling directories starting with these names
@@ -170,14 +175,14 @@ triage:
     - id: kotlin
       labels: [area/kotlin]
       titleBody: "kotlin"
-      notify: [evanchooly, geoand]
+      notify: [geoand]
       directories:
         - extensions/kotlin/
         - integration-tests/kotlin/
     - id: mongodb
       labels: [area/mongodb]
       title: "mongo"
-      notify: [loicmathieu, evanchooly]
+      notify: [loicmathieu]
       directories:
         - extensions/mongodb-client/
         - integration-tests/mongodb-client/
@@ -407,21 +412,21 @@ triage:
         - extensions/google-cloud-functions
         - integration-tests/google-cloud-functions
     - id: mandrel
-      labels: [area/mandrel]
+      labels: [area/native-image]
       titleBody: "mandrel"
       notify: [galderz, zakkak, Karm]
     - id: native-image
       labels: [area/native-image]
       title: "\\bnative\\b"
-      notify: []
+      notify: [zakkak]
     - id: awt
       labels: [area/graphics]
       expression: |
               matches("sun.font", titleBody)
               || matches("sun.java2d", titleBody)
               || matches("javax.imageio", titleBody)
               || matches("sun.awt", titleBody)
-      notify: [galderz, zakkak, Karm]
+      notify: [galderz, Karm]
       notifyInPullRequest: true
       directories:
         - extensions/awt/
@@ -552,6 +557,7 @@ triage:
         - extensions/jaxb/
     - id: logging
       labels: [area/logging]
+      notify: [dmlloyd]
       directories:
         - extensions/logging-gelf/
         - extensions/logging-json/
@@ -704,7 +710,7 @@ triage:
     - id: agroal
       labels: [area/agroal]
       title: "agroal"
-      notify: [barreiro, Sanne, yrodiere]
+      notify: [barreiro, yrodiere]
       directories:
         - extensions/agroal/
     - id: continuous-testing

.github/verify-tests-json.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# Purpose: Verify that a JSON file such as native-tests.json only contains valid references in its "test-modules" fields
+# Note: This script is only for CI and does therefore not aim to be compatible with BSD/macOS.
+
+set -e -u -o pipefail
+shopt -s failglob
+
+# path of this shell script
+PRG_PATH=$( cd "$(dirname "$0")" ; pwd -P )
+
+if (( $# != 2 ))
+then
+  echo 'Invalid parameters'
+  echo 'Usage: $0 <path from .github/ to json file to check> <path from repository root to integration test directory>'
+  exit 1
+fi
+
+JSON_PATH="${PRG_PATH}/$1"
+IT_DIR_PATH="$2"
+
+echo "Checking JSON file $JSON_PATH against modules in directory $IT_DIR_PATH"
+
+INVALID_REFS=($(
+  # Print unmatched names from the JSON file
+  # Input 1: List all test modules from the JSON file, one per line, trimmed, sorted
+  # Input 2: List all Maven modules, one per line, sorted
+  join -v 1 \
+    <(jq -r '.include[] | ."test-modules"' ${PRG_PATH}/$1 | tr ',' $'\n' | sed 's|^\s*||;s|\s*$||;' | grep -v '^$' | sort) \
+    <(find "$IT_DIR_PATH" -mindepth 2 -name pom.xml -exec realpath --relative-to "$IT_DIR_PATH" '{}' \; | xargs -d $'\n' -n 1 dirname | sort)
+))
+
+if [[ ${#INVALID_REFS[@]} = 0 ]]
+then
+    echo "$JSON_PATH is valid when checked against $IT_DIR_PATH"
+    exit 0
+else
+    echo "$JSON_PATH is invalid when checked against $IT_DIR_PATH"
+    echo "'test-modules' that cannot be resolved as paths to Maven modules relative to $IT_DIR_PATH: ${INVALID_REFS[*]}"
+    exit 1
+fi