Merge branch 'main' into add-jackson-deserializer-info

quarkusio · Feb 18, 2025 · fd226f4 · fd226f4
2 parents 341eb53 + 57e6041
commit fd226f4
Show file tree

Hide file tree

Showing 161 changed files with 1,674 additions and 776 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -22,7 +22,7 @@
         <cyclonedx.version>9.0.5</cyclonedx.version>
         <expressly.version>5.0.0</expressly.version>
         <findbugs.version>3.0.2</findbugs.version>
-        <jandex.version>3.2.6</jandex.version>
+        <jandex.version>3.2.7</jandex.version>
         <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
         <javax.inject.version>1</javax.inject.version>
         <parsson.version>1.1.7</parsson.version>
@@ -47,7 +47,7 @@
         <microprofile-lra.version>2.0</microprofile-lra.version>
         <microprofile-openapi.version>4.0.2</microprofile-openapi.version>
         <smallrye-common.version>2.10.0</smallrye-common.version>
-        <smallrye-config.version>3.11.2</smallrye-config.version>
+        <smallrye-config.version>3.12.0</smallrye-config.version>
         <smallrye-health.version>4.2.0</smallrye-health.version>
         <smallrye-metrics.version>4.0.0</smallrye-metrics.version>
         <smallrye-open-api.version>4.0.8</smallrye-open-api.version>
@@ -158,12 +158,12 @@
         <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.3.1</flyway.version>
+        <flyway.version>11.3.2</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>
+        <snakeyaml.version>2.4</snakeyaml.version>
         <osgi.version>6.0.0</osgi.version>
         <mongo-client.version>5.3.1</mongo-client.version>
         <proton-j.version>0.34.1</proton-j.version>

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -29,7 +29,7 @@
         <jboss-bridger-plugin.version>1.6.Final</jboss-bridger-plugin.version>
 
         <!-- Jandex versions -->
