Merge pull request #46342 from gsmet/3.19.0-backports-2

[3.19] 3.19.0 backports 2

Author: gsmet

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>
@@ -158,7 +158,7 @@
         <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>
@@ -211,7 +211,7 @@
         <java-buildpack-client.version>0.0.12</java-buildpack-client.version>
         <org-crac.version>0.1.3</org-crac.version>
         <sshd-common.version>2.12.1</sshd-common.version>
-        <mime4j.version>0.8.11</mime4j.version>
+        <mime4j.version>0.8.12</mime4j.version>
         <mutiny-zero.version>1.1.1</mutiny-zero.version>
         <pulsar-client.version>3.3.0</pulsar-client.version>
         <async-http-client.version>2.12.4</async-http-client.version>

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>

core/deployment/src/main/java/io/quarkus/deployment/images/ContainerImages.java

@@ -91,10 +91,22 @@ public class ContainerImages {
 
     // === Source To Image images
 
-    // Quarkus Binary Source To Image - https://quay.io/repository/quarkus/ubi-quarkus-native-binary-s2i?tab=tags
-    public static final String QUARKUS_BINARY_S2I_IMAGE_NAME = "quay.io/quarkus/ubi-quarkus-native-binary-s2i";
-    public static final String QUARKUS_BINARY_S2I_VERSION = "2.0";
-    public static final String QUARKUS_BINARY_S2I = QUARKUS_BINARY_S2I_IMAGE_NAME + ":" + QUARKUS_BINARY_S2I_VERSION;
+    // UBI 8 Quarkus Binary Source To Image - https://quay.io/repository/quarkus/ubi-quarkus-native-binary-s2i?tab=tags
+    public static final String UBI8_QUARKUS_BINARY_S2I_IMAGE_NAME = "quay.io/quarkus/ubi-quarkus-native-binary-s2i";
+    public static final String UBI8_QUARKUS_BINARY_S2I_VERSION = "2.0";
+    public static final String UBI8_QUARKUS_BINARY_S2I = UBI8_QUARKUS_BINARY_S2I_IMAGE_NAME + ":"
+            + UBI8_QUARKUS_BINARY_S2I_VERSION;
+
+    // UBI 9 Quarkus Binary Source To Image - https://quay.io/repository/quarkus/ubi9-quarkus-native-binary-s2i?tab=tags
+    public static final String UBI9_QUARKUS_BINARY_S2I_IMAGE_NAME = "quay.io/quarkus/ubi9-quarkus-native-binary-s2i";
+    public static final String UBI9_QUARKUS_BINARY_S2I_VERSION = "2.0";
+    public static final String UBI9_QUARKUS_BINARY_S2I = UBI9_QUARKUS_BINARY_S2I_IMAGE_NAME + ":"
+            + UBI9_QUARKUS_BINARY_S2I_VERSION;
+
+    // default Quarkus Binary Source To Image - https://quay.io/repository/quarkus/ubi9-quarkus-native-binary-s2i?tab=tags
+    public static final String QUARKUS_BINARY_S2I_IMAGE_NAME = UBI9_QUARKUS_BINARY_S2I_IMAGE_NAME;
+    public static final String QUARKUS_BINARY_S2I_VERSION = UBI9_QUARKUS_BINARY_S2I_VERSION;
+    public static final String QUARKUS_BINARY_S2I = UBI9_QUARKUS_BINARY_S2I;
 
     // Java 17 Source To Image - https://catalog.redhat.com/software/containers/ubi9/openjdk-17/61ee7c26ed74b2ffb22b07f6
     public static final String S2I_JAVA_17_IMAGE_NAME = "registry.access.redhat.com/ubi9/openjdk-17";

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=...}.

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

