From b8b88e638bfe9d8a973c474a8d0847a3851c83a7 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sun, 4 Jun 2023 18:54:30 +0200 Subject: [PATCH] Upgrade to Checkstyle 10.12 --- .../springframework/build/CheckstyleConventions.java | 11 ++++++----- .../org/springframework/build/ConventionsPlugin.java | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java b/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java index 5d4bdd2395f..30a44cbee0c 100644 --- a/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java +++ b/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java @@ -16,6 +16,10 @@ package org.springframework.build; +import java.io.File; +import java.nio.file.Path; +import java.util.List; + import io.spring.javaformat.gradle.SpringJavaFormatPlugin; import io.spring.nohttp.gradle.NoHttpExtension; import io.spring.nohttp.gradle.NoHttpPlugin; @@ -27,12 +31,9 @@ import org.gradle.api.plugins.quality.Checkstyle; import org.gradle.api.plugins.quality.CheckstyleExtension; import org.gradle.api.plugins.quality.CheckstylePlugin; -import java.io.File; -import java.nio.file.Path; -import java.util.List; - /** * {@link Plugin} that applies conventions for checkstyle. + * * @author Brian Clozel */ public class CheckstyleConventions { @@ -49,7 +50,7 @@ public class CheckstyleConventions { project.getPlugins().apply(CheckstylePlugin.class); project.getTasks().withType(Checkstyle.class).forEach(checkstyle -> checkstyle.getMaxHeapSize().set("1g")); CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class); - checkstyle.setToolVersion("10.10.0"); + checkstyle.setToolVersion("10.12.0"); checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle")); String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion(); DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies(); diff --git a/buildSrc/src/main/java/org/springframework/build/ConventionsPlugin.java b/buildSrc/src/main/java/org/springframework/build/ConventionsPlugin.java index 05966070e86..34978ba377d 100644 --- a/buildSrc/src/main/java/org/springframework/build/ConventionsPlugin.java +++ b/buildSrc/src/main/java/org/springframework/build/ConventionsPlugin.java @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinBasePlugin; * Plugin to apply conventions to projects that are part of Spring Framework's build. * Conventions are applied in response to various plugins being applied. * - * When the {@link JavaBasePlugin} is applied, the conventions in {@link CheckstyleConventions}, + *

When the {@link JavaBasePlugin} is applied, the conventions in {@link CheckstyleConventions}, * {@link TestConventions} and {@link JavaConventions} are applied. * When the {@link KotlinBasePlugin} is applied, the conventions in {@link KotlinConventions} * are applied. @@ -41,4 +41,5 @@ public class ConventionsPlugin implements Plugin { new KotlinConventions().apply(project); new TestConventions().apply(project); } + }