From 0cb56a8e21552aab12cd806b616f4681d99bb384 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 24 Jun 2019 13:04:30 -0500
Subject: [PATCH 1/5] Adding CheckStyle suppression's for src/test/java

+ No MethodNameCheck
+ No TypeNameCheck
+ No LocalVariableNameCheck

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 .../src/main/resources/jetty-checkstyle.xml        |  5 +++++
 .../src/main/resources/jetty-suppressions.xml      | 14 ++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 build-resources/src/main/resources/jetty-suppressions.xml

diff --git a/build-resources/src/main/resources/jetty-checkstyle.xml b/build-resources/src/main/resources/jetty-checkstyle.xml
index 334f05a2c63..a77df002ebb 100644
--- a/build-resources/src/main/resources/jetty-checkstyle.xml
+++ b/build-resources/src/main/resources/jetty-checkstyle.xml
@@ -33,6 +33,11 @@
       <property name="checkFormat" value="$1"/>
     </module>
 
+    <module name="SuppressionFilter">
+      <property name="file" value="jetty-suppressions.xml"/>
+      <property name="optional" value="false"/>
+    </module>
+
     <!--
       Eclipse Jetty Specific.
       ===========================================================================================
diff --git a/build-resources/src/main/resources/jetty-suppressions.xml b/build-resources/src/main/resources/jetty-suppressions.xml
new file mode 100644
index 00000000000..729f827f5f4
--- /dev/null
+++ b/build-resources/src/main/resources/jetty-suppressions.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE suppressions PUBLIC
+  "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+  "https://checkstyle.org/dtds/suppressions_1_2.dtd">
+
+<suppressions>
+  <suppress checks="MethodNameCheck"
+    files="[/\\]src[/\\]test[/\\]java[/\\]" />
+  <suppress checks="TypeNameCheck"
+    files="[/\\]src[/\\]test[/\\]java[/\\]" />
+  <suppress checks="LocalVariableNameCheck"
+    files="[/\\]src[/\\]test[/\\]java[/\\]" />
+</suppressions>

From 16cf6a34e1dc69c15c91c5318992d3a55e0a8480 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 24 Jun 2019 13:27:14 -0500
Subject: [PATCH 2/5] Adapting suppressions filter for various plugin's
 expectations.

Each plugin finds the suppressions in different ways.

+ Eclipse CS finds it via property ${config_loc}
+ Newest IntelliJ CS finds it via same property
+ Maven plugin finds it via classloader.getResource()

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 .../src/main/resources/jetty-checkstyle.xml     | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/build-resources/src/main/resources/jetty-checkstyle.xml b/build-resources/src/main/resources/jetty-checkstyle.xml
index a77df002ebb..ad19ccb54ce 100644
--- a/build-resources/src/main/resources/jetty-checkstyle.xml
+++ b/build-resources/src/main/resources/jetty-checkstyle.xml
@@ -14,6 +14,18 @@
 
   <property name="fileExtensions" value="java"/>
 
+  <!-- reference to suppressions filter for both eclipse and intellij checkstyle plugins -->
+  <module name="SuppressionFilter">
+    <property name="file" value="${config_loc}/jetty-suppressions.xml"/>
+    <property name="optional" value="true"/>
+  </module>
+
+  <!-- reference to suppressions filter for maven plugins -->
+  <module name="SuppressionFilter">
+    <property name="file" value="/jetty-suppressions.xml"/>
+    <property name="optional" value="true"/>
+  </module>
+
   <!-- Excludes all 'module-info.java' files              -->
   <!-- See https://checkstyle.org/config_filefilters.html -->
   <module name="BeforeExecutionExclusionFileFilter">
@@ -33,11 +45,6 @@
       <property name="checkFormat" value="$1"/>
     </module>
 
-    <module name="SuppressionFilter">
-      <property name="file" value="jetty-suppressions.xml"/>
-      <property name="optional" value="false"/>
-    </module>
-
     <!--
       Eclipse Jetty Specific.
       ===========================================================================================

From 81894fb4ed74ed9d5009dfcc4f03c115112fd3c2 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 24 Jun 2019 13:58:23 -0500
Subject: [PATCH 3/5] Using property based lookup for Checkstyle suppressions
 filter.

+ This is to be maximally compatible across all plugins and scenarios
  where the Checkstyle suppressions filter can be used.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 build-resources/src/main/resources/jetty-checkstyle.xml   | 2 +-
 build-resources/src/main/resources/jetty-suppressions.xml | 8 ++++++--
 pom.xml                                                   | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/build-resources/src/main/resources/jetty-checkstyle.xml b/build-resources/src/main/resources/jetty-checkstyle.xml
index ad19ccb54ce..c56ea66d330 100644
--- a/build-resources/src/main/resources/jetty-checkstyle.xml
+++ b/build-resources/src/main/resources/jetty-checkstyle.xml
@@ -16,7 +16,7 @@
 
   <!-- reference to suppressions filter for both eclipse and intellij checkstyle plugins -->
   <module name="SuppressionFilter">
