Merge pull request #37049 from gsmet/3.5.2-backports-1

3.5.2 backports 1

bom/application/pom.xml

@@ -23,7 +23,7 @@
         <jandex.version>3.1.5</jandex.version>
         <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
         <javax.inject.version>1</javax.inject.version>
-        <parsson.version>1.1.4</parsson.version>
+        <parsson.version>1.1.5</parsson.version>
         <resteasy-microprofile.version>2.1.4.Final</resteasy-microprofile.version>
         <resteasy-spring-web.version>3.0.2.Final</resteasy-spring-web.version>
         <resteasy.version>6.2.6.Final</resteasy.version>
@@ -51,7 +51,7 @@
         <microprofile-lra.version>2.0</microprofile-lra.version>
         <microprofile-openapi.version>3.1.1</microprofile-openapi.version>
         <smallrye-common.version>2.2.0</smallrye-common.version>
-        <smallrye-config.version>3.4.1</smallrye-config.version>
+        <smallrye-config.version>3.4.4</smallrye-config.version>
         <smallrye-health.version>4.0.4</smallrye-health.version>
         <smallrye-metrics.version>4.0.0</smallrye-metrics.version>
         <smallrye-open-api.version>3.7.0</smallrye-open-api.version>
@@ -129,7 +129,7 @@
         <h2.version>2.2.224</h2.version> <!-- When updating, needs to be matched in io.quarkus.hibernate.orm.runtime.config.DialectVersions -->
         <postgresql-jdbc.version>42.6.0</postgresql-jdbc.version>
         <mariadb-jdbc.version>3.2.0</mariadb-jdbc.version>
-        <mysql-jdbc.version>8.0.30</mysql-jdbc.version>
+        <mysql-jdbc.version>8.0.33</mysql-jdbc.version>
         <mssql-jdbc.version>12.4.0.jre11</mssql-jdbc.version>
         <adal4j.version>1.6.7</adal4j.version>
         <oracle-jdbc.version>23.3.0.23.09</oracle-jdbc.version>
@@ -139,7 +139,7 @@
         <rest-assured.version>5.3.0</rest-assured.version>
         <junit.jupiter.version>5.10.0</junit.jupiter.version>
         <junit-pioneer.version>1.5.0</junit-pioneer.version>
-        <infinispan.version>14.0.19.Final</infinispan.version>
+        <infinispan.version>14.0.20.Final</infinispan.version>
         <infinispan.protostream.version>4.6.5.Final</infinispan.protostream.version>
         <caffeine.version>3.1.5</caffeine.version>
         <netty.version>4.1.100.Final</netty.version>
@@ -3280,7 +3280,7 @@
                 <artifactId>importmap</artifactId>
                 <version>${importmap.version}</version>
             </dependency>
-            
+
             <!-- Additional dependencies, keep in alphabetical order -->
             <dependency>
                 <groupId>biz.paluch.logging</groupId>
@@ -6294,6 +6294,12 @@
                             <excludeScopes>test</excludeScopes>
                             <excludeArtifactKeys>
                                 <key>junit:junit</key> <!-- comes from the jackson-bom -->
+
+                                <!-- jboss-parent:40 still manages jdk-misc, but does not define version.jdk-misc anymore. -->
+                                <!-- We can just remove it because is not needed anyway. -->
+                                <!-- The exclusion can be removed once all imported BOMs depend on jboss-parent:41+ -->
+                                <!-- See also https://github.com/jboss/jboss-parent-pom/issues/236 -->
+                                <key>org.jboss:jdk-misc</key>
                             </excludeArtifactKeys>
                         </configuration>
                     </execution>

build-parent/pom.xml

@@ -187,7 +187,7 @@
         <lit-state.version>1.7.0</lit-state.version>
         <echarts.version>5.4.3</echarts.version>
         <wc-codemirror.version>2.1.0</wc-codemirror.version>
-        <es-module-shims.version>1.8.0</es-module-shims.version>
+        <es-module-shims.version>1.8.1</es-module-shims.version>
         <path-to-regexp.version>2.4.0</path-to-regexp.version>
     </properties>
 

core/deployment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java

