diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index ccc689e54af..930b0e20cb9 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -16,18 +16,7 @@ java { } -def versions = [:] -new File(projectDir.parentFile, "gradle.properties").withInputStream { - def properties = new Properties() - properties.load(it) - ["assertj", "commonsCodec", "hamcrest", "junitJupiter", "kotlin", "maven", "snakeYaml"].each { - versions[it] = properties[it + "Version"] - } -} -versions["jackson"] = "2.15.3" -versions["springFramework"] = "6.0.12" -ext.set("versions", versions) -if (versions.springFramework.contains("-")) { +if ("${springFrameworkVersion}".contains("-")) { repositories { maven { url "https://repo.spring.io/milestone" } maven { url "https://repo.spring.io/snapshot" } @@ -35,37 +24,37 @@ if (versions.springFramework.contains("-")) { } checkstyle { - toolVersion = "10.12.4" + toolVersion = "{checkstyleToolVersion}" } dependencies { checkstyle("com.puppycrawl.tools:checkstyle:${checkstyle.toolVersion}") checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:${javaFormatVersion}") - implementation(platform("org.springframework:spring-framework-bom:${versions.springFramework}")) + implementation(platform("org.springframework:spring-framework-bom:${springFrameworkVersion}")) implementation("dev.adamko.dokkatoo:dokkatoo-plugin:2.3.1") - implementation("com.fasterxml.jackson.core:jackson-databind:${versions.jackson}") + implementation("com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}") implementation("com.github.node-gradle:gradle-node-plugin:3.5.1") implementation("com.gradle:develocity-gradle-plugin:3.17.2") implementation("com.tngtech.archunit:archunit:1.3.0") - implementation("commons-codec:commons-codec:${versions.commonsCodec}") + implementation("commons-codec:commons-codec:${commonsCodecVersion}") implementation("de.undercouch.download:de.undercouch.download.gradle.plugin:5.5.0") implementation("io.spring.gradle.antora:spring-antora-plugin:0.0.1") implementation("io.spring.javaformat:spring-javaformat-gradle-plugin:${javaFormatVersion}") implementation("io.spring.nohttp:nohttp-gradle:0.0.11") implementation("org.apache.httpcomponents.client5:httpclient5:5.3.1") - implementation("org.apache.maven:maven-embedder:${versions.maven}") + implementation("org.apache.maven:maven-embedder:${mavenVersion}") implementation("org.antora:gradle-antora-plugin:1.0.0") - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}") - implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:${versions.kotlin}") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}") + implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:${kotlinVersion}") implementation("org.springframework:spring-context") implementation("org.springframework:spring-core") implementation("org.springframework:spring-web") - implementation("org.yaml:snakeyaml:${versions.snakeYaml}") + implementation("org.yaml:snakeyaml:${snakeYamlVersion}") - testImplementation("org.assertj:assertj-core:${versions.assertj}") - testImplementation("org.hamcrest:hamcrest:${versions.hamcrest}") - testImplementation("org.junit.jupiter:junit-jupiter:${versions.junitJupiter}") + testImplementation("org.assertj:assertj-core:${assertjVersion}") + testImplementation("org.hamcrest:hamcrest:${hamcrestVersion}") + testImplementation("org.junit.jupiter:junit-jupiter:${junitJupiterVersion}") testImplementation("org.springframework:spring-test") testRuntimeOnly("org.junit.platform:junit-platform-launcher") diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties deleted file mode 100644 index 2a3dd72a183..00000000000 --- a/buildSrc/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -javaFormatVersion=0.0.43 diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle index 4cdfcbf3bd5..a61376cc7dd 100644 --- a/buildSrc/settings.gradle +++ b/buildSrc/settings.gradle @@ -4,3 +4,11 @@ pluginManagement { gradlePluginPortal() } } + +gradle.rootProject((project) -> { + new File(rootDir.parentFile, "gradle.properties").withInputStream { + def properties = new Properties() + properties.load(it) + properties.forEach(project.ext::set) + } +}); diff --git a/gradle.properties b/gradle.properties index c53b8c7a0a9..83fca538a07 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,17 +7,19 @@ org.gradle.parallel=true org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 assertjVersion=3.26.3 +checkstyleToolVersion=10.12.4 commonsCodecVersion=1.17.1 graalVersion=22.3 hamcrestVersion=2.2 jacksonVersion=2.17.2 +javaFormatVersion=0.0.43 junitJupiterVersion=5.11.0 kotlinVersion=1.9.25 mavenVersion=3.9.4 nativeBuildToolsVersion=0.10.3 +snakeYamlVersion=2.3 springFrameworkVersion=6.2.0-RC1 springFramework60xVersion=6.0.23 tomcatVersion=10.1.30 -snakeYamlVersion=2.3 kotlin.stdlib.default.dependency=false