Merge branch '6.0.x' into 6.1.x
This commit is contained in:
commit
99c84aa935
|
@ -88,7 +88,9 @@ tasks.named("dispatchGitHubWorkflow") {
|
||||||
|
|
||||||
subprojects {
|
subprojects {
|
||||||
plugins.withType(JavaPlugin) {
|
plugins.withType(JavaPlugin) {
|
||||||
project.sourceCompatibility=JavaVersion.VERSION_17
|
java {
|
||||||
|
sourceCompatibility=JavaVersion.VERSION_17
|
||||||
|
}
|
||||||
}
|
}
|
||||||
tasks.withType(JavaCompile) {
|
tasks.withType(JavaCompile) {
|
||||||
options.encoding = "UTF-8"
|
options.encoding = "UTF-8"
|
||||||
|
|
|
@ -4,7 +4,9 @@ plugins {
|
||||||
id "groovy"
|
id "groovy"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
java {
|
||||||
sourceCompatibility = JavaVersion.VERSION_17
|
sourceCompatibility = JavaVersion.VERSION_17
|
||||||
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
gradlePluginPortal()
|
gradlePluginPortal()
|
||||||
|
|
|
@ -37,7 +37,7 @@ dependencies {
|
||||||
}
|
}
|
||||||
|
|
||||||
task springVersion(type: org.gradle.api.tasks.WriteProperties) {
|
task springVersion(type: org.gradle.api.tasks.WriteProperties) {
|
||||||
outputFile = file("${buildDir}/versions/spring-security.versions")
|
destinationFile = file("${buildDir}/versions/spring-security.versions")
|
||||||
property("org.springframework:spring-core", springVersion())
|
property("org.springframework:spring-core", springVersion())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue