This is an automated email from the ASF dual-hosted git repository. matrei pushed a commit to branch issue15079 in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit efee79bea2318351764307681f680c2af7b3a55f Author: Mattias Reichel <[email protected]> AuthorDate: Fri Oct 3 11:04:21 2025 +0200 fix: remove duplication of `micronaut-platform` version --- .../forge/feature/micronaut/GrailsMicronaut.java | 19 ++++++++++++++++++- .../forge/feature/micronaut/MicronautHttpClient.java | 19 ++++++++++++++++++- .../grails-forge-core/src/main/resources/pom.xml | 6 ++++++ 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/micronaut/GrailsMicronaut.java b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/micronaut/GrailsMicronaut.java index c51a709799..5e720fa6cc 100644 --- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/micronaut/GrailsMicronaut.java +++ b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/micronaut/GrailsMicronaut.java @@ -22,13 +22,23 @@ import io.micronaut.core.annotation.NonNull; import jakarta.inject.Singleton; import org.grails.forge.application.ApplicationType; import org.grails.forge.application.generator.GeneratorContext; +import org.grails.forge.build.dependencies.Coordinate; import org.grails.forge.build.dependencies.Dependency; +import org.grails.forge.build.dependencies.PomDependencyVersionResolver; import org.grails.forge.feature.Category; import org.grails.forge.feature.Feature; +import java.util.Optional; + @Singleton public class GrailsMicronaut implements Feature { + private final PomDependencyVersionResolver versionResolver; + + public GrailsMicronaut(PomDependencyVersionResolver versionResolver) { + this.versionResolver = versionResolver; + } + @Override @NonNull public String getName() { @@ -67,6 +77,13 @@ public class GrailsMicronaut implements Feature { .artifactId("grails-micronaut") .implementation()); - generatorContext.getBuildProperties().put("micronautPlatformVersion", "4.9.2"); + Optional<Coordinate> micronautPlatformVersion = + versionResolver.resolve("micronaut-platform"); + micronautPlatformVersion.ifPresent(coordinate -> + generatorContext.getBuildProperties().put( + "micronautPlatformVersion", + coordinate.getVersion() + ) + ); } } diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/micronaut/MicronautHttpClient.java b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/micronaut/MicronautHttpClient.java index 86dee261fb..46a5ae5d88 100644 --- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/micronaut/MicronautHttpClient.java +++ b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/micronaut/MicronautHttpClient.java @@ -22,13 +22,23 @@ import io.micronaut.core.annotation.NonNull; import jakarta.inject.Singleton; import org.grails.forge.application.ApplicationType; import org.grails.forge.application.generator.GeneratorContext; +import org.grails.forge.build.dependencies.Coordinate; import org.grails.forge.build.dependencies.Dependency; +import org.grails.forge.build.dependencies.PomDependencyVersionResolver; import org.grails.forge.feature.Category; import org.grails.forge.feature.Feature; +import java.util.Optional; + @Singleton public class MicronautHttpClient implements Feature { + private final PomDependencyVersionResolver versionResolver; + + public MicronautHttpClient(PomDependencyVersionResolver versionResolver) { + this.versionResolver = versionResolver; + } + @Override @NonNull public String getName() { @@ -62,7 +72,14 @@ public class MicronautHttpClient implements Feature { @Override public void apply(GeneratorContext generatorContext) { - generatorContext.getBuildProperties().put("micronautPlatformVersion", "4.9.2"); + Optional<Coordinate> micronautPlatformVersion = + versionResolver.resolve("micronaut-platform"); + micronautPlatformVersion.ifPresent(coordinate -> + generatorContext.getBuildProperties().put( + "micronautPlatformVersion", + coordinate.getVersion() + ) + ); generatorContext.addDependency(Dependency.builder() .groupId("io.micronaut.platform") diff --git a/grails-forge/grails-forge-core/src/main/resources/pom.xml b/grails-forge/grails-forge-core/src/main/resources/pom.xml index a7e3b86a5a..c6f7aadd7d 100644 --- a/grails-forge/grails-forge-core/src/main/resources/pom.xml +++ b/grails-forge/grails-forge-core/src/main/resources/pom.xml @@ -32,6 +32,12 @@ </repository> </repositories> <dependencies> + <dependency> + <groupId>io.micronaut.platform</groupId> + <artifactId>micronaut-platform</artifactId> + <type>pom</type> + <version>4.9.2</version> + </dependency> <dependency> <groupId>org.grails.plugins</groupId> <artifactId>grails-web-console</artifactId>
