diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 6176fc8b5c1..b7beebd58ed 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -10,8 +10,8 @@ repositories { maven { url "https://repo.spring.io/release" } } -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +sourceCompatibility = 17 +targetCompatibility = 17 dependencies { checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:${javaFormatVersion}" @@ -22,8 +22,8 @@ dependencies { implementation("org.gradle:test-retry-gradle-plugin:1.1.9") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0") implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.0") - implementation("org.springframework:spring-core:5.2.2.RELEASE") - implementation("org.springframework:spring-web:5.2.2.RELEASE") + implementation("org.springframework:spring-core:5.3.10") + implementation("org.springframework:spring-web:5.3.10") implementation("io.spring.javaformat:spring-javaformat-gradle-plugin:${javaFormatVersion}") testImplementation("org.assertj:assertj-core:3.11.1") testImplementation("org.apache.logging.log4j:log4j-core:2.12.1") diff --git a/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java index d82ba98cec5..1d4614033b9 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java @@ -45,6 +45,7 @@ import org.gradle.api.tasks.bundling.Jar; import org.gradle.api.tasks.compile.JavaCompile; import org.gradle.api.tasks.javadoc.Javadoc; import org.gradle.api.tasks.testing.Test; +import org.gradle.external.javadoc.CoreJavadocOptions; import org.gradle.testretry.TestRetryPlugin; import org.gradle.testretry.TestRetryTaskExtension; @@ -59,7 +60,7 @@ import org.springframework.util.StringUtils; * plugin is applied: * *