fixed merge issue

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

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

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