Merge branch 'main' into fix_kn

.github/quarkus-github-bot.yml

@@ -45,13 +45,9 @@ triage:
       directories:
         - extensions/amazon-lambda
         - integration-tests/amazon-lambda
-    - id: persistence
-      labels: [area/persistence]
-      title: "persistence"
-      directories:
-        - extensions/jdbc/
     - id: db2
-      labels: [area/persistence]
+      # There's no label for DB2, and JDBC/reactive-clients are handled elsewhere.
+      labels: []
       title: "db2"
       notify: [mswatosh]
       directories:
@@ -109,7 +105,7 @@ triage:
         - devtools/platform-descriptor-json/src/main/resources/codestarts/
         - devtools/platform-descriptor-json/src/main/resources/templates/
     - id: hibernate-reactive
-      labels: [area/hibernate-reactive, area/persistence]
+      labels: [area/hibernate-reactive]
       title: "hibernate.reactive"
       expression: |
         matches("hibernate", title) && matches("reactive", title)
@@ -119,7 +115,7 @@ triage:
       directories:
         - extensions/hibernate-reactive
     - id: hibernate-orm
-      labels: [area/hibernate-orm, area/persistence]
+      labels: [area/hibernate-orm]
       expression: |
         matches("hibernate", title) && !matches("reactive", title)
         && !matches("hibernate.validator", title)
@@ -732,6 +728,12 @@ triage:
       labels: [area/devservices]
       title: "dev.?services?"
       notify: [stuartwdouglas, geoand]
+    - id: jdbc
+      labels: [area/jdbc]
+      title: "jdbc"
+      notify: [barreiro,yrodiere]
+      directories:
+        - extensions/jdbc/
     - id: reactive-sql-clients
       labels: [area/reactive-sql-clients]
       title: "(reactive sql|reactive pool|pgpool|mysqlpool|db2pool)"

.github/quarkus-github-lottery.yml

@@ -28,7 +28,7 @@ participants:
       days: ["MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY"]
       maxIssues: 3
     maintenance:
-      labels: ["area/hibernate-orm", "area/hibernate-search", "area/elasticsearch"]
+      labels: ["area/hibernate-orm", "area/hibernate-search", "area/elasticsearch", "area/jdbc"]
       days: ["WEDNESDAY"]
       feedback:
         needed:

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

@@ -13,7 +13,7 @@ on:
       - '*.txt'
       - 'adr/**'
       - 'jakarta/**'
-      - 'docs/src/main/asciidoc/**'
+      - 'docs/**'
       - '.github/ISSUE_TEMPLATE/**'
       - '.github/*.yml'
       - '.github/*.java'
@@ -31,7 +31,7 @@ on:
       - '*.txt'
       - 'adr/**'
       - 'jakarta/**'
-      - 'docs/src/main/asciidoc/**'
+      - 'docs/**'
       - '.github/ISSUE_TEMPLATE/**'
       - '.github/*.yml'
       - '.github/*.java'

.github/workflows/doc-build.yml

@@ -7,12 +7,31 @@ on:
       - '3.0'
     paths:
       - 'core/processor/**'
-      - 'docs/src/main/asciidoc/**'
+      - 'devtools/config-doc-maven-plugin/**'
+      - 'docs/**'
+      - 'extensions/**/pom.xml'
+      - 'extensions/**/*Config*.java'
+      - 'extensions/core/runtime/pom.xml'
+      - 'extensions/core/runtime/**/*Config*.java'
+      - 'extensions/core/deployment/pom.xml'
+      - 'extensions/core/deployment/**/*Config*.java'
+      - 'test-framework/jacoco/**/pom.xml'
+      - 'test-framework/jacoco/**/*Config*.java'
       - '.github/workflows/doc-build.yml'
   pull_request:
     types: [opened, synchronize, reopened]
     paths:
