From 7ec2458fb55b5e5d7e41e581142bbaf8973f6512 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Tue, 4 Nov 2014 05:33:18 -0500 Subject: [PATCH] moved CliParser Former-commit-id: 69ea743196109849d078df8f7071af0a3027fe99 --- .../src/main/java/org/owasp/dependencycheck/App.java | 1 - .../owasp/dependencycheck/{cli => }/CliParser.java | 2 +- .../org/owasp/dependencycheck/cli/package-info.java | 12 ------------ .../dependencycheck/{cli => }/CliParserTest.java | 3 ++- 4 files changed, 3 insertions(+), 15 deletions(-) rename dependency-check-cli/src/main/java/org/owasp/dependencycheck/{cli => }/CliParser.java (99%) delete mode 100644 dependency-check-cli/src/main/java/org/owasp/dependencycheck/cli/package-info.java rename dependency-check-cli/src/test/java/org/owasp/dependencycheck/{cli => }/CliParserTest.java (99%) 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 25748e970..5122bf88f 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 @@ -25,7 +25,6 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; import org.apache.commons.cli.ParseException; -import org.owasp.dependencycheck.cli.CliParser; import org.owasp.dependencycheck.data.nvdcve.CveDB; import org.owasp.dependencycheck.data.nvdcve.DatabaseException; import org.owasp.dependencycheck.data.nvdcve.DatabaseProperties; 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/CliParser.java similarity index 99% rename from dependency-check-cli/src/main/java/org/owasp/dependencycheck/cli/CliParser.java rename to dependency-check-cli/src/main/java/org/owasp/dependencycheck/CliParser.java index b3069ab6d..5092e9eb5 100644 --- a/dependency-check-cli/src/main/java/org/owasp/dependencycheck/cli/CliParser.java +++ b/dependency-check-cli/src/main/java/org/owasp/dependencycheck/CliParser.java @@ -15,7 +15,7 @@ * * Copyright (c) 2012 Jeremy Long. All Rights Reserved. */ -package org.owasp.dependencycheck.cli; +package org.owasp.dependencycheck; import java.io.File; import java.io.FileNotFoundException; diff --git a/dependency-check-cli/src/main/java/org/owasp/dependencycheck/cli/package-info.java b/dependency-check-cli/src/main/java/org/owasp/dependencycheck/cli/package-info.java deleted file mode 100644 index 1d5265535..000000000 --- a/dependency-check-cli/src/main/java/org/owasp/dependencycheck/cli/package-info.java +++ /dev/null @@ -1,12 +0,0 @@ -/** - * - * - * org.owasp.dependencycheck.cli - * - * - * Includes utility classes such as the CLI Parser, - * - * -*/ - -package org.owasp.dependencycheck.cli; diff --git a/dependency-check-cli/src/test/java/org/owasp/dependencycheck/cli/CliParserTest.java b/dependency-check-cli/src/test/java/org/owasp/dependencycheck/CliParserTest.java similarity index 99% rename from dependency-check-cli/src/test/java/org/owasp/dependencycheck/cli/CliParserTest.java rename to dependency-check-cli/src/test/java/org/owasp/dependencycheck/CliParserTest.java index 1c62ed81e..119397278 100644 --- a/dependency-check-cli/src/test/java/org/owasp/dependencycheck/cli/CliParserTest.java +++ b/dependency-check-cli/src/test/java/org/owasp/dependencycheck/CliParserTest.java @@ -15,8 +15,9 @@ * * Copyright (c) 2012 Jeremy Long. All Rights Reserved. */ -package org.owasp.dependencycheck.cli; +package org.owasp.dependencycheck; +import org.owasp.dependencycheck.CliParser; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileNotFoundException;