Consolidate and update versions in gradle.properties

buildSrc/build.gradle

@@ -3,36 +3,35 @@ plugins {
     id "groovy-gradle-plugin"
 }
 
+Properties properties = new Properties()
+FileInputStream input = new FileInputStream(file('../gradle.properties'))
+properties.load(input)
+input.close()
+
+for (String key : properties.stringPropertyNames()) {
+    ext.set(key, properties.getProperty(key))
+}
+
 repositories {
     mavenCentral()
     gradlePluginPortal()
 }
 
+
 configurations.all {
     exclude group: "io.github.groovylang.groovydoc", module: "io.github.groovylang.groovydoc.gradle.plugin"
-    resolutionStrategy {
-        eachDependency { details ->
-            if (details.requested.group == 'org.codehaus.groovy') {
-                details.useVersion '3.0.9'
-                details.because 'Groovy 2.5.x not supported by Gradle 7.0+'
-            }
-            if (details.requested.group.startsWith("com.fasterxml.jackson")) {
-                details.useVersion("2.15.0-rc1")
-            }
-        }
-    }
 }
 
 dependencies {
-    implementation "io.micronaut.build.internal:micronaut-gradle-plugins:5.4.10"
-    implementation "com.fizzed:rocker-compiler:1.4.0"
-    implementation "com.fasterxml.jackson.core:jackson-databind:2.17.2"
-    implementation "io.sdkman:gradle-sdkvendor-plugin:3.0.0"
-    implementation "org.asciidoctor:asciidoctor-gradle-jvm:4.0.3"
-    implementation "com.diffplug.spotless:spotless-plugin-gradle:6.25.0"
-    implementation "io.spring.nohttp:nohttp-gradle:0.0.11"
-    implementation "gradle.plugin.com.github.johnrengelman:shadow:7.1.2"
-    implementation "io.github.gradle-nexus:publish-plugin:1.3.0"
+    implementation "io.micronaut.build.internal:micronaut-gradle-plugins:$micronautGradlePlugins"
+    implementation "com.fizzed:rocker-compiler:$rockerVersion"
+    implementation "com.fasterxml.jackson.core:jackson-databind:$jacksonDatabindVersion"
+    implementation "io.sdkman:gradle-sdkvendor-plugin:$gradleSdkvendorPluginVersion"
+    implementation "org.asciidoctor:asciidoctor-gradle-jvm:$asciidoctorGradleJvmVersion"
+    implementation "com.diffplug.spotless:spotless-plugin-gradle:$spotlessVersion"
+    implementation "io.spring.nohttp:nohttp-gradle:$nohttpGradleVersion"
+    implementation "gradle.plugin.com.github.johnrengelman:shadow:$shadowVersion"
+    implementation "io.github.gradle-nexus:publish-plugin:$nexusPublishVersion"
 }
 
 gradlePlugin {

buildSrc/src/main/groovy/org.grails.forge.internal.base-module.gradle

@@ -77,14 +77,14 @@ dependencies {
         testCompileOnly "io.micronaut:micronaut-inject-groovy:${micronautVersion}"
     }
 
-    testImplementation("org.codehaus.groovy:groovy:$groovyVersion")
-    testImplementation("org.spockframework:spock-core:$spockVersion") {
+    testImplementation "org.codehaus.groovy:groovy:$groovyVersion"
+    testImplementation "org.spockframework:spock-core:$spockVersion", {
         exclude group: "org.codehaus.groovy", module: "groovy-all"
     }
 
-    testImplementation "cglib:cglib-nodep:3.3.0"
-    testImplementation "org.objenesis:objenesis:3.3"
-    testRuntimeOnly "ch.qos.logback:logback-classic:1.5.12"
+    testImplementation "cglib:cglib-nodep:$cglibVersion"
+    testImplementation "org.objenesis:objenesis:$objenesisVersion"
+    testRuntimeOnly "ch.qos.logback:logback-classic:$logbackClassicVersion"
     testImplementation "org.codehaus.groovy:groovy-test:$groovyVersion"
 }
 

gradle.properties

@@ -1,16 +1,47 @@
 projectVersion=7.0.0-SNAPSHOT
-micronautBuildVersion=1.1.5
-micronautDocsVersion=2.0.0
-micronautVersion=3.10.4
-rockerVersion=1.4.0
-groovyVersion=3.0.22
-spockVersion=2.0-groovy-3.0
+
 title=Grails Application Forge
 projectDesc=Generates Grails applications
 projectUrl=https://grails.org
 githubSlug=grails/grails-forge
 githubBranch=7.0.x
 developers=Puneet Behl
+
+acme4jClientVersion=3.4.0
+acme4jUtilsVersion=2.16
+asciidoctorGradleJvmVersion=4.0.3
+antlr4Version=4.8-1!!
+cglibVersion=3.3.0
+commonsCompressVersion=1.27.1
+customUserDataVersion=2.0.2
+develocityVersion=3.19
+groovyVersion=3.0.23
+gradleSdkvendorPluginVersion=3.0.0
 grailsVersion=7.0.0-SNAPSHOT
+jacksonDatabindVersion=2.17.2
+jakartaInjectVersion=1.0.5
+jansiVersion=2.4.1
+javaDiffUtils=4.15
+jgitVersion=6.9.0.202403050737-r
+logbackClassicVersion=1.5.15
+micronautVersion=3.10.4
+micronautApplicationPluginVersion=3.7.10
+micronautBuildVersion=1.1.5
+micronautDocsVersion=2.0.0
+micronautGradlePlugins=5.4.10
+nexusPublishVersion=1.3.0
+nohttpGradleVersion=0.0.11
+objenesisVersion=3.3
+postgresqlVersion=42.7.3
+postgresSocketFactoryVersion=1.17.1
+reflectionsVersion=0.10.2
+rockerVersion=2.1.0
+shadowVersion=8.0.0
+slf4jVersion=2.0.16
+snakeyamlVersion=2.2
+spockVersion=2.1-groovy-3.0
+spotlessVersion=6.25.0
+typesafeConfigVersion=1.4.3
+
 org.gradle.parallel=true
-org.gradle.caching=true
+org.gradle.caching=true

grails-cli/build.gradle

@@ -27,24 +27,24 @@ configurations {
 }
 
 dependencies {
-    annotationProcessor("io.micronaut:micronaut-inject-java")
-    annotationProcessor("io.micronaut:micronaut-graal")
+    annotationProcessor "io.micronaut:micronaut-inject-java"
+    annotationProcessor "io.micronaut:micronaut-graal"
     api project(":grails-forge-core")
-    api "info.picocli:picocli:${picocliVersion}"
-    api "info.picocli:picocli-shell-jline3:${picocliVersion}"
+    api "info.picocli:picocli:$picocliVersion"
+    api "info.picocli:picocli-shell-jline3:$picocliVersion"
     api "com.fizzed:rocker-runtime:$rockerVersion"
-    implementation "org.slf4j:slf4j-nop:2.0.16"
-    implementation "org.fusesource.jansi:jansi:2.4.1"
-    implementation "org.yaml:snakeyaml:2.2"
-    implementation group: 'javax.inject', name: 'javax.inject', version: '1'
-    implementation 'org.shredzone.acme4j:acme4j-client:3.2.1'
-    implementation 'org.shredzone.acme4j:acme4j-utils:2.16'
-    generateConfig "info.picocli:picocli-codegen:${picocliVersion}"
+    implementation "org.slf4j:slf4j-nop:$slf4jVersion"
+    implementation "org.fusesource.jansi:jansi:$jansiVersion"
+    implementation "org.yaml:snakeyaml:$snakeyamlVersion"
+    implementation "jakarta.inject:jakarta.inject-api:$jakartaInjectVersion"
+    implementation "org.shredzone.acme4j:acme4j-client:$acme4jClientVersion"
+    implementation "org.shredzone.acme4j:acme4j-utils:$acme4jUtilsVersion"
+    generateConfig "info.picocli:picocli-codegen:$picocliVersion"
     compileOnly "com.google.code.findbugs:jsr305"
     compileOnly "org.graalvm.nativeimage:svm"
-    testImplementation("io.micronaut.picocli:micronaut-picocli")
+    testImplementation "io.micronaut.picocli:micronaut-picocli"
     testImplementation "org.testcontainers:spock"
-    testImplementation 'org.reflections:reflections:0.10.2'
+    testImplementation "org.reflections:reflections:$reflectionsVersion"
 }
 
 graalvmNative {

grails-forge-analytics-postgres/build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id("com.github.johnrengelman.shadow")
-    id("io.micronaut.application") version "3.7.10"
+    id "com.github.johnrengelman.shadow"
+    id "io.micronaut.application" version "$micronautApplicationPluginVersion"
 }
 
 version project.projectVersion
@@ -11,19 +11,19 @@ repositories {
 }
 
 dependencies {
-    annotationProcessor("io.micronaut.data:micronaut-data-processor")
-    annotationProcessor("io.micronaut:micronaut-graal")
-    implementation(project(":grails-forge-core"))
-    runtimeOnly "ch.qos.logback:logback-classic:1.5.12"
-    implementation("io.micronaut.data:micronaut-data-jdbc")
-    implementation 'org.postgresql:postgresql:42.7.3'
-    implementation 'com.google.cloud.sql:postgres-socket-factory:1.17.1'
+    annotationProcessor "io.micronaut.data:micronaut-data-processor"
+    annotationProcessor "io.micronaut:micronaut-graal"
+    implementation project(":grails-forge-core")
+    runtimeOnly "ch.qos.logback:logback-classic:$logbackClassicVersion"
+    implementation "io.micronaut.data:micronaut-data-jdbc"
+    implementation "org.postgresql:postgresql:$postgresqlVersion"
+    implementation "com.google.cloud.sql:postgres-socket-factory:$postgresSocketFactoryVersion"
     implementation "io.micronaut.sql:micronaut-jdbc-hikari"
-    implementation 'io.micronaut.flyway:micronaut-flyway'
+    implementation "io.micronaut.flyway:micronaut-flyway"
     testCompileOnly "io.micronaut:micronaut-inject-groovy:$micronautVersion"
     testImplementation "io.micronaut:micronaut-http-client"
     testImplementation "org.testcontainers:postgresql"
-    testImplementation "ch.qos.logback:logback-classic:1.5.12"
+    testImplementation "ch.qos.logback:logback-classic:$logbackClassicVersion"
 }
 application {
     mainClass = "org.grails.forge.analytics.postgres.Main"
@@ -39,7 +39,7 @@ micronaut {
 }
 tasks.named('dockerfileNative') {
     // https://www.graalvm.org/latest/docs/getting-started/container-images/
-    baseImage("ghcr.io/graalvm/jdk:ol8-java17-22.3.2")
+    baseImage("ghcr.io/graalvm/jdk:ol8-java17-22.3.3")
 }
 
 tasks.named("dockerBuildNative") {

grails-forge-api/build.gradle

@@ -12,7 +12,7 @@ dependencies {
     api project(":grails-forge-core"), {
         exclude group:'org.slf4j', module:'slf4j-nop'
     }
-    implementation("io.swagger.core.v3:swagger-annotations")
+    implementation "io.swagger.core.v3:swagger-annotations"
     api "io.micronaut:micronaut-inject"
     api "io.micronaut:micronaut-runtime"
     api "io.micronaut:micronaut-http"
@@ -25,5 +25,5 @@ dependencies {
     testImplementation "io.micronaut:micronaut-http-server-netty"
     testImplementation "io.micronaut:micronaut-http-client"
     testImplementation "io.micronaut.test:micronaut-test-spock"
-    testImplementation "ch.qos.logback:logback-classic:1.5.12"
+    testImplementation "ch.qos.logback:logback-classic:$logbackClassicVersion"
 }

grails-forge-core/build.gradle

@@ -14,27 +14,17 @@ sourceSets {
     }
 }
 
-configurations.all {
-    it.resolutionStrategy {
-        it.eachDependency { details ->
-            if (details.requested.group.startsWith("com.fasterxml.jackson")) {
-                details.useVersion("2.15.0-rc1")
-            }
-        }
-    }
-}
-
 dependencies {
     api platform("io.micronaut:micronaut-bom:$micronautVersion")
     api "com.fizzed:rocker-runtime:$rockerVersion"
     api "io.micronaut:micronaut-inject"
     api "io.micronaut:micronaut-http"
     api "io.micronaut:micronaut-http-client"
-    api "io.github.java-diff-utils:java-diff-utils:4.12"
-    api "org.eclipse.jgit:org.eclipse.jgit:6.9.0.202403050737-r"
-    implementation "org.yaml:snakeyaml:2.2"
-    implementation 'com.typesafe:config:1.4.3'
-    implementation 'org.apache.commons:commons-compress:1.26.1'
+    api "io.github.java-diff-utils:java-diff-utils:$javaDiffUtils"
+    api "org.eclipse.jgit:org.eclipse.jgit:$jgitVersion"
+    implementation "org.yaml:snakeyaml:$snakeyamlVersion"
+    implementation "com.typesafe:config:$typesafeConfigVersion"
+    implementation "org.apache.commons:commons-compress:$commonsCompressVersion"
     compileOnly "com.google.code.findbugs:jsr305"
     testImplementation "org.codehaus.groovy:groovy-yaml"
 }

grails-forge-web-netty/build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id("com.github.johnrengelman.shadow")
-    id("io.micronaut.application") version "3.7.10"
+    id "com.github.johnrengelman.shadow"
+    id "io.micronaut.application" version "$micronautApplicationPluginVersion"
 }
 
 version project.projectVersion
@@ -11,12 +11,12 @@ repositories {
 }
 
 dependencies {
-    implementation(project(":grails-forge-api"))
-    implementation("io.micronaut.gcp:micronaut-gcp-http-client")
-    runtimeOnly("ch.qos.logback:logback-classic")
-    testCompileOnly("io.micronaut:micronaut-inject-groovy:$micronautVersion")
-    testImplementation("io.micronaut.test:micronaut-test-spock")
-    testImplementation("io.micronaut:micronaut-http-client")
+    implementation project(":grails-forge-api")
+    implementation "io.micronaut.gcp:micronaut-gcp-http-client"
+    runtimeOnly "ch.qos.logback:logback-classic"
+    testCompileOnly "io.micronaut:micronaut-inject-groovy:$micronautVersion"
+    testImplementation "io.micronaut.test:micronaut-test-spock"
+    testImplementation "io.micronaut:micronaut-http-client"
 }
 tasks.named("test", Test) {
     useJUnitPlatform()
@@ -39,7 +39,7 @@ micronaut {
 }
 tasks.named('dockerfileNative') {
     // https://www.graalvm.org/latest/docs/getting-started/container-images/
-    baseImage("ghcr.io/graalvm/jdk:ol8-java17-22.3.2")
+    baseImage("ghcr.io/graalvm/jdk:ol8-java17-22.3.3")
 }
 
 tasks.named("dockerBuildNative") {

settings.gradle

@@ -6,12 +6,12 @@ pluginManagement {
 }
 buildscript {
     dependencies {
-        classpath 'org.antlr:antlr4-runtime:4.8-1!!'
+        classpath "org.antlr:antlr4-runtime:$antlr4Version"
     }
 }
 plugins {
-    id "com.gradle.develocity" version "3.18.2"
-    id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0.2'
+    id "com.gradle.develocity" version "$develocityVersion"
+    id "com.gradle.common-custom-user-data-gradle-plugin" version "$customUserDataVersion"
 }
 
 def isCI = System.getenv('CI') != null

test-core/build.gradle

@@ -29,7 +29,7 @@ dependencies {
 //    testImplementation project(":test-utils")
     testImplementation project(":grails-forge-core")
     testImplementation project(":grails-cli")
-    testImplementation "ch.qos.logback:logback-classic:1.5.12"
+    testImplementation "ch.qos.logback:logback-classic:$logbackClassicVersion"
     testImplementation "io.micronaut.picocli:micronaut-picocli"
     implementation "io.micronaut:micronaut-inject-groovy:$micronautVersion"
     generateConfig "info.picocli:picocli-codegen:${picocliVersion}"