github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-01-15 00:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed merge issue

Browse Source
This commit is contained in:
Jeremy Long
2017-04-01 08:33:13 -04:00
parent e2a1a59543 832cbabc7d
commit 18564e8e86
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -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
================

7
dependency-check-core/src/main/resources/dependencycheck-base-suppression.xml
View File

@@ -538,4 +538,11 @@
<gav regex="true">^org\.apache\.james:apache-mime4j-core:.*$</gav>
<cpe>cpe:/a:jcore:jcore</cpe>
</suppress>
<suppress base="true">
<notes><![CDATA[
False positive
]]></notes>
<gav regex="true">^javax\.servlet:servlet-api:.*$</gav>
<cpe>cpe:/a:sun:one_application_server</cpe>
</suppress>
</suppressions>

4
dependency-check-core/src/test/java/org/owasp/dependencycheck/BaseDBTestCase.java
View File

@@ -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();

4
src/site/markdown/index.md
View File

@@ -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)