From e6a8d2aef08af21e147bf09dee2fadc279e152a1 Mon Sep 17 00:00:00 2001 From: Roberto Cortez Date: Tue, 14 Jan 2025 10:46:59 +0000 Subject: [PATCH] Expression default for `quarkus.native.builder-image` --- .../src/main/java/io/quarkus/deployment/pkg/NativeConfig.java | 2 +- .../src/main/java/io/quarkus/gradle/tasks/EffectiveConfig.java | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java index 89d40eb1db431..2b77322f0c643 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java @@ -256,7 +256,7 @@ interface BuilderImageConfig { * {@code quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-21}. */ @WithParentName - @WithDefault("${platform.quarkus.native.builder-image}") + @WithDefault("${platform.quarkus.native.builder-image:mandrel}") @ConfigDocDefault("mandrel") String image(); diff --git a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/EffectiveConfig.java b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/EffectiveConfig.java index 52583a3088096..955c52fa8b4e2 100644 --- a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/EffectiveConfig.java +++ b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/EffectiveConfig.java @@ -70,9 +70,6 @@ private EffectiveConfig(Builder builder) { .withSources(new YamlConfigSourceLoader.InFileSystem()) .withSources(new YamlConfigSourceLoader.InClassPath()) .addPropertiesSources() - // todo: this is due to ApplicationModel#getPlatformProperties not being included in the effective config - .withSources(new PropertiesConfigSource(Map.of("platform.quarkus.native.builder-image", "<>"), - "NativeConfig#builderImage", 0)) .withDefaultValues(builder.defaultProperties) .withProfile(builder.profile) .withMapping(PackageConfig.class)