Merge pull request #47385 from gsmet/3.21.3-backports-1

[3.21] 3.21.3 backports 1

Author: gsmet

bom/application/pom.xml

@@ -32,7 +32,7 @@
         <opentelemetry-instrumentation.version>2.10.0-alpha</opentelemetry-instrumentation.version>
         <opentelemetry-semconv.version>1.29.0-alpha</opentelemetry-semconv.version>
         <quarkus-http.version>5.3.4</quarkus-http.version>
-        <micrometer.version>1.14.5</micrometer.version><!-- keep in sync with hdrhistogram: https://central.sonatype.com/artifact/io.micrometer/micrometer-core -->
+        <micrometer.version>1.14.6</micrometer.version><!-- keep in sync with hdrhistogram: https://central.sonatype.com/artifact/io.micrometer/micrometer-core -->
         <hdrhistogram.version>2.2.2</hdrhistogram.version><!-- keep in sync with micrometer -->
         <google-auth.version>0.22.0</google-auth.version>
         <graphql-java.version>22.2</graphql-java.version> <!-- keep in sync with smallrye-graphql -->
@@ -46,17 +46,17 @@
         <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.10.0</smallrye-common.version>
+        <smallrye-common.version>2.12.0</smallrye-common.version>
         <smallrye-config.version>3.12.4</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>
         <smallrye-graphql.version>2.12.2</smallrye-graphql.version>
         <smallrye-fault-tolerance.version>6.9.0</smallrye-fault-tolerance.version>
         <smallrye-jwt.version>4.6.1</smallrye-jwt.version>
-        <smallrye-context-propagation.version>2.2.0</smallrye-context-propagation.version>
+        <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.1</smallrye-reactive-types-converter.version>
+        <smallrye-reactive-types-converter.version>3.0.3</smallrye-reactive-types-converter.version>
         <smallrye-mutiny-vertx-binding.version>3.18.1</smallrye-mutiny-vertx-binding.version>
         <smallrye-reactive-messaging.version>4.27.0</smallrye-reactive-messaging.version>
         <smallrye-stork.version>2.7.3</smallrye-stork.version>
@@ -128,7 +128,7 @@
         <db2-jdbc.version>12.1.0.0</db2-jdbc.version>
         <shrinkwrap.version>1.2.6</shrinkwrap.version>
         <hamcrest.version>2.2</hamcrest.version><!-- The version needs to be compatible with both REST Assured and Awaitility -->
-        <junit.jupiter.version>5.12.1</junit.jupiter.version>
+        <junit.jupiter.version>5.12.2</junit.jupiter.version>
         <infinispan.version>15.0.14.Final</infinispan.version>
         <infinispan.protostream.version>5.0.13.Final</infinispan.protostream.version>
         <caffeine.version>3.2.0</caffeine.version>
@@ -187,7 +187,7 @@
         <picocli.version>4.7.6</picocli.version>
         <google-cloud-functions.version>1.1.4</google-cloud-functions.version>
         <commons-compress.version>1.27.1</commons-compress.version> <!-- Please check with Java Operator SDK / Fabric8 team before updating -->
-        <commons-text.version>1.13.0</commons-text.version>
+        <commons-text.version>1.13.1</commons-text.version>
         <gson.version>2.12.1</gson.version>
         <log4j2-jboss-logmanager.version>2.0.1.Final</log4j2-jboss-logmanager.version>
         <log4j2-api.version>2.24.3</log4j2-api.version>
@@ -3294,6 +3294,11 @@
                 <artifactId>quarkus-observability-devservices</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-observability-devservices-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-observability-devservices-lgtm</artifactId>

bom/dev-ui/pom.xml

@@ -31,7 +31,7 @@
         <es-module-shims.version>2.0.10</es-module-shims.version>
         <path-to-regexp.version>2.4.0</path-to-regexp.version>
         <codeblock.version>1.0.17</codeblock.version>
-        <qomponent.version>1.0.3</qomponent.version>
+        <qomponent.version>1.0.4</qomponent.version>
 
         <hpcc-js-wasm.version>2.15.3</hpcc-js-wasm.version>
         <yargs.version>17.7.2</yargs.version>

build-parent/pom.xml

