diff --git a/README.md b/README.md index 1745a736a..d7b1bfb58 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ [![Build Status](https://travis-ci.org/jeremylong/DependencyCheck.svg?branch=master)](https://travis-ci.org/jeremylong/DependencyCheck) [![Coverity Scan Build Status](https://scan.coverity.com/projects/1654/badge.svg)](https://scan.coverity.com/projects/dependencycheck) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/6b6021d481dc41a888c5da0d9ecf9494)](https://www.codacy.com/app/jeremylong/DependencyCheck?utm_source=github.com&utm_medium=referral&utm_content=jeremylong/DependencyCheck&utm_campaign=Badge_Grade) [![Apache 2.0 License](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0.txt) +[![Black Hat Arsenal](https://www.toolswatch.org/badges/arsenal/2015.svg)](https://www.toolswatch.org/2015/06/black-hat-arsenal-usa-2015-speakers-lineup/) [![Black Hat Arsenal](https://www.toolswatch.org/badges/arsenal/2014.svg)](https://www.toolswatch.org/2014/06/black-hat-usa-2014-arsenal-tools-speaker-list/) [![Black Hat Arsenal](https://www.toolswatch.org/badges/arsenal/2013.svg)](https://www.toolswatch.org/2013/06/announcement-blackhat-arsenal-usa-2013-selected-tools/) + Dependency-Check ================ diff --git a/dependency-check-core/src/main/resources/dependencycheck-base-suppression.xml b/dependency-check-core/src/main/resources/dependencycheck-base-suppression.xml index 4f3d88573..34e1d4118 100644 --- a/dependency-check-core/src/main/resources/dependencycheck-base-suppression.xml +++ b/dependency-check-core/src/main/resources/dependencycheck-base-suppression.xml @@ -538,4 +538,11 @@ ^org\.apache\.james:apache-mime4j-core:.*$ cpe:/a:jcore:jcore + + + ^javax\.servlet:servlet-api:.*$ + cpe:/a:sun:one_application_server + diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/BaseDBTestCase.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/BaseDBTestCase.java index fb0e17448..df1b910c2 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/BaseDBTestCase.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/BaseDBTestCase.java @@ -44,10 +44,6 @@ public abstract class BaseDBTestCase extends BaseTest { private final static Logger LOGGER = LoggerFactory.getLogger(BaseDBTestCase.class); -// @BeforeClass -// public static void setUpClass() throws Exception { -// BaseTest.setUpClass(); -// } @Before public void setUpDb() throws Exception { ensureDBExists(); diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md index b7059a06c..ffc58dc39 100644 --- a/src/site/markdown/index.md +++ b/src/site/markdown/index.md @@ -38,6 +38,6 @@ OWASP dependency-check's core analysis engine can be used as: For help with dependency-check the following resource can be used: - Post to the [google group](https://groups.google.com/forum/#!forum/dependency-check): -[subscribe](mailto://dependency-check+subscribe@googlegroups.com), -[post](mailto://dependency-check@googlegroups.com), +[subscribe](mailto:dependency-check+subscribe@googlegroups.com), +[post](mailto:dependency-check@googlegroups.com), - Open a [github issue](https://github.com/jeremylong/DependencyCheck/issues) \ No newline at end of file