Merge pull request #49837 from gsmet/3.26.2-backports-1

[3.26] 3.26.2 backports 1

Author: gsmet

bom/application/pom.xml

@@ -51,7 +51,7 @@
         <smallrye-health.version>4.2.0</smallrye-health.version>
         <smallrye-metrics.version>4.0.0</smallrye-metrics.version>
         <smallrye-open-api.version>4.0.12</smallrye-open-api.version>
-        <smallrye-graphql.version>2.14.0</smallrye-graphql.version>
+        <smallrye-graphql.version>2.14.1</smallrye-graphql.version>
         <smallrye-fault-tolerance.version>6.9.2</smallrye-fault-tolerance.version>
         <smallrye-jwt.version>4.6.2</smallrye-jwt.version>
         <smallrye-context-propagation.version>2.2.1</smallrye-context-propagation.version>
@@ -101,7 +101,7 @@
         <narayana-lra.version>1.0.2.Final</narayana-lra.version>
         <agroal.version>2.8</agroal.version>
         <jboss-transaction-spi.version>8.0.0.Final</jboss-transaction-spi.version>
-        <elasticsearch-opensource-components.version>9.1.2</elasticsearch-opensource-components.version>
+        <elasticsearch-opensource-components.version>9.1.3</elasticsearch-opensource-components.version>
         <rxjava.version>2.2.21</rxjava.version>
         <wildfly.openssl-java.version>2.2.5.Final</wildfly.openssl-java.version>
         <wildfly.openssl-linux.version>2.2.2.SP01</wildfly.openssl-linux.version>

build-parent/pom.xml

@@ -21,6 +21,7 @@
         <!-- These properties are needed in order for them to be resolvable by the generated projects -->
         <compiler-plugin.version>${version.compiler.plugin}</compiler-plugin.version>
         <kotlin.version>2.2.10</kotlin.version>
+        <ksp-gradle-plugin.version>2.2.10-2.0.2</ksp-gradle-plugin.version> <!-- Kotlin Symbol Processing plugin used in a test -->
         <dokka.version>2.0.0</dokka.version>
         <scala.version>2.13.12</scala.version>
         <scala-maven-plugin.version>4.9.5</scala-maven-plugin.version>
@@ -73,7 +74,7 @@
         <volume.access.modifier>:Z</volume.access.modifier>
 
         <!-- Defaults for integration tests -->
-        <elasticsearch-server.version>9.1.2</elasticsearch-server.version>
+        <elasticsearch-server.version>9.1.3</elasticsearch-server.version>
         <elasticsearch.image>docker.io/elastic/elasticsearch:${elasticsearch-server.version}</elasticsearch.image>
         <logstash.image>docker.io/elastic/logstash:${elasticsearch-server.version}</logstash.image>
         <kibana.image>docker.io/elastic/kibana:${elasticsearch-server.version}</kibana.image>

core/deployment/src/main/java/io/quarkus/deployment/IsContainerRuntimeWorking.java

@@ -88,7 +88,7 @@ public Result get() {
 
                 boolean isAvailable = (boolean) dockerClientFactoryClass.getMethod("isDockerAvailable")
                         .invoke(dockerClientFactoryInstance);
-                if (!isAvailable) {
+                if (!isAvailable && !silent) {
                     compressor.closeAndDumpCaptured();
                 }
 
@@ -117,6 +117,15 @@ public Result get() {
      */
     protected static class DockerHostStrategy implements Strategy {
         private static final String UNIX_SCHEME = "unix";
+        private final boolean silent;
+
+        public DockerHostStrategy() {
+            this.silent = false;
+        }
+
+        public DockerHostStrategy(boolean silent) {
+            this.silent = silent;
+        }
 
         @Override
         public Result get() {
@@ -136,19 +145,23 @@ public Result get() {
                     if (Files.isWritable(dockerSocketPath)) {
                         return Result.AVAILABLE;
                     } else {
-                        LOGGER.warnf(
-                                "Unix socket defined in DOCKER_HOST %s is not writable, make sure Docker is running on the specified host",
-                                dockerHost);
+                        if (!silent) {
+                            LOGGER.warnf(
+                                    "Unix socket defined in DOCKER_HOST %s is not writable, make sure Docker is running on the specified host",
+                                    dockerHost);
+                        }
                     }
                 } else {
                     try (Socket s = new Socket()) {
                         s.connect(new InetSocketAddress(dockerHostUri.getHost(), dockerHostUri.getPort()),
                                 DOCKER_HOST_CHECK_TIMEOUT);
                         return Result.AVAILABLE;
                     } catch (IOException e) {
-                        LOGGER.warnf(
-                                "Unable to connect to DOCKER_HOST URI %s, make sure Docker is running on the specified host",
-                                dockerHost);
+                        if (!silent) {
+                            LOGGER.warnf(
+                                    "Unable to connect to DOCKER_HOST URI %s, make sure Docker is running on the specified host",
+                                    dockerHost);
+                        }
                     }
                 }
             } catch (URISyntaxException | IllegalArgumentException e) {

core/deployment/src/main/java/io/quarkus/deployment/IsDockerWorking.java

@@ -14,13 +14,19 @@ public IsDockerWorking() {
     }
 
     public IsDockerWorking(boolean silent) {
-        super(List.of(new TestContainersStrategy(silent), new DockerHostStrategy(), new DockerBinaryStrategy()));
+        super(List.of(new TestContainersStrategy(silent), new DockerHostStrategy(silent), new DockerBinaryStrategy(silent)));
     }
 
     private static class DockerBinaryStrategy implements Strategy {
+        private final boolean silent;
+
+        public DockerBinaryStrategy(boolean silent) {
+            this.silent = silent;
+        }
+
         @Override
         public Result get() {
-            if (ContainerRuntimeUtil.detectContainerRuntime(false,
+            if (ContainerRuntimeUtil.detectContainerRuntime(false, silent,
                     ContainerRuntime.DOCKER, ContainerRuntime.PODMAN) != UNAVAILABLE) {
                 return Result.AVAILABLE;
             } else {

core/deployment/src/main/java/io/quarkus/deployment/IsPodmanWorking.java

@@ -15,14 +15,20 @@ public IsPodmanWorking() {
     public IsPodmanWorking(boolean silent) {
         super(List.of(
                 new TestContainersStrategy(silent),
-                new DockerHostStrategy(),
-                new PodmanBinaryStrategy()));
+                new DockerHostStrategy(silent),
+                new PodmanBinaryStrategy(silent)));
     }
 
     private static class PodmanBinaryStrategy implements Strategy {
+        private final boolean silent;
+
+        public PodmanBinaryStrategy(boolean silent) {
+            this.silent = silent;
+        }
+
         @Override
         public Result get() {
-            if (ContainerRuntimeUtil.detectContainerRuntime(false, ContainerRuntime.PODMAN) != UNAVAILABLE) {
+            if (ContainerRuntimeUtil.detectContainerRuntime(false, silent, ContainerRuntime.PODMAN) != UNAVAILABLE) {
                 return Result.AVAILABLE;
             } else {
                 return Result.UNKNOWN;

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

@@ -10,6 +10,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.nio.file.FileSystemException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -26,6 +27,7 @@
 import io.quarkus.dev.spi.DevModeType;
 import io.quarkus.maven.dependency.ArtifactKey;
 import io.quarkus.paths.PathList;
+import io.smallrye.common.os.OS;
 
 /**
  * The main entry point for the dev mojo execution
@@ -196,7 +198,18 @@ private void linkDotEnvFile() {
             silentDeleteFile(link);
             try {
                 // create a symlink to ensure that user updates to the file have the expected effect in dev-mode
-                Files.createSymbolicLink(link, dotEnvPath);
+                try {
+                    Files.createSymbolicLink(link, dotEnvPath);
+                } catch (FileSystemException e) {
+                    // on Windows fall back to hard link if symlink cannot be created (due to insufficient permissions)
+                    // see https://github.com/quarkusio/quarkus/issues/49785
+                    if (OS.WINDOWS.isCurrent()) {
+                        log.debug("Falling back to hard link on Windows after FileSystemException", e);
+                        Files.createLink(link, dotEnvPath);
+                    } else {
+                        throw e;
+                    }
+                }
             } catch (IOException e) {
                 log.warn("Unable to link .env file", e);
             }

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

@@ -4,6 +4,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
 import java.util.stream.Stream;
 
@@ -22,6 +23,7 @@ public abstract class NativeImageBuildContainerRunner extends NativeImageBuildRu
     protected final ContainerRuntimeUtil.ContainerRuntime containerRuntime;
     String[] baseContainerRuntimeArgs;
     private final String containerName;
+    private final AtomicBoolean setupInvoked = new AtomicBoolean();
 
     protected NativeImageBuildContainerRunner(NativeConfig nativeConfig) {
         this.nativeConfig = nativeConfig;
@@ -39,7 +41,10 @@ public boolean isContainer() {
 
     @Override
     public void setup(boolean processInheritIODisabled) {
-        if (containerRuntime != ContainerRuntimeUtil.ContainerRuntime.UNAVAILABLE) {
+        if (containerRuntime == ContainerRuntimeUtil.ContainerRuntime.UNAVAILABLE) {
+            return;
+        }
+        if (setupInvoked.compareAndSet(false, true)) {
             log.infof("Using %s to run the native image builder", containerRuntime.getExecutableName());
             // we pull the docker image in order to give users an indication of which step the process is at
             // it's not strictly necessary we do this, however if we don't the subsequent version command
@@ -91,6 +96,7 @@ public void setup(boolean processInheritIODisabled) {
                 pull(effectiveBuilderImage, processInheritIODisabled);
             }
         }
+
     }
 
     private void pull(String effectiveBuilderImage, boolean processInheritIODisabled) {

core/deployment/src/main/java/io/quarkus/deployment/util/ContainerRuntimeUtil.java

@@ -50,7 +50,19 @@ public static ContainerRuntime detectContainerRuntime(boolean required, Containe
                         : List.of(ContainerRuntime.DOCKER, ContainerRuntime.PODMAN));
     }
 
+    public static ContainerRuntime detectContainerRuntime(boolean required, boolean silent,
+            ContainerRuntime... orderToCheckRuntimes) {
+        return detectContainerRuntime(required, silent,
+                ((orderToCheckRuntimes != null) && (orderToCheckRuntimes.length > 0)) ? Arrays.asList(orderToCheckRuntimes)
+                        : List.of(ContainerRuntime.DOCKER, ContainerRuntime.PODMAN));
+    }
+
     public static ContainerRuntime detectContainerRuntime(boolean required, List<ContainerRuntime> orderToCheckRuntimes) {
+        return detectContainerRuntime(required, false, orderToCheckRuntimes);
+    }
+
+    public static ContainerRuntime detectContainerRuntime(boolean required, boolean silent,
+            List<ContainerRuntime> orderToCheckRuntimes) {
         ContainerRuntime containerRuntime = loadContainerRuntimeFromSystemProperty();
         if ((containerRuntime != null) && orderToCheckRuntimes.contains(containerRuntime)) {
             return containerRuntime;
@@ -69,7 +81,7 @@ public static ContainerRuntime detectContainerRuntime(boolean required, List<Con
         }
 
         // we have a working container environment, let's resolve it fully
-        containerRuntime = fullyResolveContainerRuntime(containerRuntimeEnvironment);
+        containerRuntime = fullyResolveContainerRuntime(containerRuntimeEnvironment, silent);
 
         storeContainerRuntimeInSystemProperty(containerRuntime);
 
@@ -131,7 +143,8 @@ private static ContainerRuntime getContainerRuntimeEnvironment(List<ContainerRun
         return ContainerRuntime.UNAVAILABLE;
     }
 
-    private static ContainerRuntime fullyResolveContainerRuntime(ContainerRuntime containerRuntimeEnvironment) {
+    private static ContainerRuntime fullyResolveContainerRuntime(ContainerRuntime containerRuntimeEnvironment,
+            boolean silent) {
         String execName = containerRuntimeEnvironment.getExecutableName();
         try {
             return ProcessBuilder.newBuilder(execName)
@@ -174,9 +187,11 @@ private static ContainerRuntime fullyResolveContainerRuntime(ContainerRuntime co
                     })
                     .run();
         } catch (Exception e) {
-            log.warnf("Command \"%s\" failed. "
-                    + "Rootless container runtime detection might not be reliable or the container service is not running at all.",
-                    execName);
+            if (!silent) {
+                log.warnf("Command \"%s\" failed. "
+                        + "Rootless container runtime detection might not be reliable or the container service is not running at all.",
+                        execName);
+            }
             return ContainerRuntime.UNAVAILABLE;
         }
     }

core/deployment/src/main/java/io/quarkus/runner/bootstrap/StartupActionImpl.java

@@ -113,6 +113,7 @@ public StartupActionImpl(CuratedApplication curatedApplication, BuildResult buil
     public RunningQuarkusApplication runMainClass(String... args) throws Exception {
         // Start dev services that weren't started in the augmentation phase
         ensureDevServicesStarted();
+        InitialConfigurator.DELAYED_HANDLER.buildTimeComplete();
 
         //first we hack around class loading in the fork join pool
         ForkJoinClassLoading.setForkJoinClassLoader(runtimeClassLoader);
@@ -223,6 +224,7 @@ private void doClose() {
     public int runMainClassBlocking(String... args) throws Exception {
         // Start dev services that weren't started in the augmentation phase
         ensureDevServicesStarted();
+        InitialConfigurator.DELAYED_HANDLER.buildTimeComplete();
 
         //first we hack around class loading in the fork join pool
         ForkJoinClassLoading.setForkJoinClassLoader(runtimeClassLoader);
@@ -308,9 +310,6 @@ private void ensureDevServicesStarted() {
 
             devServicesProperties.putAll(devServicesRegistry.getConfigForAllRunningServices());
         }
-        if (InitialConfigurator.DELAYED_HANDLER.isActivated()) {
-            InitialConfigurator.DELAYED_HANDLER.buildTimeComplete();
-        }
     }
 
     /**
@@ -319,6 +318,7 @@ private void ensureDevServicesStarted() {
     public RunningQuarkusApplication run(String... args) throws Exception {
         // Start dev services that weren't started in the augmentation phase
         ensureDevServicesStarted();
+        InitialConfigurator.DELAYED_HANDLER.buildTimeComplete();
 
         //first we hack around class loading in the fork join pool
         ForkJoinClassLoading.setForkJoinClassLoader(runtimeClassLoader);