From cde8f50659ea0dc63c39d4220c83c62b2f9dd36f Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Sat, 25 Jan 2014 06:14:21 -0500
Subject: [PATCH] moved the "data" option to the advanced options

Former-commit-id: e18dce070ca110e7c75c868181a576151f08a418
---
 .../java/org/owasp/dependencycheck/cli/CliParser.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/dependency-check-cli/src/main/java/org/owasp/dependencycheck/cli/CliParser.java b/dependency-check-cli/src/main/java/org/owasp/dependencycheck/cli/CliParser.java
index 27eb11757..8d4d5c04e 100644
--- a/dependency-check-cli/src/main/java/org/owasp/dependencycheck/cli/CliParser.java
+++ b/dependency-check-cli/src/main/java/org/owasp/dependencycheck/cli/CliParser.java
@@ -179,10 +179,6 @@ public final class CliParser {
                 .withDescription("A property file to load.")
                 .create(ArgumentName.PROP_SHORT);
 
-        final Option data = OptionBuilder.withArgName("path").hasArg().withLongOpt(ArgumentName.DATA_DIRECTORY)
-                .withDescription("The location of the data directory used to store persistent data. This option should generally not be set.")
-                .create(ArgumentName.DATA_DIRECTORY_SHORT);
-
         final Option out = OptionBuilder.withArgName("folder").hasArg().withLongOpt(ArgumentName.OUT)
                 .withDescription("The folder to write reports to. This defaults to the current directory.")
                 .create(ArgumentName.OUT_SHORT);
@@ -220,7 +216,6 @@ public final class CliParser {
                 .addOption(advancedHelp)
                 .addOption(noUpdate)
                 .addOption(props)
-                .addOption(data)
                 .addOption(verboseLog)
                 .addOption(suppressionFile)
                 .addOption(disableNexusAnalyzer)
@@ -236,6 +231,11 @@ public final class CliParser {
      */
     @SuppressWarnings("static-access")
     private void addAdvancedOptions(final Options options) throws IllegalArgumentException {
+
+        final Option data = OptionBuilder.withArgName("path").hasArg().withLongOpt(ArgumentName.DATA_DIRECTORY)
+                .withDescription("The location of the H2 Database file. This option should generally not be set.")
+                .create(ArgumentName.DATA_DIRECTORY_SHORT);
+
         final Option connectionTimeout = OptionBuilder.withArgName("timeout").hasArg().withLongOpt(ArgumentName.CONNECTION_TIMEOUT)
                 .withDescription("The connection timeout (in milliseconds) to use when downloading resources.")
                 .create(ArgumentName.CONNECTION_TIMEOUT_SHORT);
@@ -279,6 +279,7 @@ public final class CliParser {
                 .addOption(connectionTimeout)
                 .addOption(connectionString)
                 .addOption(dbUser)
+                .addOption(data)
                 .addOption(dbPassword)
                 .addOption(dbDriver)
                 .addOption(dbDriverPath);