-        <jandex.version>3.2.6</jandex.version>
+        <jandex.version>3.2.7</jandex.version>
         <jandex-gradle-plugin.version>1.0.0</jandex-gradle-plugin.version>
 
         <asciidoctorj.version>2.5.13</asciidoctorj.version>

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/ConfigMappingBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/ConfigMappingBuildItem.java
@@ -28,7 +28,7 @@ public boolean isStaticInitSafe() {
     }
 
     public ConfigClass toConfigClass() {
-        return new ConfigClass(configClass, prefix);
+        return ConfigClass.configClass(configClass, prefix);
     }
 
     @Override

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/ConfigMappingUtils.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/ConfigMappingUtils.java
@@ -193,7 +193,8 @@ private static void registerImplicitConverter(
 
     public static Object newInstance(Class<?> configClass) {
         if (configClass.isAnnotationPresent(ConfigMapping.class)) {
-            return ReflectUtil.newInstance(ConfigMappingLoader.getImplementationClass(configClass));
+            // TODO - radcortez - mapping classes cannot be initialized like this.
+            return ReflectUtil.newInstance(ConfigMappingLoader.ensureLoaded(configClass).implementation());
         } else {
             return ReflectUtil.newInstance(configClass);
         }

diff --git a/...ment/src/main/java/io/quarkus/deployment/configuration/RunTimeConfigurationGenerator.java b/...ment/src/main/java/io/quarkus/deployment/configuration/RunTimeConfigurationGenerator.java
@@ -3,6 +3,7 @@
 import static io.quarkus.deployment.util.ReflectUtil.reportError;
 import static io.quarkus.runtime.annotations.ConfigPhase.BUILD_AND_RUN_TIME_FIXED;
 import static io.quarkus.runtime.annotations.ConfigPhase.RUN_TIME;
+import static io.smallrye.config.common.utils.StringUtil.skewer;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -1231,7 +1232,8 @@ private void generateIsMapped(final String methodName, final ConfigPatternMap<Bo
                     BranchResult nextEquals = hasNextTrue
                             .ifTrue(hasNextTrue.invokeStaticMethod(PU_IS_MAPPED, nameIterator, hasNextTrue.load(childName)));
                     try (BytecodeCreator nextEqualsTrue = nextEquals.trueBranch()) {
-                        String childMethodName = methodName + "$" + childName.replace("[*]", "-collection");
+                        childName = childName.replace("[*]", "-collection");
+                        String childMethodName = methodName + "$" + skewer(childName, '_');
                         if (child.getMatched() == null) {
                             generateIsMapped(childMethodName, child);
                             nextEqualsTrue.invokeVirtualMethod(NI_NEXT, nameIterator);

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/images/ContainerImages.java b/core/deployment/src/main/java/io/quarkus/deployment/images/ContainerImages.java
@@ -52,10 +52,20 @@ public class ContainerImages {
     public static final String UBI9_MINIMAL_VERSION = UBI9_VERSION;
     public static final String UBI9_MINIMAL = UBI9_MINIMAL_IMAGE_NAME + ":" + UBI9_MINIMAL_VERSION;
 
-    // Quarkus Micro image - https://quay.io/repository/quarkus/quarkus-micro-image?tab=tags
-    public static final String QUARKUS_MICRO_IMAGE_NAME = "quay.io/quarkus/quarkus-micro-image";
-    public static final String QUARKUS_MICRO_VERSION = "2.0";
-    public static final String QUARKUS_MICRO_IMAGE = QUARKUS_MICRO_IMAGE_NAME + ":" + QUARKUS_MICRO_VERSION;
+    // UBI 8 Quarkus Micro image - https://quay.io/repository/quarkus/quarkus-micro-image?tab=tags
+    public static final String UBI8_QUARKUS_MICRO_IMAGE_NAME = "quay.io/quarkus/quarkus-micro-image";
+    public static final String UBI8_QUARKUS_MICRO_VERSION = "2.0";
+    public static final String UBI8_QUARKUS_MICRO_IMAGE = UBI8_QUARKUS_MICRO_IMAGE_NAME + ":" + UBI8_QUARKUS_MICRO_VERSION;
+
+    // UBI 9 Quarkus Micro image - https://quay.io/repository/quarkus/ubi9-quarkus-micro-image?tab=tags
+    public static final String UBI9_QUARKUS_MICRO_IMAGE_NAME = "quay.io/quarkus/ubi9-quarkus-micro-image";
+    public static final String UBI9_QUARKUS_MICRO_VERSION = "2.0";
+    public static final String UBI9_QUARKUS_MICRO_IMAGE = UBI9_QUARKUS_MICRO_IMAGE_NAME + ":" + UBI9_QUARKUS_MICRO_VERSION;
+
+    // default Quarkus Micro image - https://quay.io/repository/quarkus/quarkus-micro-image?tab=tags
+    public static final String QUARKUS_MICRO_IMAGE_NAME = UBI9_QUARKUS_MICRO_IMAGE_NAME;
+    public static final String QUARKUS_MICRO_VERSION = UBI9_QUARKUS_MICRO_VERSION;
+    public static final String QUARKUS_MICRO_IMAGE = UBI9_QUARKUS_MICRO_IMAGE;
 
     // === Runtime images for containers (JVM)
 

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java
@@ -95,9 +95,8 @@ public interface NativeConfig {
      *
      * @deprecated Use the global quarkus.default-locale.
      */
-    @WithConverter(TrimmedStringConverter.class)
     @Deprecated
-    Optional<String> userLanguage();
+    Optional<@WithConverter(TrimmedStringConverter.class) String> userLanguage();
 
     /**
      * Defines the user country used for building the native executable.
@@ -108,9 +107,8 @@ public interface NativeConfig {
      *
      * @deprecated Use the global quarkus.default-locale.
      */
-    @WithConverter(TrimmedStringConverter.class)
     @Deprecated
-    Optional<String> userCountry();
+    Optional<@WithConverter(TrimmedStringConverter.class) String> userCountry();
 
     /**
      * Defines the file encoding as in {@code -Dfile.encoding=...}.