Merge branch 'quarkusio:main' into main

quarkusio · Mar 12, 2024 · 1fabc74 · 1fabc74
2 parents 19efa5d + e30265f
commit 1fabc74
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/...dle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusBuildTask.java b/...dle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusBuildTask.java
@@ -211,8 +211,9 @@ void generateBuild() {
         SmallRyeConfig config = extension().buildEffectiveConfiguration(appModel.getAppArtifact()).getConfig();
         Map<String, String> quarkusProperties = Expressions.withoutExpansion(() -> {
             Map<String, String> values = new HashMap<>();
-            config.getValues("quarkus", String.class, String.class)
-                    .forEach((key, value) -> values.put("quarkus." + key, value));
+            for (String key : config.getMapKeys("quarkus").values()) {
+                values.put(key, config.getConfigValue(key).getValue());
+            }
             return values;
         });
 

diff --git a/...-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusShowEffectiveConfig.java b/...-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusShowEffectiveConfig.java
@@ -8,7 +8,9 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 import java.util.stream.Collectors;
 
@@ -51,10 +53,15 @@ public void dumpEffectiveConfiguration() {
             List<String> sourceNames = new ArrayList<>();
             config.getConfigSources().forEach(configSource -> sourceNames.add(configSource.getName()));
 
-            String quarkusConfig = config.getValues("quarkus", String.class, String.class)
+            Map<String, String> values = new HashMap<>();
+            for (String key : config.getMapKeys("quarkus").values()) {
+                values.put(key, config.getConfigValue(key).getValue());
+            }
+
+            String quarkusConfig = values
                     .entrySet()
                     .stream()
-                    .map(e -> format("quarkus.%s=%s", e.getKey(), e.getValue())).sorted()
+                    .map(e -> format("%s=%s", e.getKey(), e.getValue())).sorted()
                     .collect(Collectors.joining("\n    ", "\n    ", "\n"));
             getLogger().lifecycle("Effective Quarkus configuration options: {}", quarkusConfig);
 

diff --git a/pom.xml b/pom.xml
@@ -54,7 +54,7 @@
         <graalvmHome>${env.GRAALVM_HOME}</graalvmHome>
         <postgres.url>jdbc:postgresql:hibernate_orm_test</postgres.url>
 
-        <gitflow-incremental-builder.version>4.5.1</gitflow-incremental-builder.version>
+        <gitflow-incremental-builder.version>4.5.3</gitflow-incremental-builder.version>
         <quarkus-platform-bom-plugin.version>0.0.102</quarkus-platform-bom-plugin.version>
 
         <skipDocs>false</skipDocs>