@@ -474,6 +474,7 @@ final class ReadOperation {
         final Map<String, String> allBuildTimeValues = new TreeMap<>();
         final Map<String, String> buildTimeRunTimeValues = new TreeMap<>();
         final Map<String, String> runTimeDefaultValues = new TreeMap<>();
+        final Map<String, String> runTimeValues = new TreeMap<>();
 
         final Map<ConverterType, Converter<?>> convByType = new HashMap<>();
 
@@ -593,7 +594,7 @@ ReadResult run() {
                         // it's a run-time default (record for later)
                         ConfigValue configValue = withoutExpansion(() -> runtimeDefaultsConfig.getConfigValue(propertyName));
                         if (configValue.getValue() != null) {
-                            runTimeDefaultValues.put(configValue.getNameProfiled(), configValue.getValue());
+                            runTimeValues.put(configValue.getNameProfiled(), configValue.getValue());
                         }
                     }
 
@@ -604,7 +605,7 @@ ReadResult run() {
                     // it's not managed by us; record it
                     ConfigValue configValue = withoutExpansion(() -> runtimeDefaultsConfig.getConfigValue(propertyName));
                     if (configValue.getValue() != null) {
-                        runTimeDefaultValues.put(configValue.getNameProfiled(), configValue.getValue());
+                        runTimeValues.put(configValue.getNameProfiled(), configValue.getValue());
                     }
 
                     // in the case the user defined compound keys in YAML (or similar config source, that quotes the name)
@@ -655,7 +656,7 @@ ReadResult run() {
                     unknownBuildProperties.remove(property);
                     ConfigValue value = config.getConfigValue(property);
                     if (value != null && value.getRawValue() != null) {
-                        runTimeDefaultValues.put(property, value.getRawValue());
+                        runTimeValues.put(property, value.getRawValue());
                     }
                 }
             }
@@ -664,6 +665,7 @@ ReadResult run() {
                     .setAllBuildTimeValues(allBuildTimeValues)
                     .setBuildTimeRunTimeValues(filterActiveProfileProperties(buildTimeRunTimeValues))
                     .setRunTimeDefaultValues(filterActiveProfileProperties(runTimeDefaultValues))
+                    .setRuntimeValues(runTimeValues)
                     .setBuildTimePatternMap(buildTimePatternMap)
                     .setBuildTimeRunTimePatternMap(buildTimeRunTimePatternMap)
                     .setRunTimePatternMap(runTimePatternMap)
@@ -1139,6 +1141,7 @@ public static final class ReadResult {
         final Map<String, String> allBuildTimeValues;
         final Map<String, String> buildTimeRunTimeValues;
         final Map<String, String> runTimeDefaultValues;
+        final Map<String, String> runTimeValues;
 
         final ConfigPatternMap<Container> buildTimePatternMap;
         final ConfigPatternMap<Container> buildTimeRunTimePatternMap;
@@ -1162,6 +1165,7 @@ public ReadResult(final Builder builder) {
             this.allBuildTimeValues = builder.getAllBuildTimeValues();
             this.buildTimeRunTimeValues = builder.getBuildTimeRunTimeValues();
             this.runTimeDefaultValues = builder.getRunTimeDefaultValues();
+            this.runTimeValues = builder.getRuntimeValues();
 
             this.buildTimePatternMap = builder.getBuildTimePatternMap();
             this.buildTimeRunTimePatternMap = builder.getBuildTimeRunTimePatternMap();
@@ -1219,6 +1223,10 @@ public Map<String, String> getRunTimeDefaultValues() {
             return runTimeDefaultValues;
         }
 
+        public Map<String, String> getRunTimeValues() {
+            return runTimeValues;
+        }
+
         public ConfigPatternMap<Container> getBuildTimePatternMap() {
             return buildTimePatternMap;
         }
@@ -1280,6 +1288,7 @@ static class Builder {
             private Map<String, String> allBuildTimeValues;
             private Map<String, String> buildTimeRunTimeValues;
             private Map<String, String> runTimeDefaultValues;
+            private Map<String, String> runtimeValues;
             private ConfigPatternMap<Container> buildTimePatternMap;
             private ConfigPatternMap<Container> buildTimeRunTimePatternMap;
             private ConfigPatternMap<Container> runTimePatternMap;
@@ -1327,6 +1336,15 @@ Builder setRunTimeDefaultValues(final Map<String, String> runTimeDefaultValues)
                 return this;
             }
 
+            Map<String, String> getRuntimeValues() {
+                return runtimeValues;
+            }
+
+            Builder setRuntimeValues(final Map<String, String> runtimeValues) {
+                this.runtimeValues = runtimeValues;
+                return this;
+            }
+
             ConfigPatternMap<Container> getBuildTimePatternMap() {
                 return buildTimePatternMap;
             }

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

@@ -924,8 +924,10 @@ public NativeImageInvokerInfo build() {
 
                 if (nativeConfig.autoServiceLoaderRegistration()) {
                     addExperimentalVMOption(nativeImageArgs, "-H:+UseServiceLoaderFeature");
-                    //When enabling, at least print what exactly is being added:
-                    nativeImageArgs.add("-H:+TraceServiceLoaderFeature");
+                    if (graalVMVersion.compareTo(GraalVM.Version.VERSION_23_1_0) < 0) {
+                        // When enabling, at least print what exactly is being added. Only possible in <23.1.0
+                        nativeImageArgs.add("-H:+TraceServiceLoaderFeature");
+                    }
                 } else {
                     addExperimentalVMOption(nativeImageArgs, "-H:-UseServiceLoaderFeature");
                 }

core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java

@@ -199,11 +199,14 @@ void generateBuilders(
             BuildProducer<GeneratedClassBuildItem> generatedClass,
             BuildProducer<ReflectiveClassBuildItem> reflectiveClass) throws Exception {
 
-        // Default Values collected from mappings / roots and build item
+        // Default values from @ConfigRoot
         Map<String, String> defaultValues = new HashMap<>(configItem.getReadResult().getRunTimeDefaultValues());
+        // Default values from build item RunTimeConfigurationDefaultBuildItem override
         for (RunTimeConfigurationDefaultBuildItem e : runTimeDefaults) {
             defaultValues.put(e.getKey(), e.getValue());
         }
+        // Recorded values from build time from any other source (higher ordinal then defaults, so override)
+        defaultValues.putAll(configItem.getReadResult().getRunTimeValues());
 
         Set<String> converters = discoverService(Converter.class, reflectiveClass);
         Set<String> interceptors = discoverService(ConfigSourceInterceptor.class, reflectiveClass);

docs/src/main/asciidoc/amqp-dev-services.adoc

@@ -8,7 +8,7 @@ include::_attributes.adoc[]
 :categories: messaging
 :summary: Start AMQP automatically in dev and test modes.
 :extensions: io.quarkus:quarkus-smallrye-reactive-messaging-amqp
-:topics: messaging,amqp,devservices,tooling,testing,devmode
+:topics: messaging,amqp,dev-services,testing,dev-mode
 
 Dev Services for AMQP automatically starts an AMQP 1.0 broker in dev mode and when running tests.
 So, you don't have to start a broker manually.

docs/src/main/asciidoc/apicurio-registry-dev-services.adoc

@@ -7,7 +7,7 @@ https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 include::_attributes.adoc[]
 :categories: messaging
 :summary: Start Apicurio Registry automatically in dev and test modes.
-:topics: messaging,kafka,apicurio,registry,devservices,tooling,testing,devmode
+:topics: messaging,kafka,apicurio,registry,dev-services,dev-mode,testing
 :extensions: io.quarkus:quarkus-apicurio-registry-avro,io.quarkus:quarkus-smallrye-reactive-messaging-kafka
 
 If an extension for schema registry, such as `quarkus-apicurio-registry-avro` or `quarkus-confluent-registry-avro`, is present, Dev Services for Apicurio Registry automatically starts an Apicurio Registry instance in dev mode and when running tests.

docs/src/main/asciidoc/appcds.adoc

@@ -8,7 +8,6 @@ include::_attributes.adoc[]
 :categories: core, cloud
 :summary: This reference guide explains how to enable AppCDS with Quarkus.
 :topics: appcds,serverless
-:extensions: io.quarkus:quarkus-core
 
 This reference guide explains how to enable Application Class Data Sharing in your Quarkus applications.
 

docs/src/main/asciidoc/blaze-persistence.adoc

@@ -33,31 +33,34 @@ In Quarkus, you just need to:
 
 Add the following dependencies to your project:
 
-* the Blaze-Persistence extension: `com.blazebit:blaze-persistence-integration-quarkus`
+* the Blaze-Persistence extension: `com.blazebit:blaze-persistence-integration-quarkus-3`
 * further Blaze-Persistence integrations as needed:
-  - `blaze-persistence-integration-jackson` for link:https://persistence.blazebit.com/documentation/entity-view/manual/en_US/index.html#Jackson%20integration[Jackson]
+  - `blaze-persistence-integration-jackson-jakarta` for link:https://persistence.blazebit.com/documentation/entity-view/manual/en_US/index.html#Jackson%20integration[Jackson]
+  - `blaze-persistence-integration-jsonb-jakarta` for link:https://persistence.blazebit.com/documentation/1.6/entity-view/manual/en_US/#jsonb-integration[JSONB]
   - `blaze-persistence-integration-jaxrs` for link:https://persistence.blazebit.com/documentation/entity-view/manual/en_US/index.html#jaxrs-integration[Jakarta REST]
+  - `blaze-persistence-integration-jaxrs-jackson-jakarta` for link:https://persistence.blazebit.com/documentation/entity-view/manual/en_US/index.html#jaxrs-integration[Jakarta REST with Jackson]
+  - `blaze-persistence-integration-jaxrs-jsonb-jakarta` for link:https://persistence.blazebit.com/documentation/entity-view/manual/en_US/index.html#jaxrs-integration[Jakarta REST with JSONB]
 
 [source,xml,role="primary asciidoc-tabs-target-sync-cli asciidoc-tabs-target-sync-maven"]
 .Example dependencies using Maven
 ----
 <!-- Blaze-Persistence specific dependencies -->
 <dependency>
     <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-quarkus</artifactId>
+    <artifactId>blaze-persistence-integration-quarkus-3</artifactId>
 </dependency>
 <dependency>
     <groupId>com.blazebit</groupId>
-    <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
+    <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
     <scope>runtime</scope>
 </dependency>
 ----
 
 [source,gradle,role="secondary asciidoc-tabs-target-sync-gradle"]
 .Using Gradle
 ----
-implementation("com.blazebit:blaze-persistence-integration-quarkus")
-runtimeOnly("com.blazebit:blaze-persistence-integration-hibernate-5.6")
+implementation("com.blazebit:blaze-persistence-integration-quarkus-3")
+runtimeOnly("com.blazebit:blaze-persistence-integration-hibernate-6.2")
 ----
 
 The use in native images requires a dependency on the entity view annotation processor that may be extracted into a separate `native` profile:
@@ -70,7 +73,7 @@ The use in native images requires a dependency on the entity view annotation pro
         <dependencies>
             <dependency>
                 <groupId>com.blazebit</groupId>
-                <artifactId>blaze-persistence-entity-view-processor</artifactId>
+                <artifactId>blaze-persistence-entity-view-processor-jakarta</artifactId>
                 <scope>provided</scope>
             </dependency>
         </dependencies>

docs/src/main/asciidoc/build-analytics.adoc

@@ -6,7 +6,6 @@ https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 = Build analytics
 :categories: analytics
 :summary: This guide presents what build analytics is and how to configure it.
-:extensions: io.quarkus:quarkus-core
 
 The Quarkus team has limited knowledge, from Maven download numbers, of the remarkable growth of Quarkus and the number of users reporting issues/concerns. Still, we need more insight into the platforms, operating system, Java combinations, and build tools our users employ.
 The build analytics tool aims to provide us with this information.

docs/src/main/asciidoc/building-native-image.adoc

@@ -8,7 +8,6 @@ include::_attributes.adoc[]
 :categories: getting-started, native
 :summary: Build native executables with GraalVM or Mandrel.
 :topics: native,graalvm,mandrel
-:extensions: io.quarkus:quarkus-core
 
 This guide covers:
 

docs/src/main/asciidoc/capabilities.adoc

@@ -8,7 +8,6 @@ include::_attributes.adoc[]
 :categories: writing-extensions
 :summary: How capabilities are implemented and used in Quarkus.
 :topics: extensions
-:extensions: io.quarkus:quarkus-core
 
 Quarkus extensions may provide certain capabilities and require certain capabilities to be provided by other extensions in an application to function properly.
 

docs/src/main/asciidoc/class-loading-reference.adoc

@@ -8,7 +8,6 @@ include::_attributes.adoc[]
 :categories: architecture
 :summary: Learn more about Quarkus class loading infrastructure.
 :topics: internals,extensions
-:extensions: io.quarkus:quarkus-core
 
 This document explains the Quarkus class loading architecture. It is intended for extension
 authors and advanced users who want to understand exactly how Quarkus works.

docs/src/main/asciidoc/command-mode-reference.adoc

@@ -8,7 +8,6 @@ include::_attributes.adoc[]
 :categories: core, command-line
 :summary: This reference guide explains how to develop command line applications with Quarkus.
 :topics: command-line,cli
-:extensions: io.quarkus:quarkus-core
 
 This reference covers how to write applications that run and then exit.
 

docs/src/main/asciidoc/conditional-extension-dependencies.adoc

@@ -8,7 +8,6 @@ include::_attributes.adoc[]
 :categories: writing-extensions
 :summary: Trigger the inclusion on additional extensions based on certain conditions.
 :topics: extensions
-:extensions: io.quarkus:quarkus-core
 
 Quarkus extension dependencies are usually configured in the same way as any other project dependencies in the project's build file, e.g. the Maven `pom.xml` or the Gradle build scripts. However, there are dependency types that aren't yet supported out-of-the-box by Maven and Gradle. What we refer here to as "conditional dependencies" is one example.
 

docs/src/main/asciidoc/config-extending-support.adoc

@@ -11,7 +11,6 @@ include::_attributes.adoc[]
 :sectnums:
 :sectnumlevels: 4
 :topics: configuration
-:extensions: io.quarkus:quarkus-core
 
 [[custom-config-source]]
 == Custom `ConfigSource`

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

@@ -11,7 +11,6 @@ include::_attributes.adoc[]
 :sectnums:
 :sectnumlevels: 4
 :topics: configuration
-:extensions: io.quarkus:quarkus-core
 
 With config mappings it is possible to group multiple configuration properties in a single interface that
 share the same prefix.

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

@@ -11,7 +11,6 @@ include::_attributes.adoc[]
 :sectnums:
 :sectnumlevels: 4
 :topics: configuration
-:extensions: io.quarkus:quarkus-core
 
 IMPORTANT: The content of this guide has been revised and split into additional topics. Please check the <<additional-information,Additional Information>> section.
 

docs/src/main/asciidoc/config.adoc

@@ -8,7 +8,6 @@ include::_attributes.adoc[]
 :categories: core
 :summary: Hardcoded values in your code is a no go (even if we all did it at some point ;-)). In this guide, we learn how to configure your application.
 :topics: configuration
-:extensions: io.quarkus:quarkus-core
 
 IMPORTANT: The content of this guide and been revised and split into additional topics. Please check the
 <<additional-information,Additional Information>> section.

docs/src/main/asciidoc/context-propagation.adoc

@@ -8,7 +8,6 @@ include::_attributes.adoc[]
 :categories: core
 :summary: Learn more about how you can pass contextual information with SmallRye Context Propagation.
 :topics: context-propagation
-:extensions: io.quarkus:quarkus-core
 
 Traditional blocking code uses link:https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/ThreadLocal.html[`ThreadLocal`]
  variables to store contextual objects in order to avoid

docs/src/main/asciidoc/continuous-testing.adoc

@@ -10,8 +10,7 @@ include::_attributes.adoc[]
 :numbered:
 :sectnums:
 :sectnumlevels: 4
-:topics: testing,dev-ui,tooling,devmode
-:extensions: io.quarkus:quarkus-core
+:topics: testing,dev-ui,tooling,dev-mode
 
 Learn how to use continuous testing in your Quarkus Application.