diff --git a/generatedSuppressions.xml b/generatedSuppressions.xml
index d643ba9c9b..98a301ab2f 100644
--- a/generatedSuppressions.xml
+++ b/generatedSuppressions.xml
@@ -1,10 +1,3 @@
-<suppress base="true">
-   <notes><![CDATA[
-   FP per issue #4852
-   ]]></notes>
-   <packageUrl regex="true">^pkg:maven/com\.graphql-java-kickstart/graphql-java-kickstart@.*$</packageUrl>
-   <cpe>cpe:/a:graphql-java_project:graphql-java</cpe>
-</suppress>
 <suppress base="true">
    <notes><![CDATA[
    FP per issue #4803
@@ -12,55 +5,6 @@
    <packageUrl regex="true">^pkg:maven/net\.sourceforge\.htmlunit/htmlunit-cssparser@.*$</packageUrl>
    <cpe>cpe:/a:htmlunit_project:htmlunit</cpe>
 </suppress>
-<suppress base="true">
-   <notes><![CDATA[
-   FP per issue #4853
-   ]]></notes>
-   <packageUrl regex="true">^pkg:maven/com\.graphql-java-kickstart/graphql-java-servlet@.*$</packageUrl>
-   <cpe>cpe:/a:graphql-java_project:graphql-java</cpe>
-</suppress>
-<suppress base="true">
-   <notes><![CDATA[
-   FP per issue #4859
-   ]]></notes>
-   <packageUrl regex="true">^pkg:maven/com\.apollographql\.federation/federation-graphql-java-support@.*$</packageUrl>
-   <cpe>cpe:/a:graphql-java_project:graphql-java</cpe>
-</suppress>
-<suppress base="true">
-   <notes><![CDATA[
-   FP per issue #4851
-   ]]></notes>
-   <packageUrl regex="true">^pkg:maven/com\.graphql-java/graphql-java-extended-scalars@.*$</packageUrl>
-   <cpe>cpe:/a:graphql-java_project:graphql-java</cpe>
-</suppress>
-<suppress base="true">
-   <notes><![CDATA[
-   FP per issue #4860
-   ]]></notes>
-   <packageUrl regex="true">^pkg:maven/com\.apollographql\.federation/federation-graphql-java-support-api@.*$</packageUrl>
-   <cpe>cpe:/a:graphql-java_project:graphql-java</cpe>
-</suppress>
-<suppress base="true">
-   <notes><![CDATA[
-   FP per issue #4862
-   ]]></notes>
-   <packageUrl regex="true">^pkg:maven/io\.github\.graphql-java/graphql-java-annotations@.*$</packageUrl>
-   <cpe>cpe:/a:graphql-java_project:graphql-java</cpe>
-</suppress>
-<suppress base="true">
-   <notes><![CDATA[
-   FP per issue #4863
-   ]]></notes>
-   <packageUrl regex="true">^pkg:maven/com\.graphql-java/java-dataloader@.*$</packageUrl>
-   <cpe>cpe:/a:graphql-java_project:graphql-java</cpe>
-</suppress>
-<suppress base="true">
-   <notes><![CDATA[
-   FP per issue #4854
-   ]]></notes>
-   <packageUrl regex="true">^pkg:maven/com\.graphql-java-kickstart/graphql-java-tools@.*$</packageUrl>
-   <cpe>cpe:/a:graphql-java_project:graphql-java</cpe>
-</suppress>
 <suppress base="true">
    <notes><![CDATA[
    FP per issue #4806
@@ -209,7 +153,6 @@
    <cpe>cpe:/a:pagehelper_project:pagehelper</cpe>
 </suppress>
 <!-- suppressions above this entry were included in the 7.3.1 release -->
-
 <suppress base="true">
        <notes><![CDATA[
            FP per issue https://github.com/jeremylong/DependencyCheck/issues/5060
@@ -498,13 +441,6 @@
    <packageUrl regex="true">^pkg:maven/net\.pwall\.json/json-pointer@.*$</packageUrl>
    <cpe>cpe:/a:json-pointer_project:json-pointer</cpe>
 </suppress>
-<suppress base="true">
-   <notes><![CDATA[
-   FP per issue #5275
-   ]]></notes>
-   <packageUrl regex="true">^pkg:maven/com\.graphql-java-kickstart/graphql-spring-boot-starter@.*$</packageUrl>
-   <cpe>cpe:/a:graphql-java_project:graphql-java</cpe>
-</suppress>
 <suppress base="true">
    <notes><![CDATA[
    FP per issue #5276
@@ -542,13 +478,6 @@
 </suppress>
 <!-- suppressions above this entry will be included in the 8.0.0 release (see #5304) -->
 
-<suppress base="true">
-   <notes><![CDATA[
-   FP per issue #5333
-   ]]></notes>
-   <packageUrl regex="true">^pkg:maven/com\.graphql-java-kickstart/graphql-kickstart-spring-support@.*$</packageUrl>
-   <cpe>cpe:/a:graphql-java_project:graphql-java</cpe>
-</suppress>
 <suppress base="true">
    <notes><![CDATA[
    FP per issue #5336
@@ -768,41 +697,6 @@
    <packageUrl regex="true">^pkg:maven/org\.springframework\.integration/spring-integration-ftp@.*$</packageUrl>
    <cpe>cpe:/a:vmware:spring_integration</cpe>
 </suppress>
-<suppress base="true">
-   <notes><![CDATA[
-   FP per issue #5636
-   ]]></notes>
-   <packageUrl regex="true">^pkg:maven/com\.graphql-java/graphql-java-extended-scalars@.*$</packageUrl>
-   <cpe>cpe:/a:graphql-java:graphql-java</cpe>
-</suppress>
-<suppress base="true">
-   <notes><![CDATA[
-   FP per issue #5639
-   ]]></notes>
-   <packageUrl regex="true">^pkg:maven/com\.graphql-java-kickstart/graphql-java-tools@.*$</packageUrl>
-   <cpe>cpe:/a:graphql-java:graphql-java</cpe>
-</suppress>
-<suppress base="true">
-   <notes><![CDATA[
-   FP per issue #5638
-   ]]></notes>
-   <packageUrl regex="true">^pkg:maven/com\.graphql-java-kickstart/graphql-java-servlet@.*$</packageUrl>
-   <cpe>cpe:/a:graphql-java:graphql-java</cpe>
-</suppress>
-<suppress base="true">
-   <notes><![CDATA[
-   FP per issue #5637
-   ]]></notes>
-   <packageUrl regex="true">^pkg:maven/com\.graphql-java-kickstart/graphql-java-kickstart@.*$</packageUrl>
-   <cpe>cpe:/a:graphql-java:graphql-java</cpe>
-</suppress>
-<suppress base="true">
-   <notes><![CDATA[
-   FP per issue #5657
-   ]]></notes>
-   <packageUrl regex="true">^pkg:maven/com\.graphql-java-kickstart/graphql-kickstart-spring-support@.*$</packageUrl>
-   <cpe>cpe:/a:graphql-java:graphql-java</cpe>
-</suppress>
 <suppress base="true">
    <notes><![CDATA[
    FP per issue #5685
@@ -831,13 +725,6 @@
    <packageUrl regex="true">^pkg:maven/org\.apache\.directory\.api/api-ldap-net-mina@.*$</packageUrl>
    <cpe>cpe:/a:apache:mina</cpe>
 </suppress>
-<suppress base="true">
-   <notes><![CDATA[
-   FP per issue #5719
-   ]]></notes>
-   <packageUrl regex="true">^pkg:maven/com\.graphql-java-kickstart/graphql-webclient@.*$</packageUrl>
-   <cpe>cpe:/a:graphql-java:graphql-java</cpe>
-</suppress>
 <suppress base="true">
    <notes><![CDATA[
    FP per issue #5727
@@ -974,41 +861,6 @@
    <packageUrl regex="true">^pkg:nuget/RazorEngine\.NetCore@.*$</packageUrl>
    <cpe>cpe:/a:razorengine_project:razorengine</cpe>
 </suppress>
-<suppress base="true">
-   <notes><![CDATA[
-   FP per issue #5648
-   ]]></notes>
-   <packageUrl regex="true">^pkg:maven/io\.github\.graphql-java/graphql-java-annotations@.*$</packageUrl>
-   <cpe>cpe:/a:graphql-java:graphql-java</cpe>
-</suppress>
-<suppress base="true">
-   <notes><![CDATA[
-   FP per issue #5643
-   ]]></notes>
-   <packageUrl regex="true">^pkg:maven/com\.graphql-java-kickstart/graphql-spring-boot-starter@.*$</packageUrl>
-   <cpe>cpe:/a:graphql-java:graphql-java</cpe>
-</suppress>
-<suppress base="true">
-   <notes><![CDATA[
-   FP per issue #5641
-   ]]></notes>
-   <packageUrl regex="true">^pkg:maven/com\.graphql-java/java-dataloader@.*$</packageUrl>
-   <cpe>cpe:/a:graphql-java:graphql-java</cpe>
-</suppress>
-<suppress base="true">
-   <notes><![CDATA[
-   FP per issue #5647
-   ]]></notes>
-   <packageUrl regex="true">^pkg:maven/com\.apollographql\.federation/federation-graphql-java-support-api@.*$</packageUrl>
-   <cpe>cpe:/a:graphql-java:graphql-java</cpe>
-</suppress>
-<suppress base="true">
-   <notes><![CDATA[
-   FP per issue #5646
-   ]]></notes>
-   <packageUrl regex="true">^pkg:maven/com\.apollographql\.federation/federation-graphql-java-support@.*$</packageUrl>
-   <cpe>cpe:/a:graphql-java:graphql-java</cpe>
-</suppress>
 <suppress base="true">
    <notes><![CDATA[
    FP per issue #5543
@@ -1906,7 +1758,16 @@ only pkg:maven/org.clojure:clojure@.* is the CPE cpe:/a:clojure:clojure
    <cpe>cpe:/a:python:python</cpe>
 </suppress>
 <!-- suppressions above this entry were included in the 11.0.0 release -->
-
+<suppress base="true">
+   <notes><![CDATA[
+   FP per issue #4852, #4803, #4853, #4851, #4859, #4860, #4862, #4863, #4854, #5275, #5333, #5636, #5639, #5638,
+                #5637, #5657, #5646, #5647, #5641, #5643, #5648, #5719, #8094, #8093, #8091, #8089
+   Consolidated suppression. Only com.graphql-java/graphql-java represents graphql-java project, the rest are other
+   artifacts independently versioned and released.
+   ]]></notes>
+   <packageUrl regex="true">^pkg:(?!maven/com\.graphql-java/graphql-java@).*$</packageUrl>
+   <cpe>cpe:/a:graphql-java:graphql-java:</cpe>
+</suppress>
 <suppress base="true">
    <notes><![CDATA[
    FP per issue #7066