From 5995da49aaff4548c98f6a40e512caf795c20938 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 5 Feb 2019 09:25:21 +0100 Subject: [PATCH] Added an option for additional suppression files --- pom.xml | 4 +++- spring-cloud-build-tools/src/main/resources/checkstyle.xml | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f39e8e18..523d6f6e 100644 --- a/pom.xml +++ b/pom.xml @@ -70,6 +70,7 @@ master https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/${spring-cloud-build-checkstyle.branch}/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml + override me if necessary @@ -338,7 +339,8 @@ limitations under the License. checkstyle.xml checkstyle-header.txt checkstyle.build.directory=${project.build.directory} - checkstyle.suppressions.file=${checkstyle.suppressions.file} + checkstyle.suppressions.file=${checkstyle.suppressions.file} + checkstyle.additional.suppressions.file=${checkstyle.additional.suppressions.file} true ${maven-checkstyle-plugin.includeTestSourceDirectory} diff --git a/spring-cloud-build-tools/src/main/resources/checkstyle.xml b/spring-cloud-build-tools/src/main/resources/checkstyle.xml index 61573a72..5803182f 100644 --- a/spring-cloud-build-tools/src/main/resources/checkstyle.xml +++ b/spring-cloud-build-tools/src/main/resources/checkstyle.xml @@ -9,6 +9,11 @@ + + + + +