Skip to content

Commit 6704d56

Browse files
committed
feature: #14017 - grails gradle plugin should enforce micronaut version like before
1 parent 99564d3 commit 6704d56

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,13 +386,26 @@ class GrailsGradlePlugin extends GroovyPlugin {
386386
if (!micronautEnabled) {
387387
return
388388
}
389-
project.logger.lifecycle('Micronaut Support Detected for {} - adding annotation processor dependencies for Micronaut', project.path)
389+
project.logger.lifecycle('Micronaut Support Detected for {}', project.path)
390390

391391
final String micronautPlatformVersion = project.properties['micronautPlatformVersion']
392392
if (!micronautPlatformVersion) {
393393
throw new GradleException("`micronautPlatformVersion` property must be set to use the Grails Micronaut plugin.")
394394
}
395395

396+
// grails-micronaut exports the platform, but force the version to the user specified version
397+
project.configurations.configureEach{ Configuration configuration ->
398+
configuration.resolutionStrategy.eachDependency { DependencyResolveDetails details ->
399+
String dependencyName = details.requested.name
400+
String group = details.requested.group
401+
if (group == 'io.micronaut' && dependencyName.startsWith('micronaut-platform')) {
402+
project.logger.info("Forcing Micronaut Platform version to {}", micronautPlatformVersion)
403+
details.useVersion(micronautPlatformVersion)
404+
}
405+
}
406+
}
407+
408+
project.logger.info('Adding Micronaut annotationProcessor dependencies to project {}', project.name)
396409
project.getDependencies().add('annotationProcessor', project.dependencies.platform("io.micronaut.platform:micronaut-platform:$micronautPlatformVersion"))
397410
project.getDependencies().add('annotationProcessor', 'io.micronaut:micronaut-inject-java')
398411
project.getDependencies().add('annotationProcessor', 'jakarta.annotation:jakarta.annotation-api')

grails-micronaut/build.gradle

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,6 @@ plugins {
2626
version = projectVersion
2727
group = 'org.apache.grails'
2828

29-
// force a local build version for debugging
30-
//project.configurations.configureEach({ Configuration configuration ->
31-
// configuration.resolutionStrategy.eachDependency({ DependencyResolveDetails details ->
32-
// String dependencyName = details.requested.name
33-
// String group = details.requested.group
34-
// if (group == 'io.micronaut' && dependencyName.startsWith('micronaut-core-processor')) {
35-
// logger.lifecycle("Forcing Micronaut Core Processor version to 4.9.99 for Grails Micronaut plugin")
36-
// details.useVersion('4.9.99')
37-
// }
38-
// } as Action<DependencyResolveDetails>)
39-
//} as Action<Configuration>)
40-
4129
dependencies {
4230
annotationProcessor platform(project(':grails-bom'))
4331
annotationProcessor platform("io.micronaut.platform:micronaut-platform:$micronautPlatformVersion")
@@ -58,7 +46,7 @@ dependencies {
5846
exclude group:"org.slf4j", module: "slf4j-simple"
5947
}
6048

61-
implementation platform(project(':grails-bom'))
49+
compileOnly platform(project(':grails-bom'))
6250
compileOnly project(':grails-core')
6351

6452
// Logging

0 commit comments

Comments
 (0)