Browse Source

Merge branch '3.0.x' into 3.1.x

Closes gh-37977
pull/38706/head
Andy Wilkinson 2 years ago
parent
commit
9d64a11418
  1. 2
      buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java

2
buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java

@ -239,7 +239,7 @@ class JavaConventions { @@ -239,7 +239,7 @@ class JavaConventions {
project.getTasks().withType(Format.class, (Format) -> Format.setEncoding("UTF-8"));
project.getPlugins().apply(CheckstylePlugin.class);
CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class);
checkstyle.setToolVersion("8.45.1");
checkstyle.setToolVersion("10.12.4");
checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle"));
String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion();
DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies();

Loading…
Cancel
Save