Merge pull request #50655 from gsmet/3.29.0-backports-1

[3.29] 3.29.0 backports 1

Author: gsmet

bom/application/pom.xml

@@ -123,7 +123,7 @@
         <postgresql-jdbc.version>42.7.8</postgresql-jdbc.version>
         <mariadb-jdbc.version>3.5.6</mariadb-jdbc.version>
         <mysql-jdbc.version>8.3.0</mysql-jdbc.version>
-        <mssql-jdbc.version>13.2.0.jre11</mssql-jdbc.version>
+        <mssql-jdbc.version>13.2.1.jre11</mssql-jdbc.version>
         <adal4j.version>1.6.7</adal4j.version>
         <oracle-jdbc.version>23.6.0.24.10</oracle-jdbc.version>
         <derby-jdbc.version>10.16.1.1</derby-jdbc.version>
@@ -160,7 +160,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.14.0</flyway.version>
+        <flyway.version>11.14.1</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.33.0</liquibase.version>

core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestHandler.java

@@ -7,6 +7,7 @@
 
 import io.quarkus.banner.BannerConfig;
 import io.quarkus.builder.BuildResult;
+import io.quarkus.deployment.dev.testing.TestConfig.Mode;
 import io.quarkus.deployment.steps.BannerProcessor;
 import io.quarkus.dev.console.QuarkusConsole;
 import io.quarkus.runtime.BannerRecorder;
@@ -33,6 +34,9 @@ public boolean enabled() {
                                 return config.getOptionalValue("quarkus.banner.enabled", Boolean.class).orElse(true);
                             }
                         })), banner).getBannerSupplier());
-        Logger.getLogger("io.quarkus.test").info("Quarkus continuous testing mode started");
+        if (!config.getOptionalValue("quarkus.test.continuous-testing", Mode.class).orElse(Mode.PAUSED)
+                .equals(Mode.DISABLED)) {
+            Logger.getLogger("io.quarkus.test").info("Quarkus continuous testing mode started");
+        }
     }
 }

core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestTracingProcessor.java