@@ -277,6 +277,11 @@
                 <artifactId>quarkus-arc-test-supplement</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-arc-test-supplement-decorator</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.assertj</groupId>
                 <artifactId>assertj-core</artifactId>

core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/UnsupportedOSBuildItem.java

@@ -11,10 +11,14 @@
  * extension on a given OS or architecture.
  */
 public final class UnsupportedOSBuildItem extends MultiBuildItem {
+
+    public static String ARCH = System.getProperty("os.arch");
+
     public enum Os {
         WINDOWS(IS_WINDOWS),
         MAC(IS_MAC),
-        LINUX(IS_LINUX);
+        LINUX(IS_LINUX),
+        NONE(false);
 
         public final boolean active;
 
@@ -23,22 +27,52 @@ public enum Os {
         }
     }
 
+    public enum Arch {
+        AMD64("amd64".equalsIgnoreCase(ARCH)),
+        AARCH64("aarch64".equalsIgnoreCase(ARCH)),
+        NONE(false);
+
+        public final boolean active;
+
+        Arch(boolean active) {
+            this.active = active;
+        }
+    }
+
     public final Os os;
+    public final Arch arch;
     public final String error;
 
     public UnsupportedOSBuildItem(Os os, String error) {
         this.os = os;
+        this.arch = Arch.NONE;
+        this.error = error;
+    }
+
+    public UnsupportedOSBuildItem(Arch arch, String error) {
+        this.os = Os.NONE;
+        this.arch = arch;
+        this.error = error;
+    }
+
+    public UnsupportedOSBuildItem(Os os, Arch arch, String error) {
+        this.os = os;
+        this.arch = arch;
         this.error = error;
     }
 
     public boolean triggerError(boolean isContainerBuild) {
         return
         // When the host OS is unsupported, it could have helped to
         // run in a Linux builder image (e.g. an extension unsupported on Windows).
-        (os.active && !isContainerBuild) ||
+        ((os.active && !isContainerBuild) ||
         // If Linux is the OS the extension does not support,
         // it fails in a container build regardless the host OS,
         // because we have only Linux based builder images.
-                (isContainerBuild && os == Os.LINUX);
+                (isContainerBuild && os == Os.LINUX)) ||
+        // We don't do cross-compilation, even builder images have to be
+        // of the same arch, e.g. aarch64 Mac using aarch64 Linux builder image.
+        // So if the arch is unsupported, it fails.
+                arch.active;
     }
 }

core/deployment/src/main/java/io/quarkus/deployment/dev/IDEDevModeMain.java

@@ -5,6 +5,7 @@
 import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
+import java.util.Properties;
 import java.util.Set;
 import java.util.function.BiConsumer;
 
