From b4ca6ceec9cd35c858252e4cc852d845404cda69 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Mon, 26 Feb 2018 09:27:26 +0100
Subject: [PATCH] Fixes suppression file

---
 pom.xml                         |  2 +-
 src/etc/project-suppression.xml | 21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 990769441..738ddc72e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -314,7 +314,7 @@
                     <version>3.1.1</version>
                     <configuration>
                         <suppressionFiles>
-                            <suppressionFile>${project.basedir}/src/etc/project-suppression.xml</suppressionFile>
+                            <suppressionFile>src/etc/project-suppression.xml</suppressionFile>
                         </suppressionFiles>
                         <failBuildOnCVSS>7</failBuildOnCVSS>
                         <skipProvidedScope>true</skipProvidedScope>
diff --git a/src/etc/project-suppression.xml b/src/etc/project-suppression.xml
index 1373966c7..19454e35b 100644
--- a/src/etc/project-suppression.xml
+++ b/src/etc/project-suppression.xml
@@ -22,15 +22,22 @@
         <notes><![CDATA[
         This suppresses false positives identified on Struts Annotations.
         ]]></notes>
-        <gav regex="true">org\.apache\.struts:struts\-annotations\:1\.0\.6</gav>
+        <gav regex="true">org\.apache\.struts:struts\-annotations\:1\.0\.6.*$</gav>
         <cpe>cpe:/a:apache:struts:1.0.6</cpe>
     </suppress>
     <suppress>
-        <notes><![CDATA[
-        This suppresses false positives identified on Struts 1.
-        ]]></notes>
-        <gav regex="true">org\.apache\.struts\:struts\-*:1\.3\.8</gav>
-        <cpe>cpe:/a:apache:struts:1.3.8</cpe>
-        <cpe>cpe:/a:apache:tiles:1.3.8</cpe>
+        <notes><![CDATA[file name: struts-core-1.3.8.jar]]></notes>
+        <gav regex="true">^org\.apache\.struts:struts\-core\:1\.3\.8.*$</gav>
+        <cpe>cpe:/a:apache:struts</cpe>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[file name: struts-tiles-1.3.8.jar]]></notes>
+        <gav regex="true">^org\.apache\.struts:struts\-tiles\:1\.3\.8.*$</gav>
+        <cpe>cpe:/a:apache:struts</cpe>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[file name: struts-taglib-1.3.8.jar]]></notes>
+        <gav regex="true">^org\.apache\.struts:struts\-taglib\:1\.3\.8.*$</gav>
+        <cpe>cpe:/a:apache:struts</cpe>
     </suppress>
 </suppressions>
\ No newline at end of file