-      - 'docs/src/main/asciidoc/**'
+      - 'core/processor/**'
+      - 'devtools/config-doc-maven-plugin/**'
+      - 'docs/**'
+      - 'extensions/**/pom.xml'
+      - 'extensions/**/*Config*.java'
+      - 'extensions/core/runtime/pom.xml'
+      - 'extensions/core/runtime/**/*Config*.java'
+      - 'extensions/core/deployment/pom.xml'
+      - 'extensions/core/deployment/**/*Config*.java'
+      - 'test-framework/jacoco/**/pom.xml'
+      - 'test-framework/jacoco/**/*Config*.java'
       - '.github/workflows/doc-build.yml'
 
 concurrency:

bom/application/pom.xml

@@ -110,7 +110,7 @@
         <slf4j-jboss-logmanager.version>2.0.0.Final</slf4j-jboss-logmanager.version>
         <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.5.0.Final</wildfly-elytron.version>
+        <wildfly-elytron.version>2.5.1.Final</wildfly-elytron.version>
         <jboss-marshalling.version>2.1.4.SP1</jboss-marshalling.version>
         <jboss-threads.version>3.6.1.Final</jboss-threads.version>
         <vertx.version>4.5.9</vertx.version>
@@ -119,7 +119,7 @@
         <httpasync.version>4.1.5</httpasync.version>
         <cronutils.version>9.2.1</cronutils.version>
         <quartz.version>2.3.2</quartz.version>
-        <h2.version>2.3.230</h2.version> <!-- When updating, needs to be matched in io.quarkus.hibernate.orm.runtime.config.DialectVersions -->
+        <h2.version>2.3.232</h2.version> <!-- When updating, needs to be matched in io.quarkus.hibernate.orm.runtime.config.DialectVersions -->
         <postgresql-jdbc.version>42.7.3</postgresql-jdbc.version>
         <mariadb-jdbc.version>3.4.1</mariadb-jdbc.version>
         <mysql-jdbc.version>8.3.0</mysql-jdbc.version>
@@ -160,7 +160,7 @@
         <maven-invoker.version>3.2.0</maven-invoker.version>
         <awaitility.version>4.2.2</awaitility.version>
         <jboss-logmanager.version>3.0.6.Final</jboss-logmanager.version>
-        <flyway.version>10.17.0</flyway.version>
+        <flyway.version>10.17.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>
@@ -180,23 +180,23 @@
         <mockito.version>5.12.0</mockito.version>
         <jna.version>5.8.0</jna.version><!-- should satisfy both testcontainers and mongodb -->
         <quarkus-security.version>2.1.0</quarkus-security.version>
-        <keycloak.version>25.0.0</keycloak.version>
+        <keycloak.version>25.0.2</keycloak.version>
         <logstash-gelf.version>1.15.1</logstash-gelf.version>
         <checker-qual.version>3.46.0</checker-qual.version>
-        <error-prone-annotations.version>2.29.2</error-prone-annotations.version>
+        <error-prone-annotations.version>2.30.0</error-prone-annotations.version>
         <jib-core.version>0.27.0</jib-core.version>
         <google-http-client.version>1.44.2</google-http-client.version>
         <scram-client.version>2.1</scram-client.version>
         <picocli.version>4.7.6</picocli.version>
         <google-cloud-functions.version>1.1.0</google-cloud-functions.version>
-        <commons-compress.version>1.26.2</commons-compress.version> <!-- Please check with Java Operator SDK / Fabric8 team before updating -->
+        <commons-compress.version>1.27.0</commons-compress.version> <!-- Please check with Java Operator SDK / Fabric8 team before updating -->
         <commons-text.version>1.12.0</commons-text.version>
         <gson.version>2.11.0</gson.version>
         <log4j2-jboss-logmanager.version>1.1.2.Final</log4j2-jboss-logmanager.version>
         <log4j2-api.version>2.23.1</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.5.10.Final</apicurio-registry.version>
+        <apicurio-registry.version>2.6.2.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.1</testcontainers.version> <!-- Make sure to also update docker-java.version to match its needs -->
         <docker-java.version>3.4.0</docker-java.version> <!-- must be the version Testcontainers use: https://central.sonatype.com/artifact/org.testcontainers/testcontainers -->

bom/dev-ui/pom.xml

@@ -14,10 +14,10 @@
 
     <properties>
         <vaadin.version>24.4.5</vaadin.version>
-        <lit.version>3.1.4</lit.version>
-        <lit-element.version>4.0.6</lit-element.version>
-        <lit-html.version>3.1.4</lit-html.version>
-        <ssr-dom-shim.version>1.2.0</ssr-dom-shim.version>
+        <lit.version>3.2.0</lit.version>
+        <lit-element.version>4.1.0</lit-element.version>
+        <lit-html.version>3.2.0</lit-html.version>
+        <ssr-dom-shim.version>1.2.1</ssr-dom-shim.version>
         <trusted-types.version>2.0.7</trusted-types.version>
         <reactive-element.version>2.0.4</reactive-element.version>
         <vaadin-usage-statistics.version>2.1.2</vaadin-usage-statistics.version>

build-parent/pom.xml

@@ -54,7 +54,8 @@
         <!--
         Supported Maven versions, interpreted as a version range (Also defined in quarkus-enforcer-rules)
          -->
-        <supported-maven-versions>[${maven.min.version},)</supported-maven-versions>
+        <!-- TODO: once we can upgrade the minimum Maven version to use for Quarkus projects, let's use ${maven.min.version} again -->
+        <supported-maven-versions>[3.8.6,)</supported-maven-versions>
 
         <!-- These 2 properties are used by CreateProjectMojo to add the Maven Wrapper -->
         <proposed-maven-version>3.9.8</proposed-maven-version>
@@ -94,7 +95,7 @@
 
         <!-- The image to use for tests that run Keycloak -->
         <!-- IMPORTANT: If this is changed you must also update bom/application/pom.xml and KeycloakBuildTimeConfig/DevServicesConfig in quarkus-oidc/deployment to match the version -->
-        <keycloak.version>25.0.0</keycloak.version>
+        <keycloak.version>25.0.2</keycloak.version>
         <keycloak.wildfly.version>19.0.3</keycloak.wildfly.version>
         <keycloak.docker.image>quay.io/keycloak/keycloak:${keycloak.version}</keycloak.docker.image>
         <keycloak.docker.legacy.image>quay.io/keycloak/keycloak:${keycloak.wildfly.version}-legacy</keycloak.docker.legacy.image>

core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/GraalVM.java