@@ -37,6 +38,10 @@ public void accept(CuratedApplication curatedApplication, Map<String, Object> st
         Path appClasses = (Path) stringObjectMap.get("app-classes");
         DevModeContext devModeContext = new DevModeContext();
         devModeContext.setArgs((String[]) stringObjectMap.get("args"));
+        Properties buildSystemProperties = curatedApplication.getQuarkusBootstrap().getBuildSystemProperties();
+        for (String key : buildSystemProperties.stringPropertyNames()) {
+            devModeContext.getBuildSystemProperties().put(key, buildSystemProperties.getProperty(key));
+        }
 
         ApplicationModel appModel = null;
         try {

core/deployment/src/main/java/io/quarkus/deployment/index/IndexingUtil.java

@@ -44,8 +44,8 @@ public class IndexingUtil {
 
     private static final int JAVA_VERSION;
 
-    // At least Jandex 2.1 is needed
-    private static final int REQUIRED_INDEX_VERSION = 8;
+    // At least Jandex 3.0 is needed
+    private static final int REQUIRED_INDEX_VERSION = 11;
 
     static {
         int version = 8;
@@ -71,7 +71,7 @@ public static Index indexJar(Path path, Set<String> removed) throws IOException
 
     public static Index indexTree(OpenPathTree tree, Set<String> removed) throws IOException {
         if (removed == null) {
-            final Index i = tree.apply(JANDEX_INDEX, MetaInfJandexReader.getInstance());
+            final Index i = tree.apply(JANDEX_INDEX, new MetaInfJandexReader(tree.toString()));
             if (i != null) {
                 return i;
             }
@@ -88,17 +88,19 @@ public static Index indexJar(File file, Set<String> removed) throws IOException
             if (existing != null && removed == null) {
                 try (InputStream in = jarFile.getInputStream(existing)) {
                     IndexReader reader = new IndexReader(in);
-                    if (reader.getIndexVersion() < REQUIRED_INDEX_VERSION) {
-                        log.warnf(
-                                "Re-indexing %s - at least Jandex 2.1 must be used to index an application dependency",
-                                file);
-                        return indexJar(jarFile, removed);
-                    } else {
-                        try {
-                            return reader.read();
-                        } catch (UnsupportedVersion e) {
-                            throw new UnsupportedVersion("Can't read Jandex index from " + file + ": " + e.getMessage());
+                    try {
+                        int indexVersion = reader.getIndexVersion();
+                        if (indexVersion < REQUIRED_INDEX_VERSION) {
+                            log.warnf("Reindexing %s, at least Jandex 3.0 must be used"
+                                    + " to index an application dependency (index version is %s)", file, indexVersion);
+                            return indexJar(jarFile, removed);
                         }
+                        return reader.read();
+                    } catch (UnsupportedVersion e) {
+                        log.warnf("Reindexing %s, the index format is too new for the Jandex version"
+                                + " used by your application. Please report it to the author of this JAR (%s)",
+                                file, e.getMessage());
+                        return indexJar(jarFile, removed);
                     }
                 }
             }
@@ -273,10 +275,10 @@ public void visitPath(PathVisit visit) {
     }
 
     private static class MetaInfJandexReader implements Function<PathVisit, Index> {
-        private static MetaInfJandexReader instance;
+        private final String treeDescription;
 
-        private static MetaInfJandexReader getInstance() {
-            return instance == null ? instance = new MetaInfJandexReader() : instance;
+        MetaInfJandexReader(String treeDescription) {
+            this.treeDescription = treeDescription;
         }
 
         @Override
@@ -287,19 +289,22 @@ public Index apply(PathVisit visit) {
             try (InputStream in = Files.newInputStream(visit.getPath())) {
                 IndexReader reader = new IndexReader(in);
                 try {
-                    if (reader.getIndexVersion() < REQUIRED_INDEX_VERSION) {
-                        log.warnf(
-                                "Re-indexing %s:%s - at least Jandex 2.1 must be used to index an application dependency",
-                                visit.getRoot(), visit.getPath());
+                    int indexVersion = reader.getIndexVersion();
+                    if (indexVersion < REQUIRED_INDEX_VERSION) {
+                        log.warnf("Reindexing %s, at least Jandex 3.0 must be used"
+                                + " to index an application dependency (index version is %s)",
+                                treeDescription, indexVersion);
                         return null;
                     }
                     return reader.read();
                 } catch (UnsupportedVersion e) {
-                    throw new UnsupportedVersion(
-                            "Can't read Jandex index from " + visit.getRoot() + ":" + visit.getPath() + ": " + e.getMessage());
+                    log.warnf("Reindexing %s, the index format is too new for the Jandex version"
+                            + " used by your application. Please report it to the author of this JAR (%s)",
+                            treeDescription, e.getMessage());
+                    return null;
                 }
             } catch (IOException e) {
-                throw new UncheckedIOException("Can't read Jandex index from " + visit.getRoot() + ":" + visit.getPath(), e);
+                throw new UncheckedIOException("Can't read Jandex index from " + treeDescription, e);
             }
         }
     }

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

@@ -1,5 +1,7 @@
 package io.quarkus.deployment.pkg.steps;
 
+import static io.quarkus.deployment.builditem.nativeimage.UnsupportedOSBuildItem.Arch.AMD64;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -855,12 +857,15 @@ public NativeImageInvokerInfo build() {
                 addExperimentalVMOption(nativeImageArgs, "-H:+AllowFoldMethods");
 
                 /*
+                 * @formatter:off
                  * Foreign Function and Memory API in Native Image, JDK's JEP 454
                  * This is needed for JDK 24+ internal native calls due to AWT,
                  * e.g. JDK-8337237 et al.
-                 *
+                 * Note GraalVM FFI/FFM support per platform:
+                 * https://www.graalvm.org/latest/reference-manual/native-image/native-code-interoperability/foreign-interface/#foreign-functions
+                 * @formatter:on
                  */
-                if (graalVMVersion.compareTo(GraalVM.Version.VERSION_24_2_0) >= 0) {
+                if (graalVMVersion.compareTo(GraalVM.Version.VERSION_24_2_0) >= 0 && AMD64.active) {
                     addExperimentalVMOption(nativeImageArgs, "-H:+ForeignAPISupport");
                 }
 

core/runtime/src/main/java/io/quarkus/runtime/graal/GraalVM.java

@@ -68,6 +68,7 @@ public static class Version implements Comparable<Version> {
 
         public static final Version VERSION_23_0_0 = new Version("GraalVM 23.0.0", "23.0.0", "17", Distribution.GRAALVM);
         public static final Version VERSION_23_1_0 = new Version("GraalVM 23.1.0", "23.1.0", "21", Distribution.GRAALVM);
+        public static final Version VERSION_24_2_0 = new Version("GraalVM 24.2.0", "24.2.0", "24", Distribution.GRAALVM);
 
         // Temporarily work around https://github.com/quarkusio/quarkus/issues/36246,
         // till we have a consensus on how to move forward in

devtools/cli/src/test/java/io/quarkus/cli/MavenProjectInfoAndUpdateTest.java

@@ -104,14 +104,17 @@ void testMisalignedPlatformExtensionVersion() throws Exception {
         assertRegistryExtensions(infoResult.stdout, "registry.acme.org",
                 UP_TO_DATE_ICON.iconOrMessage() + "       org.acme:acme-quarkiverse-extension:1.0");
 
-        final CliDriver.Result rectifyResult = run(projectDir, "update", "--platform-version=1.0.0", "--no-rewrite");
-        assertThat(rectifyResult.getExitCode()).isEqualTo(0);
+        CliDriver.Result updateResult = run(projectDir, "update", "--platform-version=1.0.0", "--no-rewrite");
+        assertThat(updateResult.getExitCode()).isEqualTo(0);
 
-        assertThat(rectifyResult.stdout)
+        assertThat(updateResult.stdout)
                 .contains(
                         "-       org.acme.quarkus.platform:acme-quarkus-subatomic:[1.0.0 -> managed]");
+        assertQuarkusPlatformBomUpdates(updateResult.stdout,
+                ArtifactCoords.pom("org.acme.quarkus.platform", "quarkus-bom", "[2.0.0 -> 1.0.0]"),
+                ArtifactCoords.pom("org.acme.quarkus.platform", "acme-bom", "[2.0.0 -> 1.0.0]"));
 
-        final CliDriver.Result updateResult = run(projectDir, "update", "-Dquarkus.platform.version=1.0.0", "--no-rewrite");
+        updateResult = run(projectDir, "update", "-Dquarkus.platform.version=1.0.0", "--no-rewrite");
         assertThat(updateResult.getExitCode()).isEqualTo(0);
         assertQuarkusPlatformBomUpdates(updateResult.stdout,
                 ArtifactCoords.pom("org.acme.quarkus.platform", "quarkus-bom", "[1.0.0 -> 2.0.0]"),

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

@@ -5,8 +5,11 @@
 import java.io.File;
 import java.nio.file.Path;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Optional;
+import java.util.Properties;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -461,6 +464,8 @@ public boolean isSatisfiedBy(Task t) {
                         t.notCompatibleWithConfigurationCache(
                                 "The quarkus-plugin isn't compatible with the configuration cache");
 
+                        t.setSystemProperties(extractQuarkusTestSystemProperties());
+
                         // Quarkus test configuration action which should be executed before any Quarkus test
                         // Use anonymous classes in order to leverage task avoidance.
                         t.doFirst(new Action<Task>() {
@@ -718,4 +723,17 @@ private Optional<TaskProvider<Task>> getLazyTask(Project project, String name) {
             return Optional.empty();
         }
     }
+
+    private static Map<String, Object> extractQuarkusTestSystemProperties() {
+        Properties systemProperties = System.getProperties();
+        Map<String, Object> quarkusSystemProperties = new HashMap<>();
+        for (String propertyName : systemProperties.stringPropertyNames()) {
+            if (!propertyName.startsWith("quarkus.test.")) {
+                continue;
+            }
+
+            quarkusSystemProperties.put(propertyName, systemProperties.get(propertyName));
+        }
+        return quarkusSystemProperties;
+    }
 }