removed cleanup in favor of close from autoclosable

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