diff --git a/dependency-check-ant/src/test/resources/build.xml b/dependency-check-ant/src/test/resources/build.xml index 68a71e62d..472b48749 100644 --- a/dependency-check-ant/src/test/resources/build.xml +++ b/dependency-check-ant/src/test/resources/build.xml @@ -94,7 +94,7 @@ reportOutputDirectory="${project.build.directory}/suppression-single-report.html" autoupdate="false" failBuildOnCVSS="3" - suppressionFile="${project.build.directory}/test-classes/test-suppression1.xml"> + suppressionFile="${project.build.directory}/test-classes/test-suppression.xml"> diff --git a/dependency-check-ant/src/test/resources/test-suppression.xml b/dependency-check-ant/src/test/resources/test-suppression.xml new file mode 100644 index 000000000..3d274ca70 --- /dev/null +++ b/dependency-check-ant/src/test/resources/test-suppression.xml @@ -0,0 +1,48 @@ + + + + + + ^org\.apache\.axis:axis:.*$ + cpe:/a:apache:axis + + + + ^jetty:org\.mortbay\.jetty:.*$ + cpe:/a:jetty:jetty + + + + ^jetty:org\.mortbay\.jetty:.*$ + cpe:/a:mortbay:jetty + + + + ^jetty:org\.mortbay\.jetty:.*$ + cpe:/a:mortbay_jetty:jetty + + diff --git a/dependency-check-ant/src/test/resources/test-suppression1.xml b/dependency-check-ant/src/test/resources/test-suppression1.xml index ff324590e..75c81efc5 100644 --- a/dependency-check-ant/src/test/resources/test-suppression1.xml +++ b/dependency-check-ant/src/test/resources/test-suppression1.xml @@ -19,8 +19,8 @@ Copyright (c) 2017 The OWASP Foundation. All Rights Reserved. + file name: axis-1.4.jar + ]]> ^org\.apache\.axis:axis:.*$ cpe:/a:apache:axis diff --git a/dependency-check-ant/src/test/resources/test-suppression2.xml b/dependency-check-ant/src/test/resources/test-suppression2.xml index 4fd833855..901378b46 100644 --- a/dependency-check-ant/src/test/resources/test-suppression2.xml +++ b/dependency-check-ant/src/test/resources/test-suppression2.xml @@ -19,22 +19,22 @@ Copyright (c) 2017 The OWASP Foundation. All Rights Reserved. + file name: org.mortbay.jetty.jar + ]]> ^jetty:org\.mortbay\.jetty:.*$ cpe:/a:jetty:jetty + file name: org.mortbay.jetty.jar + ]]> ^jetty:org\.mortbay\.jetty:.*$ cpe:/a:mortbay:jetty + file name: org.mortbay.jetty.jar + ]]> ^jetty:org\.mortbay\.jetty:.*$ cpe:/a:mortbay_jetty:jetty