@@ -74,8 +74,12 @@ TestListenerBuildItem sharedStateListener() {
     @Produce(ServiceStartBuildItem.class)
     void startTesting(TestConfig config, LiveReloadBuildItem liveReloadBuildItem,
             LaunchModeBuildItem launchModeBuildItem, List<TestListenerBuildItem> testListenerBuildItems) {
-        if (TestSupport.instance().isEmpty() || config.continuousTesting() == TestConfig.Mode.DISABLED
-                || config.flatClassPath()) {
+        if (TestSupport.instance().isEmpty()) {
+            return;
+        }
+        TestSupport testSupport = TestSupport.instance().get();
+        testSupport.setConfig(config);
+        if ((config.continuousTesting() == TestConfig.Mode.DISABLED) || config.flatClassPath()) {
             return;
         }
         DevModeType devModeType = launchModeBuildItem.getDevModeType().orElse(null);
@@ -86,11 +90,9 @@ void startTesting(TestConfig config, LiveReloadBuildItem liveReloadBuildItem,
             return;
         }
         testingSetup = true;
-        TestSupport testSupport = TestSupport.instance().get();
         for (TestListenerBuildItem i : testListenerBuildItems) {
             testSupport.addListener(i.listener);
         }
-        testSupport.setConfig(config);
         testSupport.setTags(config.includeTags().orElse(Collections.emptyList()),
                 config.excludeTags().orElse(Collections.emptyList()));
         testSupport.setPatterns(config.includePattern().orElse(null),

core/deployment/src/main/java/io/quarkus/deployment/pkg/jar/AbstractJarBuilder.java

@@ -13,6 +13,7 @@
 import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.function.Predicate;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
@@ -105,6 +106,7 @@ protected static void copyFiles(ApplicationArchive archive, ArchiveCreator archi
             Map<String, List<byte[]>> services,
             Predicate<String> ignoredEntriesPredicate) throws IOException {
         try {
+            Map<String, Path> pathsToCopy = new TreeMap<>();
             archive.accept(tree -> {
                 tree.walk(new PathVisitor() {
                     @Override
@@ -114,32 +116,35 @@ public void visitPath(PathVisit visit) {
                         if (relativePath.isEmpty() || ignoredEntriesPredicate.test(relativePath)) {
                             return;
                         }
-                        try {
-                            if (Files.isDirectory(visit.getPath())) {
-                                archiveCreator.addDirectory(relativePath);
-                            } else {
-                                if (relativePath.startsWith("META-INF/services/") && relativePath.length() > 18
-                                        && services != null) {
-                                    final byte[] content;
-                                    try {
-                                        content = Files.readAllBytes(visit.getPath());
-                                    } catch (IOException e) {
-                                        throw new UncheckedIOException(e);
-                                    }
-                                    services.computeIfAbsent(relativePath, (u) -> new ArrayList<>()).add(content);
-                                } else if (!relativePath.equals("META-INF/INDEX.LIST")) {
-                                    //TODO: auto generate INDEX.LIST
-                                    //this may have implications for Camel though, as they change the layout
-                                    //also this is only really relevant for the thin jar layout
-                                    archiveCreator.addFileIfNotExists(visit.getPath(), relativePath);
+                        if (Files.isDirectory(visit.getPath())) {
+                            pathsToCopy.put(relativePath, visit.getPath());
+                        } else {
+                            if (relativePath.startsWith("META-INF/services/") && relativePath.length() > 18
+                                    && services != null) {
+                                final byte[] content;
+                                try {
+                                    content = Files.readAllBytes(visit.getPath());
+                                } catch (IOException e) {
+                                    throw new UncheckedIOException(e);
                                 }
+                                services.computeIfAbsent(relativePath, (u) -> new ArrayList<>()).add(content);
+                            } else if (!relativePath.equals("META-INF/INDEX.LIST")) {
+                                //TODO: auto generate INDEX.LIST
+                                //this may have implications for Camel though, as they change the layout
+                                //also this is only really relevant for the thin jar layout
+                                pathsToCopy.put(relativePath, visit.getPath());
                             }
-                        } catch (IOException e) {
-                            throw new UncheckedIOException(e);
                         }
                     }
                 });
             });
+            for (Entry<String, Path> pathEntry : pathsToCopy.entrySet()) {
+                if (Files.isDirectory(pathEntry.getValue())) {
+                    archiveCreator.addDirectory(pathEntry.getKey());
+                } else {
+                    archiveCreator.addFileIfNotExists(pathEntry.getValue(), pathEntry.getKey());
+                }
+            }
         } catch (RuntimeException re) {
             final Throwable cause = re.getCause();
             if (cause instanceof IOException) {

devtools/cli-common/src/main/java/io/quarkus/cli/common/VersionHelper.java

@@ -34,7 +34,7 @@ public static String clientVersion() {
                     props.load(is);
                 }
             }
-            version = props.getProperty("quarkus.version", "999-SNAPSHOT");
+            version = props.getProperty("quarkus-core-version", "999-SNAPSHOT");
         } catch (Exception e) {
             version = "999-SNAPSHOT"; // fallback version
         }

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

@@ -18,6 +18,7 @@ public void testCommandVersion() throws Exception {
                 "Version output for command aliases should be the same.");
 
         CliDriver.Result result2 = CliDriver.execute(workspaceRoot, "--version");
+        result2.echoSystemOut();
         Assertions.assertEquals(result.stdout, result2.stdout, "Version output for command aliases should be the same.");
     }
 }

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

@@ -14,6 +14,7 @@
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -45,6 +46,7 @@
 public final class EffectiveConfig {
     private final SmallRyeConfig config;
     private final Map<String, String> values;
+    private final Map<String, String> quarkusValues;
 
     private EffectiveConfig(Builder builder) {
         // Effective "ordinals" for the config sources:
@@ -90,6 +92,7 @@ private EffectiveConfig(Builder builder) {
                 .withInterceptors(ConfigCompatibility.FrontEnd.instance(), ConfigCompatibility.BackEnd.instance())
                 .build();
         this.values = generateFullConfigMap(config);
+        this.quarkusValues = generateQuarkusConfigMap(config);
     }
 
     public SmallRyeConfig getConfig() {
@@ -100,23 +103,8 @@ public Map<String, String> getValues() {
         return values;
     }
 
-    public Map<String, String> getOnlyQuarkusValues() {
-        return Expressions.withoutExpansion(new Supplier<Map<String, String>>() {
-            @Override
-            public Map<String, String> get() {
-                Map<String, String> properties = new HashMap<>();
-                for (String propertyName : config.getPropertyNames()) {
-                    if (propertyName.startsWith("quarkus.") || propertyName.startsWith("platform.quarkus.")) {
-                        ConfigValue configValue = config.getConfigValue(propertyName);
-                        if (configValue.getValue() != null
-                                && !DefaultValuesConfigSource.NAME.equals(configValue.getConfigSourceName())) {
-                            properties.put(propertyName, configValue.getValue());
-                        }
-                    }
-                }
-                return unmodifiableMap(properties);
-            }
-        });
+    public Map<String, String> getQuarkusValues() {
+        return quarkusValues;
     }
 
     private Map<String, String> asStringMap(Map<String, ?> map) {
@@ -131,18 +119,48 @@ private Map<String, String> asStringMap(Map<String, ?> map) {
 
     @VisibleForTesting
     static Map<String, String> generateFullConfigMap(SmallRyeConfig config) {
+        Set<String> defaultNames = new HashSet<>();
+        defaultNames.addAll(configClass(PackageConfig.class).getProperties().keySet());
+        defaultNames.addAll(configClass(NativeConfig.class).getProperties().keySet());
         return Expressions.withoutExpansion(new Supplier<Map<String, String>>() {
             @Override
             public Map<String, String> get() {
                 Map<String, String> properties = new HashMap<>();
                 for (String propertyName : config.getPropertyNames()) {
                     ConfigValue configValue = config.getConfigValue(propertyName);
-                    if (configValue.getValue() != null) {
+                    // Remove defaults coming from PackageConfig and NativeConfig, as this Map as passed as
+                    // system properties to Gradle workers and, we loose the ability to determine if it was set by
+                    // the user to evaluate deprecated configuration
+                    if (configValue.getValue() != null && (!defaultNames.contains(configValue.getName())
+                            || !DefaultValuesConfigSource.NAME.equals(configValue.getConfigSourceName()))) {
                         properties.put(propertyName, configValue.getValue());
                     }
                 }
-                configClass(PackageConfig.class).getProperties().keySet().forEach(properties::remove);
-                configClass(NativeConfig.class).getProperties().keySet().forEach(properties::remove);
+                return unmodifiableMap(properties);
+            }
+        });
+    }
+
+    static Map<String, String> generateQuarkusConfigMap(SmallRyeConfig config) {
+        Set<String> defaultNames = new HashSet<>();
+        defaultNames.addAll(configClass(PackageConfig.class).getProperties().keySet());
+        defaultNames.addAll(configClass(NativeConfig.class).getProperties().keySet());
+        return Expressions.withoutExpansion(new Supplier<Map<String, String>>() {
+            @Override
+            public Map<String, String> get() {
+                Map<String, String> properties = new HashMap<>();
+                for (String propertyName : config.getPropertyNames()) {
+                    if (propertyName.startsWith("quarkus.") || propertyName.startsWith("platform.quarkus.")) {
+                        ConfigValue configValue = config.getConfigValue(propertyName);
+                        // Remove defaults coming from PackageConfig and NativeConfig, as this Map as passed as
+                        // system properties to Gradle workers and, we loose the ability to determine if it was set by
+                        // the user to evaluate deprecated configuration
+                        if (configValue.getValue() != null && (!defaultNames.contains(configValue.getName())
+                                || !DefaultValuesConfigSource.NAME.equals(configValue.getConfigSourceName()))) {
+                            properties.put(propertyName, configValue.getValue());
+                        }
+                    }
+                }
                 return unmodifiableMap(properties);
             }
         });

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

@@ -272,7 +272,7 @@ void generateBuild() {
         ApplicationModel appModel = resolveAppModelForBuild();
         Map<String, String> quarkusProperties = effectiveProvider()
                 .buildEffectiveConfiguration(appModel, getAdditionalForcedProperties().get().getProperties())
-                .getOnlyQuarkusValues();
+                .getQuarkusValues();
 
         if (nativeEnabled()) {
             if (nativeSourcesOnly()) {

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

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

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

@@ -1421,7 +1421,7 @@ private DevModeCommandLine newLauncher(String actualDebugPort, String bootstrapI
             builder.jvmArgs("-Dquarkus-internal.test.specific-selection=maven:" + test);
         }
 
-        if (openJavaLang) {
+        if (openJavaLang || Runtime.version().feature() >= 24) {
             builder.addOpens("java.base/java.lang=ALL-UNNAMED");
         }