From 25fc2bfbea3e70153f5418e4f775597c2327d909 Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Wed, 16 Apr 2014 07:55:56 -0400
Subject: [PATCH] updated to support the new Settings implementation

Former-commit-id: bbb7dae7e2e9969ff648e9bfa0ddb4ab23cf3cc9
---
 .../maven/DependencyCheckMojo.java            | 40 +++++++++----------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/DependencyCheckMojo.java b/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/DependencyCheckMojo.java
index e447b51cf..0090fb135 100644
--- a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/DependencyCheckMojo.java
+++ b/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/DependencyCheckMojo.java
@@ -356,31 +356,26 @@ public class DependencyCheckMojo extends AbstractMojo implements MavenMultiPageR
         LogUtils.prepareLogger(in, logFile);
 
         populateSettings();
-        Engine engine = null;
-        try {
-            engine = new Engine();
-            final Set<Artifact> artifacts = project.getArtifacts();
-            for (Artifact a : artifacts) {
-                if (skipTestScope && Artifact.SCOPE_TEST.equals(a.getScope())) {
-                    continue;
-                }
+        Engine engine = new Engine();
 
-                if (skipProvidedScope && Artifact.SCOPE_PROVIDED.equals(a.getScope())) {
-                    continue;
-                }
-
-                if (skipRuntimeScope && !Artifact.SCOPE_RUNTIME.equals(a.getScope())) {
-                    continue;
-                }
-
-                engine.scan(a.getFile().getAbsolutePath());
+        final Set<Artifact> artifacts = project.getArtifacts();
+        for (Artifact a : artifacts) {
+            if (skipTestScope && Artifact.SCOPE_TEST.equals(a.getScope())) {
+                continue;
             }
-            engine.analyzeDependencies();
-        } finally {
-            if (engine != null) {
-                engine.cleanup();
+
+            if (skipProvidedScope && Artifact.SCOPE_PROVIDED.equals(a.getScope())) {
+                continue;
             }
+
+            if (skipRuntimeScope && !Artifact.SCOPE_RUNTIME.equals(a.getScope())) {
+                continue;
+            }
+
+            engine.scan(a.getFile().getAbsolutePath());
         }
+        engine.analyzeDependencies();
+
         return engine;
     }
 
@@ -815,6 +810,7 @@ public class DependencyCheckMojo extends AbstractMojo implements MavenMultiPageR
      * properties required to change the proxy url, port, and connection timeout.
      */
     private void populateSettings() {
+        Settings.initialize();
         InputStream mojoProperties = null;
         try {
             mojoProperties = this.getClass().getClassLoader().getResourceAsStream(PROPERTIES_FILE);
@@ -951,6 +947,7 @@ public class DependencyCheckMojo extends AbstractMojo implements MavenMultiPageR
                     "Unable to connect to the dependency-check database; analysis has stopped");
             Logger.getLogger(DependencyCheckMojo.class.getName()).log(Level.FINE, "", ex);
         } finally {
+            Settings.cleanup();
             if (engine != null) {
                 engine.cleanup();
             }
@@ -991,6 +988,7 @@ public class DependencyCheckMojo extends AbstractMojo implements MavenMultiPageR
                     "Unable to connect to the dependency-check database; analysis has stopped");
             Logger.getLogger(DependencyCheckMojo.class.getName()).log(Level.FINE, "", ex);
         } finally {
+            Settings.cleanup();
             if (engine != null) {
                 engine.cleanup();
             }