diff --git a/dependency-check-ant/pom.xml b/dependency-check-ant/pom.xml index 8c4cbd885..e004f984d 100644 --- a/dependency-check-ant/pom.xml +++ b/dependency-check-ant/pom.xml @@ -25,6 +25,8 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved. dependency-check-ant + 1.2.0.1 + jar Dependency-Check Ant Task diff --git a/dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java b/dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java index b667c6580..5d800dda3 100644 --- a/dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java +++ b/dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java @@ -57,8 +57,13 @@ public class App { * @param args the command line arguments */ public static void main(String[] args) { - final App app = new App(); - app.run(args); + try { + Settings.initialize(); + final App app = new App(); + app.run(args); + } finally { + Settings.cleanup(); + } } /** @@ -67,8 +72,8 @@ public class App { * @param args the command line arguments */ public void run(String[] args) { - final CliParser cli = new CliParser(); + try { cli.parse(args); } catch (FileNotFoundException ex) { @@ -140,7 +145,6 @@ public class App { LOGGER.log(Level.SEVERE, "Unable to connect to the dependency-check database; analysis has stopped"); LOGGER.log(Level.FINE, "", ex); } finally { - Settings.cleanup(); if (scanner != null) { scanner.cleanup(); } @@ -155,8 +159,6 @@ public class App { */ private void populateSettings(CliParser cli) { - Settings.initialize(); - final boolean autoUpdate = cli.isAutoUpdate(); final String connectionTimeout = cli.getConnectionTimeout(); final String proxyUrl = cli.getProxyUrl();