-    <property name="file" value="${config_loc}/jetty-suppressions.xml"/>
+    <property name="file" value="${checkstyle.suppressions.file}"/>
     <property name="optional" value="true"/>
   </module>
 
diff --git a/build-resources/src/main/resources/jetty-suppressions.xml b/build-resources/src/main/resources/jetty-suppressions.xml
index 729f827f5f4..5ff1693fd33 100644
--- a/build-resources/src/main/resources/jetty-suppressions.xml
+++ b/build-resources/src/main/resources/jetty-suppressions.xml
@@ -5,10 +5,14 @@
   "https://checkstyle.org/dtds/suppressions_1_2.dtd">
 
 <suppressions>
+  <suppress checks="AbbreviationAsWordInNameCheck"
+    files="[/\\]src[/\\]test[/\\]java[/\\]" />
+  <suppress checks="AvoidEscapedUnicodeCharactersCheck"
+    files="[/\\]src[/\\]test[/\\]java[/\\]" />
+  <suppress checks="LocalVariableNameCheck"
+    files="[/\\]src[/\\]test[/\\]java[/\\]" />
   <suppress checks="MethodNameCheck"
     files="[/\\]src[/\\]test[/\\]java[/\\]" />
   <suppress checks="TypeNameCheck"
     files="[/\\]src[/\\]test[/\\]java[/\\]" />
-  <suppress checks="LocalVariableNameCheck"
-    files="[/\\]src[/\\]test[/\\]java[/\\]" />
 </suppressions>
diff --git a/pom.xml b/pom.xml
index 2b21004400b..2963505d1c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1133,6 +1133,8 @@
               <version>3.0.0</version>
               <configuration>
                 <configLocation>jetty-checkstyle.xml</configLocation>
+                <suppressionsLocation>jetty-suppressions.xml</suppressionsLocation>
+                <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
               </configuration>
               <dependencies>
                 <dependency>

From fd952d42ffdca969c743277ecca92041398d49d0 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Mon, 24 Jun 2019 14:30:33 -0500
Subject: [PATCH 4/5] Removing redundant check

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 build-resources/src/main/resources/jetty-checkstyle.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/build-resources/src/main/resources/jetty-checkstyle.xml b/build-resources/src/main/resources/jetty-checkstyle.xml
index c56ea66d330..d6e91cdc4b0 100644
--- a/build-resources/src/main/resources/jetty-checkstyle.xml
+++ b/build-resources/src/main/resources/jetty-checkstyle.xml
@@ -20,12 +20,6 @@
     <property name="optional" value="true"/>
   </module>
 
-  <!-- reference to suppressions filter for maven plugins -->
-  <module name="SuppressionFilter">
-    <property name="file" value="/jetty-suppressions.xml"/>
-    <property name="optional" value="true"/>
-  </module>
-
   <!-- Excludes all 'module-info.java' files              -->
   <!-- See https://checkstyle.org/config_filefilters.html -->
   <module name="BeforeExecutionExclusionFileFilter">

From 8121f9773cd35217e544f96b7ab0f2ddb592d9e7 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Tue, 25 Jun 2019 13:32:26 -0500
Subject: [PATCH 5/5] Adding jetty-jmh to suppressions

---
 .../src/main/resources/jetty-suppressions.xml      | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/build-resources/src/main/resources/jetty-suppressions.xml b/build-resources/src/main/resources/jetty-suppressions.xml
index 5ff1693fd33..0e0b3d39b7b 100644
--- a/build-resources/src/main/resources/jetty-suppressions.xml
+++ b/build-resources/src/main/resources/jetty-suppressions.xml
@@ -5,6 +5,7 @@
   "https://checkstyle.org/dtds/suppressions_1_2.dtd">
 
 <suppressions>
+  <!-- General JUnit Test Cases -->
   <suppress checks="AbbreviationAsWordInNameCheck"
     files="[/\\]src[/\\]test[/\\]java[/\\]" />
   <suppress checks="AvoidEscapedUnicodeCharactersCheck"
@@ -15,4 +16,17 @@
     files="[/\\]src[/\\]test[/\\]java[/\\]" />
   <suppress checks="TypeNameCheck"
     files="[/\\]src[/\\]test[/\\]java[/\\]" />
+
+  <!-- jetty-jmh specific -->
+  <suppress checks="AbbreviationAsWordInNameCheck"
+    files="[/\\]jetty-jmh[/\\]src[/\\]main[/\\]java[/\\]" />
+  <suppress checks="AvoidEscapedUnicodeCharactersCheck"
+    files="[/\\]jetty-jmh[/\\]src[/\\]main[/\\]java[/\\]" />
+  <suppress checks="LocalVariableNameCheck"
+    files="[/\\]jetty-jmh[/\\]src[/\\]main[/\\]java[/\\]" />
+  <suppress checks="MethodNameCheck"
+    files="[/\\]jetty-jmh[/\\]src[/\\]main[/\\]java[/\\]" />
+  <suppress checks="TypeNameCheck"
+    files="[/\\]jetty-jmh[/\\]src[/\\]main[/\\]java[/\\]" />
+
 </suppressions>