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 '2.2.x'

Browse Source 
Closes gh-20017
This commit is contained in:
Stephane Nicoll 2020-02-03 10:47:02 +01:00
commit cf473eeb65
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/gradle.properties
View File

@ -1 +1 @@
javaFormatVersion=0.0.19
javaFormatVersion=0.0.20

2
buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java
View File

@ -146,7 +146,7 @@ public class ConventionsPlugin implements Plugin<Project> {
project.getTasks().withType(FormatTask.class, (formatTask) -> formatTask.setEncoding("UTF-8"));
project.getPlugins().apply(CheckstylePlugin.class);
CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class);
checkstyle.setToolVersion("8.22");
checkstyle.setToolVersion("8.29");
checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle"));
String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion();
DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies();