diff --git a/findbugsCharEncodingFilter.xml b/findbugsCharEncodingFilter.xml
deleted file mode 100644
index d3b75911c50..00000000000
--- a/findbugsCharEncodingFilter.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
- -->
-<FindBugsFilter>
-
-     <!-- Match all XYZ violations. -->
-     <Match>
-       <Bug code="DM_DEFAULT_ENCODING" />
-     </Match>
-
-</FindBugsFilter>
diff --git a/findbugsExcludeFilter.xml b/findbugsExcludeFilter.xml
deleted file mode 100644
index 6c3fd2f712c..00000000000
--- a/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
- -->
-<FindBugsFilter>
-
-</FindBugsFilter>
diff --git a/pom.xml b/pom.xml
index 98383060910..7f0d99c03fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -891,9 +891,7 @@
             <xmlOutput>true</xmlOutput>
             <failOnError>false</failOnError>
             <maxHeap>2048</maxHeap>
-            <excludeFilterFile>
-              ${basedir}/findbugsExcludeFilter.xml
-            </excludeFilterFile>
+            <excludeFilterFile>${basedir}/findbugsExcludeFilter.xml</excludeFilterFile>
           </configuration>
           <executions>
             <execution>
@@ -916,6 +914,7 @@
         <configuration>
           <threshold>Low</threshold><!-- High|Normal|Low|Exp|Ignore -->
           <effort>Default</effort><!-- Min|Default|Max -->
+          <excludeFilterFile>${basedir}/findbugsExcludeFilter.xml</excludeFilterFile>
         </configuration>
       </plugin>
       <plugin>
diff --git a/utils/findbugsExcludeFilter.xml b/utils/findbugsExcludeFilter.xml
index c4b62264958..de6ddae0cf9 100644
--- a/utils/findbugsExcludeFilter.xml
+++ b/utils/findbugsExcludeFilter.xml
@@ -23,7 +23,7 @@
 
      <!-- Match all XYZ violations. -->
      <Match>
-       <Class name="SshCmdHelper" />
+       <Class name="SSHCmdHelper" />
        <Method name="sshExecuteCmdOneShotWithExitCode" />
        <Bug pattern="DM_DEFAULT_ENCODING" />
      </Match>