removed cleanup in favor of close from autoclosable

dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java

@@ -274,7 +274,7 @@ public class App {
             return determineReturnCode(engine, cvssFailScore);
         } finally {
             if (engine != null) {
-                engine.cleanup();
+                engine.close();
             }
         }
     }

dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java

@@ -243,7 +243,8 @@ public class Engine implements FileFilter, AutoCloseable {
     /**
      * Properly cleans up resources allocated during analysis.
      */
-    public void cleanup() {
+    @Override
+    public void close() {
         if (mode.isDatabseRequired()) {
             if (database != null) {
                 database.close();
@@ -252,11 +253,6 @@ public class Engine implements FileFilter, AutoCloseable {
         }
     }
 
-    @Override
-    public void close() {
-        cleanup();
-    }
-
     /**
      * Loads the analyzers specified in the configuration file (or system
      * properties).

dependency-check-core/src/main/java/org/owasp/dependencycheck/agent/DependencyCheckScanAgent.java

@@ -926,7 +926,7 @@ public class DependencyCheckScanAgent {
         } finally {
             settings.cleanup(true);
             if (engine != null) {
-                engine.cleanup();
+                engine.close();
             }
         }
         return engine;

dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineIT.java

@@ -63,10 +63,10 @@ public class EngineIT extends BaseDBTestCase {
             //allowedMessages.add("Unable to connect to");
             for (Throwable t : ex.getExceptions()) {
                 boolean isOk = false;
-                if (t.getMessage()!=null) {
+                if (t.getMessage() != null) {
                     for (String msg : allowedMessages) {
                         if (t.getMessage().contains(msg)) {
-                            isOk=true;
+                            isOk = true;
                             break;
                         }
                     }
@@ -77,6 +77,6 @@ public class EngineIT extends BaseDBTestCase {
             }
         }
         instance.writeReports("dependency-check sample", new File("./target/"), "ALL");
-        instance.cleanup();
+        instance.close();
     }
 }

dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerIT.java

@@ -142,7 +142,7 @@ public class ArchiveAnalyzerIT extends BaseDBTestCase {
             instance.analyze(dependency, engine);
             int ending_size = engine.getDependencies().length;
 
-            engine.cleanup();
+            engine.close();
 
             assertTrue(initial_size < ending_size);
 
@@ -173,7 +173,7 @@ public class ArchiveAnalyzerIT extends BaseDBTestCase {
             instance.analyze(dependency, engine);
             int ending_size = engine.getDependencies().length;
 
-            engine.cleanup();
+            engine.close();
 
             assertTrue(initial_size < ending_size);
 
@@ -206,7 +206,7 @@ public class ArchiveAnalyzerIT extends BaseDBTestCase {
             int initial_size = engine.getDependencies().length;
             instance.analyze(dependency, engine);
             int ending_size = engine.getDependencies().length;
-            engine.cleanup();
+            engine.close();
 
             assertTrue(initial_size < ending_size);
 
@@ -239,7 +239,7 @@ public class ArchiveAnalyzerIT extends BaseDBTestCase {
             engine.scan(file);
             engine.analyzeDependencies();
             int ending_size = engine.getDependencies().length;
-            engine.cleanup();
+            engine.close();
             assertTrue(initial_size < ending_size);
 
         } finally {
@@ -266,7 +266,7 @@ public class ArchiveAnalyzerIT extends BaseDBTestCase {
             engine.scan(file);
             engine.analyzeDependencies();
             int ending_size = engine.getDependencies().length;
-            engine.cleanup();
+            engine.close();
             assertTrue(initial_size < ending_size);
         } finally {
             instance.close();
@@ -295,7 +295,7 @@ public class ArchiveAnalyzerIT extends BaseDBTestCase {
             engine.scan(file);
             engine.analyzeDependencies();
             int ending_size = engine.getDependencies().length;
-            engine.cleanup();
+            engine.close();
             assertTrue(initial_size < ending_size);
 
         } finally {
@@ -322,7 +322,7 @@ public class ArchiveAnalyzerIT extends BaseDBTestCase {
             engine.scan(file);
             engine.analyzeDependencies();
             int ending_size = engine.getDependencies().length;
-            engine.cleanup();
+            engine.close();
             assertTrue(initial_size < ending_size);
         } finally {
             instance.close();
@@ -355,7 +355,7 @@ public class ArchiveAnalyzerIT extends BaseDBTestCase {
 //            }
 //            assertTrue(failed);
             int ending_size = engine.getDependencies().length;
-            engine.cleanup();
+            engine.close();
             assertEquals(initial_size, ending_size);
         } finally {
             instance.close();

dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerIT.java

@@ -212,7 +212,7 @@ public class CPEAnalyzerIT extends BaseDBTestCase {
         assertTrue("Incorrect match size - spring3 - " + spring3.getIdentifiers().size(), spring3.getIdentifiers().size() >= 1);
 
         jarAnalyzer.close();
-        engine.cleanup();
+        engine.close();
     }
 
     /**
@@ -239,7 +239,7 @@ public class CPEAnalyzerIT extends BaseDBTestCase {
         Identifier expIdentifier = new Identifier("cpe", expResult, expResult);
 
         assertTrue(openssl.getIdentifiers().contains(expIdentifier));
-        engine.cleanup();
+        engine.close();
     }
 
     /**

dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerIT.java

@@ -91,7 +91,7 @@ public class VulnerabilitySuppressionAnalyzerIT extends BaseDBTestCase {
         cpeSize = cpeSize > 0 ? cpeSize - 1 : 0;
         assertTrue(dependency.getVulnerabilities().size() == cveSize);
         assertTrue(dependency.getIdentifiers().size() == cpeSize);
-        engine.cleanup();
+        engine.close();
     }
 
     /**

dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorIT.java

@@ -76,7 +76,7 @@ public class ReportGeneratorIT extends BaseDBTestCase {
             engine.analyzeDependencies();
             engine.writeReports("Test Report", "org.owasp", "dependency-check-core", "1.4.7", writeTo, "XML");
 
-            engine.cleanup();
+            engine.close();
 
             InputStream xsdStream = ReportGenerator.class.getClassLoader().getResourceAsStream("schema/dependency-check.1.5.xsd");
             StreamSource xsdSource = new StreamSource(xsdStream);

dependency-check-maven/pom.xml

@@ -235,7 +235,6 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved.
                             <parallelThreads>4</parallelThreads>
                             <setupIncludes>
                                 <setupInclude>690-threadsafety/pom.xml</setupInclude>
-                                <setupInclude>618-aggregator-purge/pom.xml</setupInclude>
                             </setupIncludes>
                             <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
                             <localRepositoryPath>target/local-repo</localRepositoryPath>

dependency-check-maven/src/it/690-threadsafety/invoker.properties

@@ -16,4 +16,4 @@
 # Copyright (c) 2014 Jeremy Long. All Rights Reserved.
 #
 
-invoker.goals = install ${project.groupId}:${project.artifactId}:${project.version}:check -X -T 1
+invoker.goals = install ${project.groupId}:${project.artifactId}:${project.version}:check -X -T 12

dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/AggregateMojo.java

@@ -150,7 +150,7 @@ public class AggregateMojo extends BaseDependencyCheckMojo {
         if (exCol != null && this.isFailOnError()) {
             throw new MojoExecutionException("One or more exceptions occurred during dependency-check analysis", exCol);
         }
-        engine.cleanup();
+        engine.close();
         getSettings().cleanup();
     }
 

dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/CheckMojo.java

@@ -129,7 +129,7 @@ public class CheckMojo extends BaseDependencyCheckMojo {
                     throw new MojoExecutionException("One or more exceptions occurred during dependency-check analysis", exCol);
                 }
             }
-            engine.cleanup();
+            engine.close();
         }
         getSettings().cleanup();
     }

dependency-check-maven/src/test/java/org/owasp/dependencycheck/maven/BaseDependencyCheckMojoTest.java

@@ -103,7 +103,7 @@ public class BaseDependencyCheckMojoTest extends BaseTest {
                 Assume.assumeNoException(ex);
             }
             assertFalse(engine.getDependencies().length == 0);
-            engine.cleanup();
+            engine.close();
         }
     }