diff --git a/agent/findbugsExcludeFilter.xml b/agent/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/agent/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/api/findbugsExcludeFilter.xml b/api/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/api/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/awsapi/findbugsExcludeFilter.xml b/awsapi/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/awsapi/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/core/findbugsExcludeFilter.xml b/core/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/core/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/engine/api/findbugsExcludeFilter.xml b/engine/api/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/engine/api/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/engine/components-api/findbugsExcludeFilter.xml b/engine/components-api/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/engine/components-api/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/engine/network/findbugsExcludeFilter.xml b/engine/network/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/engine/network/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/engine/orchestration/findbugsExcludeFilter.xml b/engine/orchestration/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/engine/orchestration/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/engine/schema/findbugsExcludeFilter.xml b/engine/schema/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/engine/schema/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/engine/service/findbugsExcludeFilter.xml b/engine/service/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/engine/service/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/engine/storage/cache/findbugsExcludeFilter.xml b/engine/storage/cache/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/engine/storage/cache/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/engine/storage/datamotion/findbugsExcludeFilter.xml b/engine/storage/datamotion/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/engine/storage/datamotion/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/engine/storage/findbugsExcludeFilter.xml b/engine/storage/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/engine/storage/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/engine/storage/image/findbugsExcludeFilter.xml b/engine/storage/image/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/engine/storage/image/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/engine/storage/snapshot/findbugsExcludeFilter.xml b/engine/storage/snapshot/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/engine/storage/snapshot/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/engine/storage/volume/findbugsExcludeFilter.xml b/engine/storage/volume/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/engine/storage/volume/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/framework/cluster/findbugsExcludeFilter.xml b/framework/cluster/findbugsExcludeFilter.xml
deleted file mode 100644
index ef75dbd300d..00000000000
--- a/framework/cluster/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
diff --git a/framework/config/findbugsExcludeFilter.xml b/framework/config/findbugsExcludeFilter.xml
deleted file mode 100644
index ef75dbd300d..00000000000
--- a/framework/config/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
diff --git a/framework/db/findbugsExcludeFilter.xml b/framework/db/findbugsExcludeFilter.xml
deleted file mode 100644
index ef75dbd300d..00000000000
--- a/framework/db/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
diff --git a/framework/events/findbugsExcludeFilter.xml b/framework/events/findbugsExcludeFilter.xml
deleted file mode 100644
index ef75dbd300d..00000000000
--- a/framework/events/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
diff --git a/framework/ipc/findbugsExcludeFilter.xml b/framework/ipc/findbugsExcludeFilter.xml
deleted file mode 100644
index ef75dbd300d..00000000000
--- a/framework/ipc/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
diff --git a/framework/jobs/findbugsExcludeFilter.xml b/framework/jobs/findbugsExcludeFilter.xml
deleted file mode 100644
index ef75dbd300d..00000000000
--- a/framework/jobs/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
diff --git a/framework/managed-context/findbugsExcludeFilter.xml b/framework/managed-context/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/framework/managed-context/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/framework/rest/findbugsExcludeFilter.xml b/framework/rest/findbugsExcludeFilter.xml
deleted file mode 100644
index ef75dbd300d..00000000000
--- a/framework/rest/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
diff --git a/framework/security/findbugsExcludeFilter.xml b/framework/security/findbugsExcludeFilter.xml
deleted file mode 100644
index ef75dbd300d..00000000000
--- a/framework/security/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
diff --git a/framework/spring/lifecycle/findbugsExcludeFilter.xml b/framework/spring/lifecycle/findbugsExcludeFilter.xml
deleted file mode 100644
index ef75dbd300d..00000000000
--- a/framework/spring/lifecycle/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
diff --git a/framework/spring/module/findbugsExcludeFilter.xml b/framework/spring/module/findbugsExcludeFilter.xml
deleted file mode 100644
index ef75dbd300d..00000000000
--- a/framework/spring/module/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/acl/static-role-based/findbugsExcludeFilter.xml b/plugins/acl/static-role-based/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/acl/static-role-based/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/affinity-group-processors/explicit-dedication/findbugsExcludeFilter.xml b/plugins/affinity-group-processors/explicit-dedication/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/affinity-group-processors/explicit-dedication/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/affinity-group-processors/host-anti-affinity/findbugsExcludeFilter.xml b/plugins/affinity-group-processors/host-anti-affinity/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/affinity-group-processors/host-anti-affinity/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/alert-handlers/snmp-alerts/findbugsExcludeFilter.xml b/plugins/alert-handlers/snmp-alerts/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/alert-handlers/snmp-alerts/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/alert-handlers/syslog-alerts/findbugsExcludeFilter.xml b/plugins/alert-handlers/syslog-alerts/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/alert-handlers/syslog-alerts/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/api/discovery/findbugsExcludeFilter.xml b/plugins/api/discovery/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/api/discovery/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/api/rate-limit/findbugsExcludeFilter.xml b/plugins/api/rate-limit/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/api/rate-limit/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/api/solidfire-intg-test/findbugsExcludeFilter.xml b/plugins/api/solidfire-intg-test/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/api/solidfire-intg-test/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/dedicated-resources/findbugsExcludeFilter.xml b/plugins/dedicated-resources/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/dedicated-resources/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/deployment-planners/implicit-dedication/findbugsExcludeFilter.xml b/plugins/deployment-planners/implicit-dedication/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/deployment-planners/implicit-dedication/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/deployment-planners/user-concentrated-pod/findbugsExcludeFilter.xml b/plugins/deployment-planners/user-concentrated-pod/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/deployment-planners/user-concentrated-pod/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/deployment-planners/user-dispersing/findbugsExcludeFilter.xml b/plugins/deployment-planners/user-dispersing/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/deployment-planners/user-dispersing/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/event-bus/inmemory/findbugsExcludeFilter.xml b/plugins/event-bus/inmemory/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/event-bus/inmemory/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/event-bus/rabbitmq/findbugsExcludeFilter.xml b/plugins/event-bus/rabbitmq/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/event-bus/rabbitmq/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/file-systems/netapp/findbugsExcludeFilter.xml b/plugins/file-systems/netapp/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/file-systems/netapp/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/ha-planners/skip-heurestics/findbugsExcludeFilter.xml b/plugins/ha-planners/skip-heurestics/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/ha-planners/skip-heurestics/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/host-allocators/random/findbugsExcludeFilter.xml b/plugins/host-allocators/random/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/host-allocators/random/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/hypervisors/baremetal/findbugsExcludeFilter.xml b/plugins/hypervisors/baremetal/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/hypervisors/baremetal/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/hypervisors/hyperv/findbugsExcludeFilter.xml b/plugins/hypervisors/hyperv/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/hypervisors/hyperv/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/hypervisors/kvm/findbugsExcludeFilter.xml b/plugins/hypervisors/kvm/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/hypervisors/kvm/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/hypervisors/ovm/findbugsExcludeFilter.xml b/plugins/hypervisors/ovm/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/hypervisors/ovm/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/hypervisors/simulator/findbugsExcludeFilter.xml b/plugins/hypervisors/simulator/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/hypervisors/simulator/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/hypervisors/ucs/findbugsExcludeFilter.xml b/plugins/hypervisors/ucs/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/hypervisors/ucs/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/hypervisors/vmware/findbugsExcludeFilter.xml b/plugins/hypervisors/vmware/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/hypervisors/vmware/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/hypervisors/xenserver/findbugsExcludeFilter.xml b/plugins/hypervisors/xenserver/findbugsExcludeFilter.xml
deleted file mode 100644
index b341889e9d4..00000000000
--- a/plugins/hypervisors/xenserver/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/network-elements/bigswitch-vns/findbugsExcludeFilter.xml b/plugins/network-elements/bigswitch-vns/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/network-elements/bigswitch-vns/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/network-elements/brocade-vcs/findbugsExcludeFilter.xml b/plugins/network-elements/brocade-vcs/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/network-elements/brocade-vcs/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/network-elements/cisco-vnmc/findbugsExcludeFilter.xml b/plugins/network-elements/cisco-vnmc/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/network-elements/cisco-vnmc/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/network-elements/dns-notifier/findbugsExcludeFilter.xml b/plugins/network-elements/dns-notifier/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/network-elements/dns-notifier/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/network-elements/elastic-loadbalancer/findbugsExcludeFilter.xml b/plugins/network-elements/elastic-loadbalancer/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/network-elements/elastic-loadbalancer/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/network-elements/f5/findbugsExcludeFilter.xml b/plugins/network-elements/f5/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/network-elements/f5/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/network-elements/internal-loadbalancer/findbugsExcludeFilter.xml b/plugins/network-elements/internal-loadbalancer/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/network-elements/internal-loadbalancer/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/network-elements/juniper-contrail/findbugsExcludeFilter.xml b/plugins/network-elements/juniper-contrail/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/network-elements/juniper-contrail/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/network-elements/juniper-srx/findbugsExcludeFilter.xml b/plugins/network-elements/juniper-srx/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/network-elements/juniper-srx/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/network-elements/midonet/findbugsExcludeFilter.xml b/plugins/network-elements/midonet/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/network-elements/midonet/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/network-elements/netscaler/findbugsExcludeFilter.xml b/plugins/network-elements/netscaler/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/network-elements/netscaler/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/network-elements/nicira-nvp/findbugsExcludeFilter.xml b/plugins/network-elements/nicira-nvp/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/network-elements/nicira-nvp/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/network-elements/nuage-vsp/findbugsExcludeFilter.xml b/plugins/network-elements/nuage-vsp/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/network-elements/nuage-vsp/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/network-elements/opendaylight/findbugsExcludeFilter.xml b/plugins/network-elements/opendaylight/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/network-elements/opendaylight/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/network-elements/ovs/findbugsExcludeFilter.xml b/plugins/network-elements/ovs/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/network-elements/ovs/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/network-elements/palo-alto/findbugsExcludeFilter.xml b/plugins/network-elements/palo-alto/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/network-elements/palo-alto/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/network-elements/stratosphere-ssp/findbugsExcludeFilter.xml b/plugins/network-elements/stratosphere-ssp/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/network-elements/stratosphere-ssp/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/network-elements/vxlan/findbugsExcludeFilter.xml b/plugins/network-elements/vxlan/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/network-elements/vxlan/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/storage-allocators/random/findbugsExcludeFilter.xml b/plugins/storage-allocators/random/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/storage-allocators/random/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/storage/image/default/findbugsExcludeFilter.xml b/plugins/storage/image/default/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/storage/image/default/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/storage/image/s3/findbugsExcludeFilter.xml b/plugins/storage/image/s3/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/storage/image/s3/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/storage/image/sample/findbugsExcludeFilter.xml b/plugins/storage/image/sample/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/storage/image/sample/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/storage/image/swift/findbugsExcludeFilter.xml b/plugins/storage/image/swift/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/storage/image/swift/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/storage/volume/cloudbyte/findbugsExcludeFilter.xml b/plugins/storage/volume/cloudbyte/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/storage/volume/cloudbyte/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/storage/volume/default/findbugsExcludeFilter.xml b/plugins/storage/volume/default/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/storage/volume/default/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/storage/volume/nexenta/findbugsExcludeFilter.xml b/plugins/storage/volume/nexenta/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/storage/volume/nexenta/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/storage/volume/sample/findbugsExcludeFilter.xml b/plugins/storage/volume/sample/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/storage/volume/sample/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/storage/volume/solidfire/findbugsExcludeFilter.xml b/plugins/storage/volume/solidfire/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/storage/volume/solidfire/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/user-authenticators/ldap/findbugsExcludeFilter.xml b/plugins/user-authenticators/ldap/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/user-authenticators/ldap/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/user-authenticators/md5/findbugsExcludeFilter.xml b/plugins/user-authenticators/md5/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/user-authenticators/md5/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/user-authenticators/plain-text/findbugsExcludeFilter.xml b/plugins/user-authenticators/plain-text/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/user-authenticators/plain-text/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/user-authenticators/saml2/findbugsExcludeFilter.xml b/plugins/user-authenticators/saml2/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/user-authenticators/saml2/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/plugins/user-authenticators/sha256salted/findbugsExcludeFilter.xml b/plugins/user-authenticators/sha256salted/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/plugins/user-authenticators/sha256salted/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/pom.xml b/pom.xml
index 09c76e6c39c..609c4077423 100644
--- a/pom.xml
+++ b/pom.xml
@@ -887,13 +887,20 @@
org.codehaus.mojo
findbugs-maven-plugin
${cs.findbugs.version}
+
+
+ org.apache.cloudstack
+ checkstyle
+ ${project.version}
+
+
Max
High
true
false
2048
- ${basedir}/findbugsExcludeFilter.xml
+ findbugsExcludeFilter.xml
diff --git a/quickcloud/findbugsExcludeFilter.xml b/quickcloud/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/quickcloud/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/server/findbugsExcludeFilter.xml b/server/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/server/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/services/console-proxy-rdp/rdpconsole/findbugsExcludeFilter.xml b/services/console-proxy-rdp/rdpconsole/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/services/console-proxy-rdp/rdpconsole/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/services/console-proxy/server/findbugsExcludeFilter.xml b/services/console-proxy/server/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/services/console-proxy/server/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/services/iam/plugin/findbugsExcludeFilter.xml b/services/iam/plugin/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/services/iam/plugin/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/services/iam/server/findbugsExcludeFilter.xml b/services/iam/server/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/services/iam/server/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/services/secondary-storage/controller/findbugsExcludeFilter.xml b/services/secondary-storage/controller/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/services/secondary-storage/controller/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/services/secondary-storage/server/findbugsExcludeFilter.xml b/services/secondary-storage/server/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/services/secondary-storage/server/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/test/findbugsExcludeFilter.xml b/test/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/test/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/utils/findbugsExcludeFilter.xml b/tools/checkstyle/src/main/resources/findbugsExcludeFilter.xml
similarity index 81%
rename from utils/findbugsExcludeFilter.xml
rename to tools/checkstyle/src/main/resources/findbugsExcludeFilter.xml
index de6ddae0cf9..c96e2fe093f 100644
--- a/utils/findbugsExcludeFilter.xml
+++ b/tools/checkstyle/src/main/resources/findbugsExcludeFilter.xml
@@ -21,11 +21,20 @@
-->
-
+
+
+
+
+
+
+
+
+
+
diff --git a/usage/findbugsExcludeFilter.xml b/usage/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/usage/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/vmware-base/findbugsExcludeFilter.xml b/vmware-base/findbugsExcludeFilter.xml
deleted file mode 100644
index d37285017e8..00000000000
--- a/vmware-base/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-