Revert "Defang most SING_SINGLETON_ Spotbugs warnings"

This reverts commit 51d80a8d57695502386ad8c351ba9fa11325f035, as it is
not needed without spotbugs-4.8.4.

Change-Id: Ide57acaad1ac76b0a0564bfa504ff700912bb311
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/spotbugs/src/main/resources/spotbugs-exclude.xml b/spotbugs/src/main/resources/spotbugs-exclude.xml
index 82aada5ad59a31785bf10fd5643481165a2c4966..27053a554397a354d26643c366547aefa8d1b94d 100644 (file)
--- a/spotbugs/src/main/resources/spotbugs-exclude.xml
+++ b/spotbugs/src/main/resources/spotbugs-exclude.xml
@@ -65,23 +65,6 @@
            "clever use of a private constructor".
       -->
       <Bug pattern="CT_CONSTRUCTOR_THROW"/>
-
-      <!--
-           https://github.com/spotbugs/spotbugs/issues/2932. Causes a ton of false positives with eagerly-instantiated
-           singletons.
-      -->
-      <Bug pattern="SING_SINGLETON_GETTER_NOT_SYNCHRONIZED"/>
-
-      <!--
-           https://github.com/spotbugs/spotbugs/issues/2934. The logic identifying singletons seems to be over-eager,
-           assuming that a class is meant to be a singleton when there even is a single singleton value.
-      -->
-      <Bug pattern="SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR"/>
-
-      <!--
-           https://github.com/spotbugs/spotbugs/issues/2933. Causes false positives with readResolve()d singletons.
-      -->
-      <Bug pattern="SING_SINGLETON_IMPLEMENTS_SERIALIZABLE"/>
     </Or>
   </Match>
 </FindBugsFilter>