Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0.x'

Browse Source 
Closes gh-35226
This commit is contained in:
Andy Wilkinson 2023-05-02 09:17:28 +01:00
commit d24167371e
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
buildSrc/build.gradle
View File

@ -19,13 +19,14 @@ ext {
def properties = new Properties()
properties.load(it)
set("kotlinVersion", properties["kotlinVersion"])
set("springFrameworkVersion", properties["springFrameworkVersion"])
}
}
dependencies {
checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:${javaFormatVersion}"
implementation(platform("org.springframework:spring-framework-bom:5.3.15"))
implementation(platform("org.springframework:spring-framework-bom:${springFrameworkVersion}"))
implementation("com.diffplug.gradle:goomph:3.37.2")
implementation("com.fasterxml.jackson.core:jackson-databind:2.11.4")
implementation("com.gradle:gradle-enterprise-gradle-plugin:3.12.1")

3
gradle.properties
View File

@ -5,7 +5,8 @@ org.gradle.parallel=true
org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
kotlinVersion=1.8.20
tomcatVersion=10.1.8
nativeBuildToolsVersion=0.9.21
springFrameworkVersion=6.0.8
tomcatVersion=10.1.8
kotlin.stdlib.default.dependency=false

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -1414,7 +1414,7 @@ bom {
]
}
}
library("Spring Framework", "6.0.8") {
library("Spring Framework", "${springFrameworkVersion}") {
group("org.springframework") {
imports = [
"spring-framework-bom"