@@ -15,6 +15,7 @@ public final class GraalVM {
     // Implements version parsing after https://github.com/oracle/graal/pull/6302
     static final class VersionParseHelper {
 
+        private static final String EA_BUILD_PREFIX = "-ea";
         private static final String JVMCI_BUILD_PREFIX = "jvmci-";
         private static final String MANDREL_VERS_PREFIX = "Mandrel-";
 
@@ -103,11 +104,10 @@ private static String libericaVersion(String vendorVersion) {
             if (vendorVersion == null) {
                 return null;
             }
-            int idx = vendorVersion.indexOf(LIBERICA_NIK_VERS_PREFIX);
-            if (idx < 0) {
+            final String version = buildVersion(vendorVersion, LIBERICA_NIK_VERS_PREFIX);
+            if (version == null) {
                 return null;
             }
-            String version = vendorVersion.substring(idx + LIBERICA_NIK_VERS_PREFIX.length());
             return matchVersion(version);
         }
 
@@ -122,11 +122,10 @@ private static String mandrelVersion(String vendorVersion) {
             if (vendorVersion == null) {
                 return null;
             }
-            int idx = vendorVersion.indexOf(MANDREL_VERS_PREFIX);
-            if (idx < 0) {
+            final String version = buildVersion(vendorVersion, MANDREL_VERS_PREFIX);
+            if (version == null) {
                 return null;
             }
-            String version = vendorVersion.substring(idx + MANDREL_VERS_PREFIX.length());
             return matchVersion(version);
         }
 
@@ -142,27 +141,37 @@ private static String graalVersion(String buildInfo, int jdkFeature) {
             if (buildInfo == null) {
                 return null;
             }
-            int idx = buildInfo.indexOf(JVMCI_BUILD_PREFIX);
-            if (idx < 0) {
-                return null;
+            String version = buildVersion(buildInfo, JVMCI_BUILD_PREFIX);
+            if (version == null) {
+                version = buildVersion(buildInfo, EA_BUILD_PREFIX);
+                if (version == null) {
+                    return null;
+                }
             }
-            String version = buildInfo.substring(idx + JVMCI_BUILD_PREFIX.length());
             Matcher versMatcher = VERSION_PATTERN.matcher(version);
             if (versMatcher.find()) {
                 return matchVersion(version);
             } else {
                 return GRAAL_MAPPING.get(jdkFeature);
             }
         }
+
+        private static String buildVersion(String buildInfo, String buildPrefix) {
+            int idx = buildInfo.indexOf(buildPrefix);
+            if (idx < 0) {
+                return null;
+            }
+            return buildInfo.substring(idx + buildPrefix.length());
+        }
     }
 
     // Temporarily work around https://github.com/quarkusio/quarkus/issues/36246,
     // till we have a consensus on how to move forward in
     // https://github.com/quarkusio/quarkus/issues/34161
     private static final Map<Integer, String> GRAAL_MAPPING = Map.of(22, "24.0",
             23, "24.1",
-            24, "25.0",
-            25, "25.1");
+            24, "24.2",
+            25, "25.0");
 
     public static final class Version implements Comparable<Version> {
 

core/deployment/src/test/java/io/quarkus/deployment/pkg/steps/GraalVMTest.java

@@ -165,6 +165,19 @@ public void testGraalVMEE22DevVersionParser() {
         assertThat(graalVMEE22Dev.javaVersion.update()).isEqualTo(0);
     }
 
+    @Test
+    public void testGraalVMEA24DevVersionParser() {
+        final Version graalVMEA24Dev = Version.of(Stream.of(("native-image 24-ea 2025-03-18\n"
+                + "OpenJDK Runtime Environment Oracle GraalVM 24-dev.ea+10.1 (build 24-ea+10-1076)\n"
+                + "OpenJDK 64-Bit Server VM Oracle GraalVM 24-dev.ea+10.1 (build 24-ea+10-1076, mixed mode, sharing)")
+                .split("\\n")));
+        assertThat(graalVMEA24Dev.distribution.name()).isEqualTo("GRAALVM");
+        assertThat(graalVMEA24Dev.getVersionAsString()).isEqualTo("24.2-dev");
+        assertThat(graalVMEA24Dev.javaVersion.toString()).isEqualTo("24-ea+10-1076");
+        assertThat(graalVMEA24Dev.javaVersion.feature()).isEqualTo(24);
+        assertThat(graalVMEA24Dev.javaVersion.update()).isEqualTo(0);
+    }
+
     @Test
     public void testGraalVMVersionsOlderThan() {
         assertOlderThan("GraalVM Version 19.3.6 CE", "GraalVM Version 20.2.0 (Java Version 11.0.9)");

core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/discovery/DiscoveryConfigProperty.java

@@ -15,12 +15,13 @@ public class DiscoveryConfigProperty {
     private final boolean unnamedMapKey;
     private final ResolvedType type;
     private final boolean converted;
+    private final boolean enforceHyphenateEnumValue;
     private final boolean section;
     private final boolean sectionGenerated;
 
     public DiscoveryConfigProperty(String path, String sourceClass, String sourceName, String defaultValue,
             String defaultValueForDoc, boolean deprecated, String mapKey, boolean unnamedMapKey,
-            ResolvedType type, boolean converted,
+            ResolvedType type, boolean converted, boolean enforceHyphenateEnumValue,
             boolean section, boolean sectionGenerated) {
         this.path = path;
         this.sourceClass = sourceClass;
@@ -32,6 +33,7 @@ public DiscoveryConfigProperty(String path, String sourceClass, String sourceNam
         this.unnamedMapKey = unnamedMapKey;
         this.type = type;
         this.converted = converted;
+        this.enforceHyphenateEnumValue = enforceHyphenateEnumValue;
         this.section = section;
         this.sectionGenerated = sectionGenerated;
     }
@@ -76,6 +78,10 @@ public boolean isConverted() {
         return converted;
     }
 
+    public boolean isEnforceHyphenateEnumValue() {
+        return enforceHyphenateEnumValue;
+    }
+
     public boolean isSection() {
         return section;
     }
@@ -132,6 +138,7 @@ public static class Builder {
         private String mapKey;
         private boolean unnamedMapKey = false;
         private boolean converted = false;
+        private boolean enforceHyphenateEnumValue = false;
         private boolean section = false;
         private boolean sectionGenerated = false;
 
@@ -176,6 +183,11 @@ public Builder converted() {
             return this;
         }
 
+        public Builder enforceHyphenateEnumValues() {
+            this.enforceHyphenateEnumValue = true;
+            return this;
+        }
+
         public Builder section(boolean generated) {
             this.section = true;
             this.sectionGenerated = generated;
@@ -191,7 +203,7 @@ public DiscoveryConfigProperty build() {
             }
 
             return new DiscoveryConfigProperty(name, sourceClass, sourceName, defaultValue, defaultValueForDoc, deprecated,
-                    mapKey, unnamedMapKey, type, converted, section, sectionGenerated);
+                    mapKey, unnamedMapKey, type, converted, enforceHyphenateEnumValue, section, sectionGenerated);
         }
     }
 }

core/processor/src/main/java/io/quarkus/annotation/processor/documentation/config/resolver/ConfigResolver.java

@@ -153,7 +153,8 @@ private void resolveProperty(ConfigRoot configRoot, Map<String, ConfigSection> e
             String typeSimplifiedName = discoveryConfigProperty.getType().simplifiedName();
 
             // if the property has a converter, we don't hyphenate the values (per historical rules, not exactly sure of the reason)
-            boolean hyphenateEnumValues = !discoveryConfigProperty.isConverted();
+            boolean hyphenateEnumValues = discoveryConfigProperty.isEnforceHyphenateEnumValue() ||
+                    !discoveryConfigProperty.isConverted();
 
             String defaultValue = getDefaultValue(discoveryConfigProperty.getDefaultValue(),
                     discoveryConfigProperty.getDefaultValueForDoc(), discoveryConfigProperty.getType(), hyphenateEnumValues);
@@ -172,9 +173,11 @@ private void resolveProperty(ConfigRoot configRoot, Map<String, ConfigSection> e
             }
 
             String potentiallyMappedPath = propertyPath;
+            boolean optional = discoveryConfigProperty.getType().isOptional();
 
             if (discoveryConfigProperty.getType().isMap()) {
-                // it is a leaf pass through map
+                // it is a leaf pass through map, it is always optional
+                optional = true;
                 typeQualifiedName = discoveryConfigProperty.getType().wrapperType().toString();
                 typeSimplifiedName = utils.element().simplifyGenericType(discoveryConfigProperty.getType().wrapperType());
 
@@ -192,7 +195,7 @@ private void resolveProperty(ConfigRoot configRoot, Map<String, ConfigSection> e
                     discoveryConfigProperty.getSourceName(), potentiallyMappedPath, additionalPaths,
                     ConfigNamingUtil.toEnvVarName(potentiallyMappedPath), typeQualifiedName, typeSimplifiedName,
                     discoveryConfigProperty.getType().isMap(), discoveryConfigProperty.getType().isList(),
-                    discoveryConfigProperty.getType().isOptional(), discoveryConfigProperty.getMapKey(),
+                    optional, discoveryConfigProperty.getMapKey(),
                     discoveryConfigProperty.isUnnamedMapKey(), context.isWithinMap(),
                     discoveryConfigProperty.isConverted(),
                     discoveryConfigProperty.getType().isEnum(),