From 0432646445ac823f75b7cf91dde04f6c8f5b7468 Mon Sep 17 00:00:00 2001
From: Cyrus <24922493+cyrus-dev@users.noreply.github.com>
Date: Wed, 20 Dec 2023 15:53:32 -0500
Subject: [PATCH] The initial issue found in the tcg event log code is present
 in the rest, updating all exclude files to ignore this specific bug for the
 time being

---
 .../config/spotbugs/spotbugs-exclude.xml          |  9 +++++++++
 .../config/spotbugs/spotbugs-exclude.xml          |  9 +++++++++
 HIRS_Structs/config/spotbugs/spotbugs-exclude.xml |  9 +++++++++
 HIRS_Utils/config/spotbugs/spotbugs-exclude.xml   |  9 +++++++++
 .../config/spotbugs/spotbugs-exclude.xml          | 15 ++++++++++-----
 5 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/HIRS_AttestationCA/config/spotbugs/spotbugs-exclude.xml b/HIRS_AttestationCA/config/spotbugs/spotbugs-exclude.xml
index 2dd1ee7a..5405c515 100644
--- a/HIRS_AttestationCA/config/spotbugs/spotbugs-exclude.xml
+++ b/HIRS_AttestationCA/config/spotbugs/spotbugs-exclude.xml
@@ -4,6 +4,15 @@
     <Match>
         <Package name="~hirs\.attestationca.*" />
     </Match>
+    <Match>
+        <!-- https://github.com/spotbugs/spotbugs/pull/2748 -->
+        <Bug pattern="CT_CONSTRUCTOR_THROW" />
+    </Match>
 
+    <!--    <Match>-->
+    <!--        &lt;!&ndash; To suppress false warnings in unit-tests for lambdas not using return values. &ndash;&gt;-->
+    <!--        <Package name="~com\.company\.service\.interfaces\.types\.contacts"/>-->
+    <!--        <Bug pattern="RV_RETURN_VALUE_IGNORED"/>-->
+    <!--    </Match>-->
 </FindBugsFilter>
 
diff --git a/HIRS_AttestationCAPortal/config/spotbugs/spotbugs-exclude.xml b/HIRS_AttestationCAPortal/config/spotbugs/spotbugs-exclude.xml
index 2dd1ee7a..5405c515 100644
--- a/HIRS_AttestationCAPortal/config/spotbugs/spotbugs-exclude.xml
+++ b/HIRS_AttestationCAPortal/config/spotbugs/spotbugs-exclude.xml
@@ -4,6 +4,15 @@
     <Match>
         <Package name="~hirs\.attestationca.*" />
     </Match>
+    <Match>
+        <!-- https://github.com/spotbugs/spotbugs/pull/2748 -->
+        <Bug pattern="CT_CONSTRUCTOR_THROW" />
+    </Match>
 
+    <!--    <Match>-->
+    <!--        &lt;!&ndash; To suppress false warnings in unit-tests for lambdas not using return values. &ndash;&gt;-->
+    <!--        <Package name="~com\.company\.service\.interfaces\.types\.contacts"/>-->
+    <!--        <Bug pattern="RV_RETURN_VALUE_IGNORED"/>-->
+    <!--    </Match>-->
 </FindBugsFilter>
 
diff --git a/HIRS_Structs/config/spotbugs/spotbugs-exclude.xml b/HIRS_Structs/config/spotbugs/spotbugs-exclude.xml
index e32a18ba..52a0aba2 100644
--- a/HIRS_Structs/config/spotbugs/spotbugs-exclude.xml
+++ b/HIRS_Structs/config/spotbugs/spotbugs-exclude.xml
@@ -4,6 +4,15 @@
     <Match>
         <Package name="~hirs\.structs.*" />
     </Match>
+    <Match>
+        <!-- https://github.com/spotbugs/spotbugs/pull/2748 -->
+        <Bug pattern="CT_CONSTRUCTOR_THROW" />
+    </Match>
 
+    <!--    <Match>-->
+    <!--        &lt;!&ndash; To suppress false warnings in unit-tests for lambdas not using return values. &ndash;&gt;-->
+    <!--        <Package name="~com\.company\.service\.interfaces\.types\.contacts"/>-->
+    <!--        <Bug pattern="RV_RETURN_VALUE_IGNORED"/>-->
+    <!--    </Match>-->
 </FindBugsFilter>
 
diff --git a/HIRS_Utils/config/spotbugs/spotbugs-exclude.xml b/HIRS_Utils/config/spotbugs/spotbugs-exclude.xml
index 9f94b3b8..b4108584 100644
--- a/HIRS_Utils/config/spotbugs/spotbugs-exclude.xml
+++ b/HIRS_Utils/config/spotbugs/spotbugs-exclude.xml
@@ -4,6 +4,15 @@
     <Match>
 	<Package name="~hirs\.utils.*" />
     </Match>
+    <Match>
+        <!-- https://github.com/spotbugs/spotbugs/pull/2748 -->
+        <Bug pattern="CT_CONSTRUCTOR_THROW" />
+    </Match>
 
+    <!--    <Match>-->
+    <!--        &lt;!&ndash; To suppress false warnings in unit-tests for lambdas not using return values. &ndash;&gt;-->
+    <!--        <Package name="~com\.company\.service\.interfaces\.types\.contacts"/>-->
+    <!--        <Bug pattern="RV_RETURN_VALUE_IGNORED"/>-->
+    <!--    </Match>-->
 </FindBugsFilter>
 
diff --git a/tools/tcg_rim_tool/config/spotbugs/spotbugs-exclude.xml b/tools/tcg_rim_tool/config/spotbugs/spotbugs-exclude.xml
index 29d82553..30566b44 100644
--- a/tools/tcg_rim_tool/config/spotbugs/spotbugs-exclude.xml
+++ b/tools/tcg_rim_tool/config/spotbugs/spotbugs-exclude.xml
@@ -2,13 +2,18 @@
 <!-- Docs at http://findbugs.sourceforge.net/manual/filter.html -->
 <FindBugsFilter>
 
-    <Match>
-	<!-- To suppress false warnings in unit-tests for lambdas not using return values. -->
-        <Package name="~com\.company\.service\.interfaces\.types\.contacts"/>
-        <Bug pattern="RV_RETURN_VALUE_IGNORED"/>
-    </Match>
+
     <Match>
 	<Package name="~hirs\.swid.*" />
     </Match>
+    <Match>
+        <!-- https://github.com/spotbugs/spotbugs/pull/2748 -->
+        <Bug pattern="CT_CONSTRUCTOR_THROW" />
+    </Match>
 
+<!--    <Match>-->
+<!--        &lt;!&ndash; To suppress false warnings in unit-tests for lambdas not using return values. &ndash;&gt;-->
+<!--        <Package name="~com\.company\.service\.interfaces\.types\.contacts"/>-->
+<!--        <Bug pattern="RV_RETURN_VALUE_IGNORED"/>-->
+<!--    </Match>-->
 </FindBugsFilter>