mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.7.x' into 3.0.x
Closes gh-37817
This commit is contained in:
commit
6c44809488
@ -10,52 +10,54 @@ repositories {
|
|||||||
gradlePluginPortal()
|
gradlePluginPortal()
|
||||||
}
|
}
|
||||||
|
|
||||||
new File(new File("$projectDir").parentFile, "gradle.properties").withInputStream {
|
sourceCompatibility = 17
|
||||||
|
targetCompatibility = 17
|
||||||
|
|
||||||
|
def versions = [:]
|
||||||
|
new File(projectDir.parentFile, "gradle.properties").withInputStream {
|
||||||
def properties = new Properties()
|
def properties = new Properties()
|
||||||
properties.load(it)
|
properties.load(it)
|
||||||
ext.set("kotlinVersion", properties["kotlinVersion"])
|
["assertj", "commonsCodec", "hamcrest", "jackson", "junitJupiter",
|
||||||
ext.set("springFrameworkVersion", properties["springFrameworkVersion"])
|
"kotlin", "maven", "springFramework"].each {
|
||||||
if (properties["springFrameworkVersion"].contains("-")) {
|
versions[it] = properties[it + "Version"]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ext.set("versions", versions)
|
||||||
|
if (versions.springFramework.contains("-")) {
|
||||||
repositories {
|
repositories {
|
||||||
maven { url "https://repo.spring.io/milestone" }
|
maven { url "https://repo.spring.io/milestone" }
|
||||||
maven { url "https://repo.spring.io/snapshot" }
|
maven { url "https://repo.spring.io/snapshot" }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceCompatibility = 17
|
|
||||||
targetCompatibility = 17
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:${javaFormatVersion}"
|
checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:${javaFormatVersion}"
|
||||||
|
|
||||||
implementation(platform("org.springframework:spring-framework-bom:${springFrameworkVersion}"))
|
implementation(platform("org.springframework:spring-framework-bom:${versions.springFramework}"))
|
||||||
implementation("com.diffplug.gradle:goomph:3.37.2")
|
implementation("com.diffplug.gradle:goomph:3.37.2")
|
||||||
implementation("com.fasterxml.jackson.core:jackson-databind:2.11.4")
|
implementation("com.fasterxml.jackson.core:jackson-databind:${versions.jackson}")
|
||||||
implementation("com.gradle:gradle-enterprise-gradle-plugin:3.12.1")
|
implementation("com.gradle:gradle-enterprise-gradle-plugin:3.12.1")
|
||||||
implementation("com.tngtech.archunit:archunit:1.0.0")
|
implementation("com.tngtech.archunit:archunit:1.0.0")
|
||||||
implementation("de.undercouch.download:de.undercouch.download.gradle.plugin:5.5.0")
|
implementation("commons-codec:commons-codec:${versions.commonsCodec}")
|
||||||
implementation("commons-codec:commons-codec:1.13")
|
|
||||||
implementation("io.spring.javaformat:spring-javaformat-gradle-plugin:${javaFormatVersion}")
|
implementation("io.spring.javaformat:spring-javaformat-gradle-plugin:${javaFormatVersion}")
|
||||||
implementation("org.apache.maven:maven-embedder:3.6.2")
|
implementation("org.apache.maven:maven-embedder:${versions.maven}")
|
||||||
implementation("org.asciidoctor:asciidoctor-gradle-jvm:3.3.2")
|
implementation("org.asciidoctor:asciidoctor-gradle-jvm:3.3.2")
|
||||||
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
|
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}")
|
||||||
implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:${kotlinVersion}")
|
implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:${versions.kotlin}")
|
||||||
implementation("org.springframework:spring-context")
|
implementation("org.springframework:spring-context")
|
||||||
implementation("org.springframework:spring-core")
|
implementation("org.springframework:spring-core")
|
||||||
implementation("org.springframework:spring-web")
|
implementation("org.springframework:spring-web")
|
||||||
|
|
||||||
testImplementation("org.apache.logging.log4j:log4j-core:2.17.1")
|
testImplementation("org.assertj:assertj-core:${versions.assertj}")
|
||||||
testImplementation("org.assertj:assertj-core:3.11.1")
|
testImplementation("org.hamcrest:hamcrest:${versions.hamcrest}")
|
||||||
testImplementation("org.hamcrest:hamcrest:2.2")
|
testImplementation("org.junit.jupiter:junit-jupiter:${versions.junitJupiter}")
|
||||||
testImplementation("org.junit.jupiter:junit-jupiter:5.6.0")
|
|
||||||
testImplementation("org.springframework:spring-test")
|
testImplementation("org.springframework:spring-test")
|
||||||
|
|
||||||
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
|
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
|
||||||
}
|
}
|
||||||
|
|
||||||
checkstyle {
|
checkstyle {
|
||||||
toolVersion = 8.11
|
toolVersion = "10.12.4"
|
||||||
}
|
}
|
||||||
|
|
||||||
gradlePlugin {
|
gradlePlugin {
|
||||||
|
@ -4,7 +4,13 @@ org.gradle.caching=true
|
|||||||
org.gradle.parallel=true
|
org.gradle.parallel=true
|
||||||
org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
|
org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
|
||||||
|
|
||||||
|
assertjVersion=3.23.1
|
||||||
|
commonsCodecVersion=1.15
|
||||||
|
hamcrestVersion=2.2
|
||||||
|
jacksonVersion=2.14.3
|
||||||
|
junitJupiterVersion=5.9.3
|
||||||
kotlinVersion=1.7.22
|
kotlinVersion=1.7.22
|
||||||
|
mavenVersion=3.9.4
|
||||||
nativeBuildToolsVersion=0.9.27
|
nativeBuildToolsVersion=0.9.27
|
||||||
springFrameworkVersion=6.0.13-SNAPSHOT
|
springFrameworkVersion=6.0.13-SNAPSHOT
|
||||||
tomcatVersion=10.1.13
|
tomcatVersion=10.1.13
|
||||||
|
@ -56,7 +56,7 @@ bom {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
library("AssertJ", "3.23.1") {
|
library("AssertJ", "${assertjVersion}") {
|
||||||
group("org.assertj") {
|
group("org.assertj") {
|
||||||
modules = [
|
modules = [
|
||||||
"assertj-core"
|
"assertj-core"
|
||||||
@ -136,7 +136,7 @@ bom {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
library("Commons Codec", "1.15") {
|
library("Commons Codec", "${commonsCodecVersion}") {
|
||||||
group("commons-codec") {
|
group("commons-codec") {
|
||||||
modules = [
|
modules = [
|
||||||
"commons-codec"
|
"commons-codec"
|
||||||
@ -318,7 +318,7 @@ bom {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
library("Hamcrest", "2.2") {
|
library("Hamcrest", "${hamcrestVersion}") {
|
||||||
group("org.hamcrest") {
|
group("org.hamcrest") {
|
||||||
modules = [
|
modules = [
|
||||||
"hamcrest",
|
"hamcrest",
|
||||||
@ -451,7 +451,7 @@ bom {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
library("Jackson Bom", "2.14.3") {
|
library("Jackson Bom", "${jacksonVersion}") {
|
||||||
group("com.fasterxml.jackson") {
|
group("com.fasterxml.jackson") {
|
||||||
imports = [
|
imports = [
|
||||||
"jackson-bom"
|
"jackson-bom"
|
||||||
@ -713,7 +713,7 @@ bom {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
library("JUnit Jupiter", "5.9.3") {
|
library("JUnit Jupiter", "${junitJupiterVersion}") {
|
||||||
group("org.junit") {
|
group("org.junit") {
|
||||||
imports = [
|
imports = [
|
||||||
"junit-bom"
|
"junit-bom"
|
||||||
|
@ -87,7 +87,7 @@ bom {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
library("Maven", "3.9.4") {
|
library("Maven", "${mavenVersion}") {
|
||||||
group("org.apache.maven") {
|
group("org.apache.maven") {
|
||||||
modules = [
|
modules = [
|
||||||
"maven-core",
|
"maven-core",
|
||||||
|
Loading…
Reference in New Issue
Block a user