Merge pull request #48582 from gsmet/3.24.1-backports-1

[3.24] 3.24.1 backports 1

Author: gsmet

.github/native-tests.json

@@ -32,8 +32,8 @@
         },
         {
             "category": "Data5",
-            "timeout": 70,
-            "test-modules": "jpa-postgresql, jpa-postgresql-withxml, narayana-stm, narayana-jta, reactive-pg-client, hibernate-reactive-postgresql, hibernate-orm-tenancy/schema",
+            "timeout": 75,
+            "test-modules": "jpa-postgresql, jpa-postgresql-withxml, narayana-stm, narayana-jta, reactive-pg-client, hibernate-reactive-postgresql, hibernate-orm-tenancy/schema, hibernate-orm-tenancy/schema-mariadb",
             "os-name": "ubuntu-latest"
         },
         {

bom/application/pom.xml

@@ -46,7 +46,7 @@
         <microprofile-jwt.version>2.1</microprofile-jwt.version>
         <microprofile-lra.version>2.0.1</microprofile-lra.version>
         <microprofile-openapi.version>4.0.2</microprofile-openapi.version>
-        <smallrye-common.version>2.12.0</smallrye-common.version>
+        <smallrye-common.version>2.12.2</smallrye-common.version>
         <smallrye-config.version>3.13.2</smallrye-config.version>
         <smallrye-health.version>4.2.0</smallrye-health.version>
         <smallrye-metrics.version>4.0.0</smallrye-metrics.version>
@@ -57,7 +57,7 @@
         <smallrye-context-propagation.version>2.2.1</smallrye-context-propagation.version>
         <smallrye-reactive-streams-operators.version>1.0.13</smallrye-reactive-streams-operators.version>
         <smallrye-reactive-types-converter.version>3.0.3</smallrye-reactive-types-converter.version>
-        <smallrye-mutiny-vertx-binding.version>3.19.0</smallrye-mutiny-vertx-binding.version>
+        <smallrye-mutiny-vertx-binding.version>3.19.1</smallrye-mutiny-vertx-binding.version>
         <smallrye-reactive-messaging.version>4.28.0</smallrye-reactive-messaging.version>
         <smallrye-stork.version>2.7.3</smallrye-stork.version>
         <jakarta.activation.version>2.1.3</jakarta.activation.version>
@@ -89,7 +89,7 @@
         <!-- GraalVM sdk 23.1.2 has a minimum JDK requirement of 17+ at runtime -->
         <graal-sdk.version>23.1.2</graal-sdk.version>
         <gizmo.version>1.9.0</gizmo.version>
-        <jackson-bom.version>2.19.0</jackson-bom.version>
+        <jackson-bom.version>2.19.1</jackson-bom.version>
         <commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>
         <commons-lang3.version>3.17.0</commons-lang3.version>
         <commons-codec.version>1.18.0</commons-codec.version>
@@ -111,7 +111,7 @@
         <wildfly-elytron.version>2.6.4.Final</wildfly-elytron.version>
         <jboss-marshalling.version>2.2.3.Final</jboss-marshalling.version>
         <jboss-threads.version>3.9.1</jboss-threads.version>
-        <vertx.version>4.5.14</vertx.version>
+        <vertx.version>4.5.16</vertx.version>
         <httpclient.version>4.5.14</httpclient.version>
         <httpcore.version>4.4.16</httpcore.version>
         <httpasync.version>4.1.5</httpasync.version>
@@ -159,7 +159,7 @@
         <maven-invoker.version>3.2.0</maven-invoker.version>
         <awaitility.version>4.3.0</awaitility.version>
         <jboss-logmanager.version>3.1.2.Final</jboss-logmanager.version>
-        <flyway.version>11.9.1</flyway.version>
+        <flyway.version>11.9.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>
@@ -196,7 +196,7 @@
         <avro.version>1.12.0</avro.version>
         <apicurio-registry.version>2.6.12.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.21.1</testcontainers.version> <!-- Make sure to also update docker-java.version to match its needs -->
+        <testcontainers.version>1.21.2</testcontainers.version> <!-- Make sure to also update docker-java.version to match its needs -->
         <docker-java.version>3.4.2</docker-java.version> <!-- must be the version Testcontainers use: https://central.sonatype.com/artifact/org.testcontainers/testcontainers -->
         <!-- Check the compatibility matrix (https://github.com/opensearch-project/opensearch-testcontainers) before upgrading: -->
         <opensearch-testcontainers.version>2.0.2</opensearch-testcontainers.version>

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

@@ -25,22 +25,28 @@ public class CompiledJavaVersionBuildStep {
     @BuildStep
     public CompiledJavaVersionBuildItem compiledJavaVersion(CurateOutcomeBuildItem curateOutcomeBuildItem) {
         final ResolvedDependency appArtifact = curateOutcomeBuildItem.getApplicationModel().getAppArtifact();
-        Integer majorVersion = getMajorJavaVersion(appArtifact);
-        if (majorVersion == null) {
-            // workspace info isn't available in prod builds though
-            for (ResolvedDependency module : curateOutcomeBuildItem.getApplicationModel()
-                    .getDependencies(DependencyFlags.WORKSPACE_MODULE)) {
-                majorVersion = getMajorJavaVersion(module);
-                if (majorVersion != null) {
-                    break;
+        try {
+            Integer majorVersion = getMajorJavaVersion(appArtifact);
+            if (majorVersion == null) {
+                // workspace info isn't available in prod builds though
+                for (ResolvedDependency module : curateOutcomeBuildItem.getApplicationModel()
+                        .getDependencies(DependencyFlags.WORKSPACE_MODULE)) {
+                    majorVersion = getMajorJavaVersion(module);
+                    if (majorVersion != null) {
+                        break;
+                    }
                 }
             }
-        }
-        if (majorVersion == null) {
-            log.debug("No .class files located");
+            if (majorVersion == null) {
+                log.debug("No .class files located");
+                return CompiledJavaVersionBuildItem.unknown();
+            }
+            return CompiledJavaVersionBuildItem.fromMajorJavaVersion(majorVersion);
+        } catch (Exception e) {
+            log.warn("Failed to parse major version", e);
             return CompiledJavaVersionBuildItem.unknown();
         }
-        return CompiledJavaVersionBuildItem.fromMajorJavaVersion(majorVersion);
+
     }
 
     private static Integer getMajorJavaVersion(ResolvedDependency artifact) {

core/runtime/src/main/java/io/quarkus/runtime/logging/DecorateStackUtil.java

@@ -130,6 +130,9 @@ private static List<String> getRelatedLinesInSource(Path filePath, int lineNumbe
 
     private static String getFullPath(String fullClassName, String fileName) {
         int lastDotIndex = fullClassName.lastIndexOf(".");
+        if (lastDotIndex == -1) {
+            return fileName;
+        }
         String packageName = fullClassName.substring(0, lastDotIndex);
         String path = packageName.replace('.', '/');
         return path + "/" + fileName;

core/runtime/src/main/java/io/quarkus/runtime/logging/LogRuntimeConfig.java

@@ -372,8 +372,8 @@ interface SyslogConfig {
         /**
          * If enabled, the message being sent is prefixed with the size of the message
          */
-        @WithDefault("false")
-        boolean useCountingFraming();
+        @WithDefault("protocol-dependent")
+        CountingFraming useCountingFraming();
 
         /**
          * Set to {@code true} to truncate the message if it exceeds maximum length
@@ -420,6 +420,20 @@ interface SyslogConfig {
          * Syslog async logging config
          */
         AsyncConfig async();
+
+        /**
+         * Syslog counting framing type used for smarter handling of counting framing value.
+         * <p>
+         * If {@link CountingFraming#PROTOCOL_DEPENDENT} is used, the counting framing will be {@code true}, when the
+         * {@link Protocol#TCP} or {@link Protocol#SSL_TCP} is used. Otherwise {@code false}.
+         * <p>
+         * More information in <a href="http://tools.ietf.org/html/rfc6587#section-3.4.1">http://tools.ietf.org/html/rfc6587</a>
+         */
+        enum CountingFraming {
+            TRUE,
+            FALSE,
+            PROTOCOL_DEPENDENT
+        }
     }
 
     interface SocketConfig {

core/runtime/src/main/java/io/quarkus/runtime/logging/LoggingSetupRecorder.java

@@ -745,7 +745,12 @@ private static Handler configureSyslogHandler(final LogRuntimeConfig.SyslogConfi
             handler.setProtocol(config.protocol());
             handler.setBlockOnReconnect(config.blockOnReconnect());
             handler.setTruncate(config.truncate());
-            handler.setUseCountingFraming(config.useCountingFraming());
+            handler.setUseCountingFraming(switch (config.useCountingFraming()) {
+                case PROTOCOL_DEPENDENT ->
+                    config.protocol() == SyslogHandler.Protocol.TCP || config.protocol() == SyslogHandler.Protocol.SSL_TCP;
+                case TRUE -> true;
+                case FALSE -> false;
+            });
             handler.setLevel(config.level());
             if (config.maxLength().isPresent()) {
                 BigInteger maxLen = config.maxLength().get().asBigInteger();

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/EffectiveConfig.java

@@ -17,6 +17,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 import com.google.common.annotations.VisibleForTesting;
 
@@ -97,6 +98,11 @@ public Map<String, String> getValues() {
         return values;
     }
 
+    public Map<String, String> getOnlyQuarkusValues() {
+        return values.entrySet().stream().filter(e -> e.getKey().startsWith("quarkus."))
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+    }
+
     private Map<String, String> asStringMap(Map<String, ?> map) {
         Map<String, String> target = new HashMap<>();
         map.forEach((k, v) -> {

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusApplicationModelTask.java

@@ -42,7 +42,6 @@
 import org.gradle.api.file.ProjectLayout;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.provider.Property;
-import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.CompileClasspath;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.InputFiles;
@@ -78,7 +77,6 @@
 import io.quarkus.runtime.LaunchMode;
 import io.quarkus.runtime.util.HashUtil;
 
-@CacheableTask
 public abstract class QuarkusApplicationModelTask extends DefaultTask {
 
     /* @formatter:off */

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusRun.java

@@ -102,7 +102,7 @@ public void setJvmArgs(List<String> jvmArgs) {
     public void runQuarkus() {
         ApplicationModel appModel = resolveAppModelForBuild();
         Properties sysProps = new Properties();
-        sysProps.putAll(extension().buildEffectiveConfiguration(appModel).getValues());
+        sysProps.putAll(extension().buildEffectiveConfiguration(appModel).getOnlyQuarkusValues());
         try (CuratedApplication curatedApplication = QuarkusBootstrap.builder()
                 .setBaseClassLoader(getClass().getClassLoader())
                 .setExistingModel(appModel)

devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java

@@ -25,7 +25,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -1610,9 +1609,13 @@ private void setJvmArgs(DevModeCommandLineBuilder builder) throws Exception {
             jvmArgs = buf.toString();
         }
         if (jvmArgs != null) {
-            builder.jvmArgs(Arrays.asList(CommandLineUtils.translateCommandline(jvmArgs)));
+            final String[] arr = CommandLineUtils.translateCommandline(jvmArgs);
+            final List<String> list = new ArrayList<>(arr.length);
+            for (var s : arr) {
+                list.add(s.trim());
+            }
+            builder.jvmArgs(list);
         }
-
     }
 
     private void copySurefireVariables() {