Skip to content

S
spring-boot
Commit cf473eeb authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge branch '2.2.x' 

Closes gh-20017
parents df67a075 d5ed6131
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
buildSrc/gradle.properties
View file @ cf473eeb
javaFormatVersion=0.0.19 javaFormatVersion=0.0.20
\ No newline at end of file \ No newline at end of file
buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java
View file @ cf473eeb
...@@ -146,7 +146,7 @@ public class ConventionsPlugin implements Plugin<Project> { ...@@ -146,7 +146,7 @@ public class ConventionsPlugin implements Plugin<Project> {
project.getTasks().withType(FormatTask.class, (formatTask) -> formatTask.setEncoding("UTF-8")); project.getTasks().withType(FormatTask.class, (formatTask) -> formatTask.setEncoding("UTF-8"));
project.getPlugins().apply(CheckstylePlugin.class); project.getPlugins().apply(CheckstylePlugin.class);
CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class); CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class);
checkstyle.setToolVersion("8.22"); checkstyle.setToolVersion("8.29");
checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle")); checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle"));
String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion(); String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion();
DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies(); DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment