File tree Expand file tree Collapse file tree 2 files changed +15
-14
lines changed
grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/core Expand file tree Collapse file tree 2 files changed +15
-14
lines changed Original file line number Diff line number Diff line change @@ -386,13 +386,26 @@ class GrailsGradlePlugin extends GroovyPlugin {
386
386
if (! micronautEnabled) {
387
387
return
388
388
}
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)
390
390
391
391
final String micronautPlatformVersion = project. properties[' micronautPlatformVersion' ]
392
392
if (! micronautPlatformVersion) {
393
393
throw new GradleException (" `micronautPlatformVersion` property must be set to use the Grails Micronaut plugin." )
394
394
}
395
395
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)
396
409
project. getDependencies(). add(' annotationProcessor' , project. dependencies. platform(" io.micronaut.platform:micronaut-platform:$micronautPlatformVersion " ))
397
410
project. getDependencies(). add(' annotationProcessor' , ' io.micronaut:micronaut-inject-java' )
398
411
project. getDependencies(). add(' annotationProcessor' , ' jakarta.annotation:jakarta.annotation-api' )
Original file line number Diff line number Diff line change @@ -26,18 +26,6 @@ plugins {
26
26
version = projectVersion
27
27
group = ' org.apache.grails'
28
28
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
-
41
29
dependencies {
42
30
annotationProcessor platform(project(' :grails-bom' ))
43
31
annotationProcessor platform(" io.micronaut.platform:micronaut-platform:$micronautPlatformVersion " )
@@ -58,7 +46,7 @@ dependencies {
58
46
exclude group :" org.slf4j" , module : " slf4j-simple"
59
47
}
60
48
61
- implementation platform(project(' :grails-bom' ))
49
+ compileOnly platform(project(' :grails-bom' ))
62
50
compileOnly project(' :grails-core' )
63
51
64
52
// Logging
You can’t perform that action at this time.
0 commit comments