@@ -2367,12 +2367,34 @@ TIP: A list element can be accessed directly via an index: `{list.10}` or even `
 * `fmt` or `format`: Formats the string instance via `java.lang.String.format()`
 ** `{myStr.fmt("arg1","arg2")}`
 ** `{myStr.format(locale,arg1)}`
+
+* `+`: Infix notation for concatenation, works with `String` and `StringBuilder` base objects
+** `{item.name + '_' + mySuffix}`
+** `{name + 10}`
+
+* `str:['<value>']`: Returns the string value, e.g. to easily concatenate another string value
+** `{str:['/path/to/'] + fileName}`
+  
 * `str:fmt` or `str:format`: Formats the supplied string value via `java.lang.String.format()`
 ** `{str:format("Hello %s!",name)}`
 ** `{str:fmt(locale,'%tA',now)}`
-* `+`: Concatenation
-** `{item.name + '_' + mySuffix}`
-** `{name + 10}`
+** `{str:fmt('/path/to/%s', fileName)}`
+
+* `str:concat`: Concatenates the string representations of the specified arguments.
+** `{str:concat("Hello ",name,"!")}` yields `Hello Foo!` if `name` resolves to `Foo`
+** `{str:concat('/path/to/', fileName)}`
+
+* `str:join`: Joins the string representations of the specified arguments together with a delimiter. 
+** `{str:join('_','Qute','is','cool')}` yields `Qute_is_cool`
+
+* `str:builder`: Returns a new string builder. 
+** `{str:builder('Qute').append("is").append("cool!")}` yields `Qute is cool!`
+** `{str:builder('Qute') + "is" + whatisqute + "!"}` yields `Qute is cool!` if `whatisqute` resolves to `cool`
+
+* `str:eval`: Evaluates the string representation of the first argument as a template in the <<current_context_object,current context>>. 
+** `{str:eval('Hello {name}!')` yields `Hello lovely!` if `name` resolves to `lovely`
+** `{str:eval(myTemplate)}` yields `Hello lovely!` if `myTemplate` resolves to `Hello {name}!` and `name` resolves to `lovely`
+** `{str:eval('/path/to/{fileName}')}` yields `/path/to/file.txt` if `fileName` resolves to `file.txt`
 
 ===== Config
 
@@ -3082,8 +3104,10 @@ TIP: There is also <<convenient-annotation-for-enums,`@TemplateEnum`>> - a conve
 
 ==== Message Templates
 
-Every method of a message bundle interface must define a message template. The value is normally defined by `io.quarkus.qute.i18n.Message#value()`,
-but for convenience, there is also an option to define the value in a localized file.
+Every method of a message bundle interface must define a message template. 
+The value is normally defined by `io.quarkus.qute.i18n.Message#value()`, but for convenience, there is also an option to define the value in a localized file.
+Message templates are validated during the build. 
+If a missing message template is detected, an exception is thrown and the build fails.
 
 .Example of the Message Bundle Interface without the value
 [source,java]
@@ -3114,8 +3138,23 @@ goodbye=Best regards, {name} <1>
 ----
 <1> The value is ignored as `io.quarkus.qute.i18n.Message#value()` is always prioritized.
 
-Message templates are validated during the build. If a missing message template is detected, an exception is thrown and build fails.
+It is also possible to define a _default message template_.
+The default template is only used if the `Message#value()` is not specified and no relevant message template is defined in a localized file.
 
+.Example of the Message Bundle Interface with a default value
+[source,java]
+----
+import io.quarkus.qute.i18n.Message;
+import io.quarkus.qute.i18n.MessageBundle;
+
+@MessageBundle
+public interface AppMessages {
+
+    @Message(defaultValue = "Goodbye {name}!") <1>
+    String goodbye(String name);
+}
+----
+<1> The annotation value is only used if no message template is defined in a localized file.
 
 === Configuration Reference
 

extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceJdbcBuildTimeConfig.java

@@ -21,8 +21,7 @@ public interface DataSourceJdbcBuildTimeConfig {
     /**
      * The datasource driver class name
      */
-    @WithConverter(TrimmedStringConverter.class)
-    Optional<String> driver();
+    Optional<@WithConverter(TrimmedStringConverter.class) String> driver();
 
     /**
      * Whether we want to use regular JDBC transactions, XA, or disable all transactional capabilities.

extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceJdbcRuntimeConfig.java

@@ -21,8 +21,7 @@ public interface DataSourceJdbcRuntimeConfig {
     /**
      * The datasource URL
      */
-    @WithConverter(TrimmedStringConverter.class)
-    Optional<String> url();
+    Optional<@WithConverter(TrimmedStringConverter.class) String> url();
 
     /**
      * The initial size of the pool. Usually you will want to set the initial size to match at least the

extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourceBuildTimeConfig.java

@@ -14,8 +14,7 @@ public interface DataSourceBuildTimeConfig {
     /**
      * The kind of database we will connect to (e.g. h2, postgresql...).
      */
-    @WithConverter(DatabaseKindConverter.class)
-    Optional<String> dbKind();
+    Optional<@WithConverter(DatabaseKindConverter.class) String> dbKind();
 
     /**
      * The version of the database we will connect to (e.g. '10.0').
@@ -46,8 +45,7 @@ public interface DataSourceBuildTimeConfig {
      *
      * @asciidoclet
      */
-    @WithConverter(TrimmedStringConverter.class)
-    Optional<String> dbVersion();
+    Optional<@WithConverter(TrimmedStringConverter.class) String> dbVersion();
 
     /**
      * Dev Services.

extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourceRuntimeConfig.java

@@ -33,8 +33,7 @@ public interface DataSourceRuntimeConfig {
     /**
      * The credentials provider name
      */
-    @WithConverter(TrimmedStringConverter.class)
-    Optional<String> credentialsProvider();
+    Optional<@WithConverter(TrimmedStringConverter.class) String> credentialsProvider();
 
     /**
      * The credentials provider bean name.
@@ -45,6 +44,5 @@ public interface DataSourceRuntimeConfig {
      * <p>
      * For Vault, the credentials provider bean name is {@code vault-credentials-provider}.
      */
-    @WithConverter(TrimmedStringConverter.class)
-    Optional<String> credentialsProviderName();
+    Optional<@WithConverter(TrimmedStringConverter.class) String> credentialsProviderName();
 }

extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DevServicesBuildTimeConfig.java

@@ -29,8 +29,7 @@ public interface DevServicesBuildTimeConfig {
      * <p>
      * This has no effect if the provider is not a container-based database, such as H2 or Derby.
      */
-    @WithConverter(TrimmedStringConverter.class)
-    Optional<String> imageName();
+    Optional<@WithConverter(TrimmedStringConverter.class) String> imageName();
 
     /**
      * Environment variables that are passed to the container.
@@ -65,13 +64,12 @@ public interface DevServicesBuildTimeConfig {
      * <p>
      * This has no effect if the provider is not a container-based database, such as H2 or Derby.
      */
-    @WithConverter(TrimmedStringConverter.class)
-    Optional<String> command();
+    Optional<@WithConverter(TrimmedStringConverter.class) String> command();
 
     /**
      * The database name to use if this Dev Service supports overriding it.
      */
-    Optional<String> dbName();
+    Optional<@WithConverter(TrimmedStringConverter.class) String> dbName();
 
     /**
      * The username to use if this Dev Service supports overriding it.