From b1ba1b1b8dd54dae17a97ee04e44698f0b2b1891 Mon Sep 17 00:00:00 2001 From: Bukkit/Spigot <noreply+git-bukkit@papermc.io> Date: Sun, 17 Dec 2023 10:26:44 +1100 Subject: [PATCH] Separate checkstyle-suppressions file is not required By: md_5 <git@md-5.net> --- paper-api/checkstyle-suppressions.xml | 9 --------- paper-api/checkstyle.xml | 5 +++++ paper-api/pom.xml | 1 - 3 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 paper-api/checkstyle-suppressions.xml diff --git a/paper-api/checkstyle-suppressions.xml b/paper-api/checkstyle-suppressions.xml deleted file mode 100644 index 94366ef666..0000000000 --- a/paper-api/checkstyle-suppressions.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE suppressions PUBLIC - "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN" - "https://checkstyle.org/dtds/suppressions_1_2.dtd"> - -<suppressions> - <!-- Don't check for missing package declarations in tests--> - <suppress checks="JavadocPackage" files=".*[\\/]src[\\/]test[\\/].*\.java$"/> -</suppressions> diff --git a/paper-api/checkstyle.xml b/paper-api/checkstyle.xml index 5e25d87475..4b26154353 100644 --- a/paper-api/checkstyle.xml +++ b/paper-api/checkstyle.xml @@ -26,6 +26,11 @@ <module name="SuppressionSingleFilter"> <property name="message" value="'(implNote|implSpec|apiNote)'\."/> </module> + <!-- Don't check for missing package-info in tests --> + <module name="SuppressionSingleFilter"> + <property name="checks" value="JavadocPackage"/> + <property name="files" value=".*[\\/]src[\\/]test[\\/].*\.java$"/> + </module> <module name="TreeWalker"> <!-- See https://checkstyle.org/config_javadoc.html --> diff --git a/paper-api/pom.xml b/paper-api/pom.xml index edfa7666d9..2daa4be20d 100644 --- a/paper-api/pom.xml +++ b/paper-api/pom.xml @@ -233,7 +233,6 @@ </executions> <configuration> <configLocation>checkstyle.xml</configLocation> - <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> <includeTestSourceDirectory>true</includeTestSourceDirectory> </configuration> <dependencies>