fix(fp): Better FP fix per issue #7250

aikebah · aikebah · commit f06535955a07 · 2024-12-18T19:13:49.000+01:00
diff --git a/generatedSuppressions.xml b/generatedSuppressions.xml
@@ -266,13 +266,6 @@
    <packageUrl regex="true">^pkg:maven/org\.apache\.hbase/hbase-zookeeper@.*$</packageUrl>
    <cpe>cpe:/a:apache:zookeeper</cpe>
 </suppress>
-<suppress base="true">
-   <notes><![CDATA[
-   FP per issue #4949
-   ]]></notes>
-   <packageUrl regex="true">^pkg:maven/org\.curioswitch\.curiostack/protobuf-jackson@.*$</packageUrl>
-   <cpe>cpe:/a:grpc:grpc</cpe>
-</suppress>
 <suppress base="true">
    <notes><![CDATA[
    FP per issue #5014
@@ -287,13 +280,6 @@
    <packageUrl regex="true">^pkg:maven/org\.apache\.twill/twill-zookeeper@.*$</packageUrl>
    <cpe>cpe:/a:apache:zookeeper</cpe>
 </suppress>
-<suppress base="true">
-   <notes><![CDATA[
-   FP per issue #4948
-   ]]></notes>
-   <packageUrl regex="true">^pkg:maven/io\.opentracing\.contrib/opentracing-grpc@.*$</packageUrl>
-   <cpe>cpe:/a:grpc:grpc</cpe>
-</suppress>
 <suppress base="true">
    <notes><![CDATA[
    FP per issue #4947
@@ -364,13 +350,6 @@
    <packageUrl regex="true">^pkg:maven/org\.junit\.jupiter/junit-jupiter-engine@.*$</packageUrl>
    <cpe>cpe:/a:fan_platform_project:fan_platform</cpe>
 </suppress>
-<suppress base="true">
-   <notes><![CDATA[
-   FP per issue #5017
-   ]]></notes>
-   <packageUrl regex="true">^pkg:maven/com\.google\.api\.grpc/grpc-google-iam-v1@.*$</packageUrl>
-   <cpe>cpe:/a:grpc:grpc</cpe>
-</suppress>
 <suppress base="true">
    <notes><![CDATA[
    FP per issue #4681
@@ -675,13 +654,6 @@
    <packageUrl regex="true">^pkg:maven/com\.googlecode\.javaewah/JavaEWAH@.*$</packageUrl>
    <cpe>cpe:/a:google:google_search</cpe>
 </suppress>
-<suppress base="true">
-   <notes><![CDATA[
-   FP per issue #5497
-   ]]></notes>
-   <packageUrl regex="true">^pkg:maven/com\.google\.cloud/grpc-gcp@.*$</packageUrl>
-   <cpe>cpe:/a:grpc:grpc</cpe>
-</suppress>
 <suppress base="true">
    <notes><![CDATA[
    FP per issue #5496
@@ -1127,12 +1099,11 @@
 <suppress base="true">
 <notes><![CDATA[
    FP per issue #5854
-   akka-grpc libraries are neither part of the akka actor system nor gRPC
+   akka-grpc libraries are not part of the akka actor system
    ]]></notes>
 <packageUrl regex="true">^pkg:maven/com\.lightbend\.akka\.grpc/.*$</packageUrl>
 <cpe>cpe:/a:akka:akka</cpe>
 <cpe>cpe:/a:lightbend:akka</cpe>
-<cpe>cpe:/a:grpc:grpc</cpe>
 </suppress>
 <suppress base="true">
 <notes><![CDATA[
@@ -1151,13 +1122,6 @@
 <cpe>cpe:/a:lightbend:akka</cpe>
 </suppress>
 <suppress base="true">
-<notes><![CDATA[
-   FP per issue #5857; akka-projection-grpc is not grpc itself
-   ]]></notes>
-<packageUrl regex="true">^pkg:maven/com\.lightbend\.akka/akka-projection-grpc.*$</packageUrl>
-<cpe>cpe:/a:grpc:grpc</cpe>
-</suppress>
-<suppress base="true">
 <notes><![CDATA[
    Optimized suppression for FP per issue #5859
    The suppression following this for the same FP issue from FP-report automation bot
@@ -1587,7 +1551,6 @@ only pkg:maven/org.clojure:clojure@.* is the CPE cpe:/a:clojure:clojure
 <packageUrl regex="true">^pkg:(?!maven/org\.clojure/clojure@).*$</packageUrl>
 <cpe>cpe:/a:clojure:clojure</cpe>
 </suppress>
-
 <suppress base="true">
    <notes><![CDATA[
    FP per issue #6415
@@ -1979,13 +1942,6 @@ only pkg:maven/org.clojure:clojure@.* is the CPE cpe:/a:clojure:clojure
    <cpe>cpe:/a:redhat:etcd</cpe>
    <cpe>cpe:/a:etcd:etcd</cpe>
 </suppress>
-<suppress base="true">
-   <notes><![CDATA[
-   FP per issue #7123
-   ]]></notes>
-   <packageUrl regex="true">^pkg:maven/io\.etcd/jetcd-grpc@.*$</packageUrl>
-   <cpe>cpe:/a:grpc:grpc</cpe>
-</suppress>
 <suppress base="true">
    <notes><![CDATA[
    FP per issue #7110
@@ -2093,4 +2049,12 @@ only pkg:maven/org.clojure:clojure@.* is the CPE cpe:/a:clojure:clojure
    ]]></notes>
    <packageUrl regex="true">^pkg:maven/com\.google\.cloud\.opentelemetry/detector-resources-support@.*$</packageUrl>
    <cpe>cpe:/a:opentelemetry:opentelemetry</cpe>
-</suppress>
+</suppress>
+<suppress base="true">
+   <notes><![CDATA[
+      Optimized suppression for FP per issue #4948, #4949, #5017, #5497, #5854, #5857, #7123
+      as suggested in #7250. If it's not in the io.grpc groupId it's not gRPC itself
+      ]]></notes>
+   <packageUrl regex="true">^pkg:maven/(?!io\.grpc/).*$</packageUrl>
+   <cpe>cpe:/a:grpc:grpc</cpe>
+</suppress>
