From 62a5db6b8bd1d0aaac224b1819bcdf1cf51cdbe8 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Thu, 25 Jan 2018 06:54:01 -0500 Subject: [PATCH] renamed modules and fixed errors with various lifecycle stages --- {dependency-check-ant => ant}/LICENSE.txt | 0 {dependency-check-ant => ant}/NOTICE.txt | 0 {dependency-check-ant => ant}/README.md | 0 {dependency-check-ant => ant}/pom.xml | 0 .../src/main/assembly/release.xml | 0 .../ant/logging/AntLoggerAdapter.java | 0 .../ant/logging/AntLoggerFactory.java | 0 .../ant/logging/package-info.java | 0 .../owasp/dependencycheck/taskdefs/Check.java | 0 .../owasp/dependencycheck/taskdefs/Purge.java | 0 .../taskdefs/SuppressionFile.java | 0 .../dependencycheck/taskdefs/Update.java | 0 .../taskdefs/package-info.java | 0 .../org/slf4j/impl/StaticLoggerBinder.java | 0 .../java/org/slf4j/impl/package-info.java | 0 .../META-INF/licenses/ant/LICENSE.txt | 0 .../dependency-check-taskdefs.properties | 0 .../src/main/resources/task.properties | 0 .../src/site/markdown/config-purge.md | 0 .../src/site/markdown/config-update.md | 0 .../src/site/markdown/configuration.md | 0 .../src/site/markdown/index.md.vm | 0 .../src/site/resources/images/dc-ant.svg | 0 .../src/site/site.xml | 0 .../taskdefs/DependencyCheckTaskTest.java | 0 .../src/test/resources/build.xml | 0 .../src/test/resources/test-suppression.xml | 0 .../src/test/resources/test-suppression1.xml | 0 .../src/test/resources/test-suppression2.xml | 0 .../pom.xml | 0 .../META-INF/maven/archetype-metadata.xml | 0 .../resources/archetype-resources/pom.xml | 0 .../src/main/java/__analyzerName__.java | 0 ...rg.owasp.dependencycheck.analyzer.Analyzer | 0 ...dencycheck.data.update.CachedWebDataSource | 0 .../src/test/java/__analyzerName__Test.java | 0 .../src/test/resources/test.file | 0 .../src/site/markdown/index.md.vm | 0 .../src/site/resources/images/dc.svg | 0 .../src/site/site.xml | 0 build-reporting/pom.xml | 17 ++++++--- {dependency-check-cli => cli}/LICENSE.txt | 0 {dependency-check-cli => cli}/NOTICE.txt | 0 {dependency-check-cli => cli}/README.md | 0 {dependency-check-cli => cli}/pom.xml | 0 .../src/main/assembly/license.txt | 0 .../src/main/assembly/release.xml | 0 .../java/org/owasp/dependencycheck/App.java | 0 .../org/owasp/dependencycheck/CliParser.java | 0 .../InvalidScanPathException.java | 0 .../owasp/dependencycheck/package-info.java | 0 .../META-INF/licenses/commons-cli/LICENSE.txt | 0 .../src/main/resources/logback.xml | 0 .../src/site/markdown/arguments.md | 0 .../src/site/markdown/index.md.vm | 0 .../src/site/resources/images/dc-cli.svg | 0 .../src/site/site.xml | 0 .../org/owasp/dependencycheck/AppTest.java | 0 .../org/owasp/dependencycheck/BaseTest.java | 0 .../owasp/dependencycheck/CliParserTest.java | 0 .../src/test/resources/checkSumTest.file | 0 .../src/test/resources/sample.properties | 0 .../src/test/resources/sample2.properties | 0 {dependency-check-core => core}/LICENSE.txt | 0 {dependency-check-core => core}/NOTICE.txt | 0 {dependency-check-core => core}/README.md | 0 {dependency-check-core => core}/pom.xml | 1 + .../owasp/dependencycheck/AnalysisTask.java | 0 .../org/owasp/dependencycheck/Engine.java | 0 .../agent/DependencyCheckScanAgent.java | 0 .../dependencycheck/agent/package-info.java | 0 .../analyzer/AbstractAnalyzer.java | 0 .../AbstractDependencyComparingAnalyzer.java | 0 .../analyzer/AbstractFileTypeAnalyzer.java | 0 .../analyzer/AbstractNpmAnalyzer.java | 0 .../analyzer/AbstractSuppressionAnalyzer.java | 0 .../analyzer/AnalysisPhase.java | 0 .../dependencycheck/analyzer/Analyzer.java | 0 .../analyzer/AnalyzerService.java | 0 .../analyzer/ArchiveAnalyzer.java | 0 .../analyzer/AssemblyAnalyzer.java | 0 .../analyzer/AutoconfAnalyzer.java | 0 .../analyzer/CMakeAnalyzer.java | 0 .../dependencycheck/analyzer/CPEAnalyzer.java | 0 .../analyzer/CentralAnalyzer.java | 0 .../analyzer/CocoaPodsAnalyzer.java | 0 .../analyzer/ComposerLockAnalyzer.java | 0 .../analyzer/CpeSuppressionAnalyzer.java | 0 .../analyzer/DependencyBundlingAnalyzer.java | 0 .../analyzer/DependencyMergingAnalyzer.java | 0 .../analyzer/Experimental.java | 0 .../analyzer/FalsePositiveAnalyzer.java | 0 .../analyzer/FileNameAnalyzer.java | 0 .../analyzer/FileTypeAnalyzer.java | 0 .../analyzer/HintAnalyzer.java | 0 .../dependencycheck/analyzer/JarAnalyzer.java | 0 .../analyzer/NexusAnalyzer.java | 0 .../analyzer/NodePackageAnalyzer.java | 0 .../dependencycheck/analyzer/NspAnalyzer.java | 0 .../analyzer/NuspecAnalyzer.java | 0 .../analyzer/NvdCveAnalyzer.java | 0 .../analyzer/OpenSSLAnalyzer.java | 0 .../analyzer/PythonDistributionAnalyzer.java | 0 .../analyzer/PythonPackageAnalyzer.java | 0 .../dependencycheck/analyzer/Retired.java | 0 .../analyzer/RubyBundleAuditAnalyzer.java | 0 .../analyzer/RubyBundlerAnalyzer.java | 0 .../analyzer/RubyGemspecAnalyzer.java | 0 .../analyzer/SwiftPackageManagerAnalyzer.java | 0 .../analyzer/VersionFilterAnalyzer.java | 0 .../VulnerabilitySuppressionAnalyzer.java | 0 .../analyzer/exception/AnalysisException.java | 0 .../exception/ArchiveExtractionException.java | 0 .../analyzer/exception/package-info.java | 0 .../analyzer/package-info.java | 0 .../data/central/CentralSearch.java | 0 .../data/central/package-info.java | 0 .../data/composer/ComposerDependency.java | 0 .../data/composer/ComposerException.java | 0 .../data/composer/ComposerLockParser.java | 0 .../data/composer/package-info.java | 0 .../data/cpe/CpeMemoryIndex.java | 0 .../dependencycheck/data/cpe/Fields.java | 0 .../dependencycheck/data/cpe/IndexEntry.java | 0 .../data/cpe/IndexException.java | 0 .../data/cpe/package-info.java | 0 .../owasp/dependencycheck/data/cwe/CweDB.java | 0 .../dependencycheck/data/cwe/CweHandler.java | 0 .../data/cwe/package-info.java | 0 .../data/lucene/AbstractTokenizingFilter.java | 0 .../data/lucene/AlphaNumericFilter.java | 0 .../data/lucene/AlphaNumericTokenizer.java | 0 .../data/lucene/DependencySimilarity.java | 0 .../data/lucene/LuceneUtils.java | 0 .../data/lucene/SearchFieldAnalyzer.java | 0 .../lucene/TokenPairConcatenatingFilter.java | 0 .../data/lucene/UrlTokenizingFilter.java | 0 .../data/lucene/package-info.java | 0 .../data/nexus/MavenArtifact.java | 0 .../data/nexus/NexusSearch.java | 0 .../data/nexus/package-info.java | 0 .../dependencycheck/data/nsp/Advisory.java | 0 .../dependencycheck/data/nsp/NspSearch.java | 0 .../data/nsp/SanitizePackage.java | 0 .../data/nsp/package-info.java | 0 .../data/nuget/NugetPackage.java | 0 .../data/nuget/NuspecParseException.java | 0 .../data/nuget/NuspecParser.java | 0 .../data/nuget/XPathNuspecParser.java | 0 .../data/nuget/package-info.java | 0 .../data/nvdcve/ConnectionFactory.java | 0 .../data/nvdcve/CorruptDatabaseException.java | 0 .../dependencycheck/data/nvdcve/CveDB.java | 0 .../data/nvdcve/DatabaseException.java | 0 .../data/nvdcve/DatabaseProperties.java | 0 .../data/nvdcve/DriverLoadException.java | 0 .../data/nvdcve/DriverLoader.java | 0 .../data/nvdcve/DriverShim.java | 0 .../data/nvdcve/package-info.java | 0 .../data/update/CachedWebDataSource.java | 0 .../data/update/CpeUpdater.java | 0 .../data/update/EngineVersionCheck.java | 0 .../data/update/NvdCveUpdater.java | 0 .../data/update/UpdateService.java | 0 .../data/update/cpe/CPEHandler.java | 0 .../dependencycheck/data/update/cpe/Cpe.java | 0 .../data/update/cpe/package-info.java | 0 .../exception/InvalidDataException.java | 0 .../update/exception/UpdateException.java | 0 .../data/update/exception/package-info.java | 0 .../data/update/nvd/DownloadTask.java | 0 .../data/update/nvd/NvdCve12Handler.java | 0 .../data/update/nvd/NvdCve20Handler.java | 0 .../data/update/nvd/NvdCveInfo.java | 0 .../data/update/nvd/ProcessTask.java | 0 .../data/update/nvd/UpdateableNvdCve.java | 0 .../data/update/nvd/package-info.java | 0 .../data/update/package-info.java | 0 .../dependency/Confidence.java | 0 .../dependency/Dependency.java | 0 .../dependencycheck/dependency/Evidence.java | 0 .../dependency/EvidenceCollection.java | 0 .../dependency/EvidenceType.java | 0 .../dependency/Identifier.java | 0 .../dependencycheck/dependency/Reference.java | 0 .../dependency/Vulnerability.java | 0 .../dependency/VulnerableSoftware.java | 0 .../dependency/package-info.java | 0 .../DependencyNotFoundException.java | 0 .../exception/ExceptionCollection.java | 0 .../exception/H2DBLockException.java | 0 .../exception/InitializationException.java | 0 .../exception/NoDataException.java | 0 .../exception/ReportException.java | 0 .../exception/ScanAgentException.java | 0 .../exception/package-info.java | 0 .../owasp/dependencycheck/package-info.java | 0 .../dependencycheck/reporting/EscapeTool.java | 0 .../reporting/ReportGenerator.java | 0 .../reporting/VelocityLoggerRedirect.java | 0 .../reporting/package-info.java | 0 .../owasp/dependencycheck/utils/DBUtils.java | 0 .../owasp/dependencycheck/utils/DateUtil.java | 0 .../utils/DependencyVersion.java | 0 .../utils/DependencyVersionUtil.java | 0 .../dependencycheck/utils/ExtractionUtil.java | 0 .../utils/FileFilterBuilder.java | 0 .../owasp/dependencycheck/utils/Filter.java | 0 .../utils/H2DBCleanupHook.java | 0 .../owasp/dependencycheck/utils/H2DBLock.java | 0 .../utils/H2DBShutdownHook.java | 0 .../utils/H2DBShutdownHookFactory.java | 0 .../org/owasp/dependencycheck/utils/Pair.java | 0 .../dependencycheck/utils/UrlStringUtils.java | 0 .../dependencycheck/utils/package-info.java | 0 .../owasp/dependencycheck/xml/XmlEntity.java | 0 .../dependencycheck/xml/XmlInputStream.java | 0 .../xml/hints/EvidenceMatcher.java | 0 .../xml/hints/HintErrorHandler.java | 0 .../xml/hints/HintHandler.java | 0 .../xml/hints/HintParseException.java | 0 .../dependencycheck/xml/hints/HintParser.java | 0 .../dependencycheck/xml/hints/HintRule.java | 0 .../xml/hints/VendorDuplicatingHintRule.java | 0 .../xml/hints/package-info.java | 0 .../dependencycheck/xml/package-info.java | 0 .../dependencycheck/xml/pom/License.java | 0 .../owasp/dependencycheck/xml/pom/Model.java | 0 .../dependencycheck/xml/pom/PomHandler.java | 0 .../xml/pom/PomParseException.java | 0 .../dependencycheck/xml/pom/PomParser.java | 0 .../dependencycheck/xml/pom/PomUtils.java | 0 .../dependencycheck/xml/pom/package-info.java | 0 .../xml/suppression/PropertyType.java | 0 .../suppression/SuppressionErrorHandler.java | 0 .../xml/suppression/SuppressionHandler.java | 0 .../SuppressionParseException.java | 0 .../xml/suppression/SuppressionParser.java | 0 .../xml/suppression/SuppressionRule.java | 0 .../xml/suppression/package-info.java | 0 .../src/main/resources/GrokAssembly.exe | Bin .../main/resources/GrokAssembly.exe.config | 0 .../licenses/StupidTablePlugin/LICENSE.txt | 0 .../licenses/commons-compress/LICENSE.txt | 0 .../META-INF/licenses/commons-io/LICENSE.txt | 0 .../META-INF/licenses/cve/license.txt | 0 .../META-INF/licenses/cwe/license.txt | 0 .../META-INF/licenses/h2database/license.txt | 0 .../META-INF/licenses/h2database/readme.txt | 0 .../META-INF/licenses/jquery/MIT-LICENSE.txt | 0 .../META-INF/licenses/jsoup/LICENSE.txt | 0 .../META-INF/licenses/lucene/LICENSE.txt | 0 .../META-INF/licenses/velocity/LICENSE.txt | 0 ...rg.owasp.dependencycheck.analyzer.Analyzer | 0 ...dencycheck.data.update.CachedWebDataSource | 0 .../resources/data/cwe.hashmap.serialized | Bin .../resources/data/dbStatements.properties | 0 .../resources/data/dbStatements_h2.properties | 0 .../data/dbStatements_mysql.properties | 0 .../data/dbStatements_oracle.properties | 0 .../data/dbStatements_postgresql.properties | 0 .../src/main/resources/data/initialize.sql | 0 .../main/resources/data/initialize_mssql.sql | 0 .../main/resources/data/initialize_mysql.sql | 0 .../main/resources/data/initialize_oracle.sql | 0 .../resources/data/initialize_postgres.sql | 0 .../src/main/resources/data/upgrade_2.9.sql | 0 .../src/main/resources/data/upgrade_3.0.sql | 0 .../main/resources/data/upgrade_mysql_2.9.sql | 0 .../resources/dependencycheck-base-hint.xml | 0 .../dependencycheck-base-suppression.xml | 0 .../main/resources/dependencycheck.properties | 0 .../schema/cpe/cpe-dictionary_2.2.xsd | 0 .../resources/schema/dependency-check.1.3.xsd | 0 .../resources/schema/dependency-check.1.4.xsd | 0 .../resources/schema/dependency-check.1.5.xsd | 0 .../resources/schema/dependency-check.1.6.xsd | 0 .../resources/schema/dependency-hint.1.0.xsd | 0 .../resources/schema/dependency-hint.1.1.xsd | 0 .../resources/schema/dependency-hint.1.2.xsd | 0 .../resources/schema/dependency-hint.1.3.xsd | 0 .../schema/dependency-suppression.1.1.xsd | 0 .../resources/schema/nvdcve/1_2/nvdcve.xsd | 0 .../resources/schema/nvdcve/2_0/cce_0.1.xsd | 0 .../schema/nvdcve/2_0/cpe-language_2.1.xsd | 0 .../resources/schema/nvdcve/2_0/cve_0.1.xsd | 0 .../schema/nvdcve/2_0/cvss-v2_0.2.xsd | 0 .../schema/nvdcve/2_0/nvd-cve-feed_2.0.xsd | 0 .../resources/schema/nvdcve/2_0/patch_0.1.xsd | 0 .../schema/nvdcve/2_0/scap-core_0.1.xsd | 0 .../schema/nvdcve/2_0/vulnerability_0.4.xsd | 0 .../resources/schema/pom/generateBindings.bat | 0 .../resources/schema/pom/generateBindings.sh | 0 .../resources/schema/pom/maven-v4_0_0.xsd | 0 .../src/main/resources/schema/suppression.xsd | 0 .../main/resources/templates/csvReport.vsl | 0 .../main/resources/templates/htmlReport.vsl | 0 .../main/resources/templates/img/minus.gif | Bin .../src/main/resources/templates/img/plus.gif | Bin .../main/resources/templates/jsonReport.vsl | 0 .../templates/scripts/jquery-1.8.0.min.js | 0 .../main/resources/templates/vulnReport.vsl | 0 .../main/resources/templates/xmlReport.vsl | 0 .../src/site/markdown/index.md | 0 .../src/site/resources/images/dc-core.svg | 0 .../src/site/site.xml | 0 .../dependencycheck/AnalysisTaskTest.java | 0 .../owasp/dependencycheck/BaseDBTestCase.java | 0 .../org/owasp/dependencycheck/BaseTest.java | 0 .../org/owasp/dependencycheck/EngineIT.java | 0 .../owasp/dependencycheck/EngineModeIT.java | 0 .../org/owasp/dependencycheck/EngineTest.java | 0 .../AbstractFileTypeAnalyzerTest.java | 0 .../AbstractSuppressionAnalyzerTest.java | 0 .../analyzer/AnalyzerServiceTest.java | 0 .../analyzer/ArchiveAnalyzerIT.java | 0 .../analyzer/ArchiveAnalyzerTest.java | 0 .../analyzer/AssemblyAnalyzerTest.java | 0 .../analyzer/AutoconfAnalyzerTest.java | 0 .../analyzer/CMakeAnalyzerTest.java | 0 .../analyzer/CPEAnalyzerIT.java | 0 .../analyzer/CPEAnalyzerTest.java | 0 .../analyzer/CentralAnalyzerTest.java | 0 .../analyzer/ComposerLockAnalyzerTest.java | 0 .../DependencyBundlingAnalyzerIT.java | 0 .../DependencyBundlingAnalyzerTest.java | 0 .../analyzer/FalsePositiveAnalyzerTest.java | 0 .../analyzer/FileNameAnalyzerTest.java | 0 .../analyzer/HintAnalyzerTest.java | 0 .../analyzer/JarAnalyzerTest.java | 0 .../analyzer/NodePackageAnalyzerTest.java | 0 .../analyzer/NspAnalyzerTest.java | 0 .../analyzer/NuspecAnalyzerTest.java | 0 .../analyzer/OpenSSLAnalyzerTest.java | 0 .../PythonDistributionAnalyzerTest.java | 0 .../analyzer/PythonPackageAnalyzerTest.java | 0 .../analyzer/RubyBundleAuditAnalyzerIT.java | 0 .../analyzer/RubyBundlerAnalyzerTest.java | 0 .../analyzer/RubyGemspecAnalyzerTest.java | 0 .../analyzer/SwiftAnalyzersTest.java | 0 .../analyzer/VersionFilterAnalyzerTest.java | 0 .../VulnerabilitySuppressionAnalyzerIT.java | 0 .../data/central/CentralSearchTest.java | 0 .../data/composer/ComposerLockParserTest.java | 0 .../data/cpe/IndexEntryTest.java | 0 .../dependencycheck/data/cwe/CweDBTest.java | 0 .../data/lucene/AlphaNumericFilterTest.java | 0 .../data/lucene/FieldAnalyzerTest.java | 0 .../data/lucene/LuceneUtilsTest.java | 0 .../data/lucene/SearchFieldAnalyzerTest.java | 0 .../TokenPairConcatenatingFilterTest.java | 0 .../data/lucene/UrlTokenizingFilterTest.java | 0 .../data/nexus/NexusSearchTest.java | 0 .../data/nsp/NspSearchTest.java | 0 .../data/nsp/SanitizePackageTest.java | 0 .../data/nuget/XPathNuspecParserTest.java | 0 .../data/nvdcve/ConnectionFactoryTest.java | 0 .../dependencycheck/data/nvdcve/CveDBIT.java | 0 .../data/nvdcve/CveDBMySqlIT.java | 0 .../data/nvdcve/DatabasePropertiesIT.java | 0 .../data/nvdcve/DriverLoaderTest.java | 0 .../data/update/EngineVersionCheckTest.java | 0 .../data/update/NvdCveUpdaterIT.java | 0 .../data/update/nvd/DownloadTaskTest.java | 0 .../data/update/nvd/NvdCveInfoTest.java | 0 .../update/nvd/NvdCve_1_2_HandlerTest.java | 0 .../update/nvd/NvdCve_2_0_HandlerTest.java | 0 .../data/update/nvd/UpdateableNvdCveTest.java | 0 .../dependency/DependencyTest.java | 0 .../dependency/EvidenceTest.java | 0 .../dependency/VulnerabilityTest.java | 0 .../dependency/VulnerableSoftwareTest.java | 0 .../reporting/EscapeToolTest.java | 0 .../reporting/ReportGeneratorIT.java | 0 .../dependencycheck/utils/DateUtilTest.java | 0 .../utils/DependencyVersionTest.java | 0 .../utils/DependencyVersionUtilTest.java | 0 .../dependencycheck/utils/FilterTest.java | 0 .../utils/UrlStringUtilsTest.java | 0 .../dependencycheck/xml/XmlEntityTest.java | 0 .../xml/XmlInputStreamTest.java | 0 .../xml/hints/EvidenceMatcherTest.java | 0 .../xml/hints/HintHandlerTest.java | 0 .../xml/hints/HintParserTest.java | 0 .../dependencycheck/xml/pom/ModelTest.java | 0 .../dependencycheck/xml/pom/PomUtilsTest.java | 0 .../xml/suppression/PropertyTypeTest.java | 0 .../suppression/SuppressionHandlerTest.java | 0 .../suppression/SuppressionParserTest.java | 0 .../xml/suppression/SuppressionRuleTest.java | 0 .../src/test/resources/._avro-ipc-1.5.0.jar | Bin .../test/resources/FileHelpers.2.0.0.0.nupkg | Bin .../src/test/resources/MANIFEST.MF | 0 .../resources/autoconf/binutils/config.in | 0 .../resources/autoconf/binutils/configure | 0 .../resources/autoconf/binutils/configure.ac | 0 .../autoconf/ghostscript/configure.ac | 0 .../autoconf/readable-code/configure | 0 .../autoconf/readable-code/configure.ac | 0 .../src/test/resources/avro-ipc-1.5.0.jar | Bin .../src/test/resources/bootable-0.1.0.jar | Bin .../src/test/resources/cmake/README.md | 0 .../3rdparty/ffmpeg/ffmpeg_version.cmake | 0 .../resources/cmake/opencv/CMakeLists.txt | 0 .../src/test/resources/cmake/opencv/LICENSE | 0 .../cmake/opencv/cmake/FindCUDA.cmake | 0 .../opencv/cmake/FindCUDA/make2cmake.cmake | 0 .../opencv/cmake/FindCUDA/parse_cubin.cmake | 0 .../opencv/cmake/FindCUDA/run_nvcc.cmake | 0 .../cmake/opencv/cmake/OpenCVCRTLinkage.cmake | 0 .../opencv/cmake/OpenCVCompilerOptions.cmake | 0 .../cmake/opencv/cmake/OpenCVConfig.cmake | 0 .../opencv/cmake/OpenCVDetectAndroidSDK.cmake | 0 .../opencv/cmake/OpenCVDetectApacheAnt.cmake | 0 .../opencv/cmake/OpenCVDetectCStripes.cmake | 0 .../cmake/opencv/cmake/OpenCVDetectCUDA.cmake | 0 .../cmake/OpenCVDetectCXXCompiler.cmake | 0 .../opencv/cmake/OpenCVDetectDirectX.cmake | 0 .../opencv/cmake/OpenCVDetectOpenCL.cmake | 0 .../opencv/cmake/OpenCVDetectPython.cmake | 0 .../cmake/opencv/cmake/OpenCVDetectTBB.cmake | 0 .../cmake/opencv/cmake/OpenCVDetectVTK.cmake | 0 .../opencv/cmake/OpenCVExtraTargets.cmake | 0 .../cmake/opencv/cmake/OpenCVFindIPP.cmake | 0 .../opencv/cmake/OpenCVFindIPPAsync.cmake | 0 .../opencv/cmake/OpenCVFindIntelPerCSDK.cmake | 0 .../cmake/opencv/cmake/OpenCVFindLATEX.cmake | 0 .../opencv/cmake/OpenCVFindLibsGUI.cmake | 0 .../opencv/cmake/OpenCVFindLibsGrfmt.cmake | 0 .../opencv/cmake/OpenCVFindLibsPerf.cmake | 0 .../opencv/cmake/OpenCVFindLibsVideo.cmake | 0 .../cmake/opencv/cmake/OpenCVFindMatlab.cmake | 0 .../opencv/cmake/OpenCVFindOpenEXR.cmake | 0 .../cmake/opencv/cmake/OpenCVFindOpenNI.cmake | 0 .../opencv/cmake/OpenCVFindOpenNI2.cmake | 0 .../cmake/opencv/cmake/OpenCVFindWebP.cmake | 0 .../cmake/opencv/cmake/OpenCVFindXimea.cmake | 0 .../cmake/opencv/cmake/OpenCVGenABI.cmake | 0 .../opencv/cmake/OpenCVGenAndroidMK.cmake | 0 .../cmake/opencv/cmake/OpenCVGenConfig.cmake | 0 .../cmake/opencv/cmake/OpenCVGenHeaders.cmake | 0 .../opencv/cmake/OpenCVGenInfoPlist.cmake | 0 .../opencv/cmake/OpenCVGenPkgconfig.cmake | 0 .../opencv/cmake/OpenCVMinDepVersions.cmake | 0 .../cmake/opencv/cmake/OpenCVModule.cmake | 0 .../cmake/opencv/cmake/OpenCVPCHSupport.cmake | 0 .../cmake/opencv/cmake/OpenCVPackaging.cmake | 0 .../cmake/opencv/cmake/OpenCVUtils.cmake | 0 .../cmake/opencv/cmake/OpenCVVersion.cmake | 0 .../cmake/checks/OpenCVDetectCudaArch.cu | 0 .../cmake/opencv/cmake/checks/directx.cpp | 0 .../cmake/opencv/cmake/checks/opencl.cpp | 0 .../cmake/opencv/cmake/checks/vfwtest.cpp | 0 .../cmake/opencv/cmake/checks/win32uitest.cpp | 0 .../resources/cmake/opencv/cmake/cl2cpp.cmake | 0 .../cmake/opencv/cmake/copyAndroidLibs.cmake | 0 .../cmake/opencv/cmake/templates/OpenCV.mk.in | 0 .../templates/OpenCVConfig-version.cmake.in | 0 .../cmake/templates/OpenCVConfig.cmake.in | 0 .../cmake/templates/cmake_uninstall.cmake.in | 0 .../opencv/cmake/templates/cvconfig.h.in | 0 .../opencv/cmake/templates/opencv-XXX.pc.in | 0 .../opencv/cmake/templates/opencv_abi.xml.in | 0 .../cmake/templates/opencv_modules.hpp.in | 0 .../opencv_run_all_tests_android.sh.in | 0 .../templates/opencv_run_all_tests_unix.sh.in | 0 .../opencv_run_all_tests_windows.cmd.in | 0 .../test/resources/cmake/zlib/CMakeLists.txt | 0 .../src/test/resources/cmake/zlib/README | 0 .../commons-fileupload-1.2.1.suppression.xml | 0 .../src/test/resources/composer.lock | 0 .../src/test/resources/cve-1.2-2008_4411.xml | 0 .../src/test/resources/cve-2.0-2008_4411.xml | 0 .../test/resources/dependencycheck.properties | 0 .../src/test/resources/dwr-pom.xml | 0 .../src/test/resources/dwr.jar | Bin .../src/test/resources/file.tar | Bin .../src/test/resources/file.tar.bz2 | Bin .../src/test/resources/file.tar.gz | Bin .../src/test/resources/file.tbz2 | Bin .../src/test/resources/file.tgz | Bin .../src/test/resources/hibernate3.jar | Bin .../src/test/resources/hints.xml | 0 .../src/test/resources/hints_12.xml | 0 .../src/test/resources/hints_13.xml | 0 .../src/test/resources/hints_invalid.xml | 0 .../test/resources/incorrectSuppressions.xml | 0 .../src/test/resources/jmockit-1.26.pom | 0 .../src/test/resources/log4net.2.0.3.nuspec | 0 .../src/test/resources/log4net.dll | Bin .../src/test/resources/logback-test.xml | 0 .../mysql-connector-java-5.1.27-bin.jar | Bin .../nodejs/node_modules/dns-sync/.jshintrc | 0 .../nodejs/node_modules/dns-sync/.npmignore | 0 .../nodejs/node_modules/dns-sync/.travis.yml | 0 .../nodejs/node_modules/dns-sync/LICENSE | 0 .../nodejs/node_modules/dns-sync/Makefile | 0 .../nodejs/node_modules/dns-sync/README.md | 0 .../nodejs/node_modules/dns-sync/index.js | 0 .../node_modules/dns-sync/lib/dns-sync.js | 0 .../dns-sync/node_modules/.bin/shjs | 0 .../dns-sync/node_modules/debug/Readme.md | 0 .../dns-sync/node_modules/debug/debug.js | 0 .../dns-sync/node_modules/debug/index.js | 0 .../dns-sync/node_modules/debug/lib/debug.js | 0 .../dns-sync/node_modules/debug/package.json | 0 .../node_modules/shelljs/.documentup.json | 0 .../dns-sync/node_modules/shelljs/.jshintrc | 0 .../dns-sync/node_modules/shelljs/.npmignore | 0 .../dns-sync/node_modules/shelljs/.travis.yml | 0 .../dns-sync/node_modules/shelljs/LICENSE | 0 .../dns-sync/node_modules/shelljs/README.md | 0 .../dns-sync/node_modules/shelljs/bin/shjs | 0 .../dns-sync/node_modules/shelljs/global.js | 0 .../dns-sync/node_modules/shelljs/make.js | 0 .../node_modules/shelljs/package.json | 0 .../shelljs/scripts/generate-docs.js | 0 .../node_modules/shelljs/scripts/run-tests.js | 0 .../dns-sync/node_modules/shelljs/shell.js | 0 .../dns-sync/node_modules/shelljs/src/cat.js | 0 .../dns-sync/node_modules/shelljs/src/cd.js | 0 .../node_modules/shelljs/src/chmod.js | 0 .../node_modules/shelljs/src/common.js | 0 .../dns-sync/node_modules/shelljs/src/cp.js | 0 .../dns-sync/node_modules/shelljs/src/dirs.js | 0 .../dns-sync/node_modules/shelljs/src/echo.js | 0 .../node_modules/shelljs/src/error.js | 0 .../dns-sync/node_modules/shelljs/src/exec.js | 0 .../dns-sync/node_modules/shelljs/src/find.js | 0 .../dns-sync/node_modules/shelljs/src/grep.js | 0 .../dns-sync/node_modules/shelljs/src/ls.js | 0 .../node_modules/shelljs/src/mkdir.js | 0 .../dns-sync/node_modules/shelljs/src/mv.js | 0 .../dns-sync/node_modules/shelljs/src/popd.js | 0 .../node_modules/shelljs/src/pushd.js | 0 .../dns-sync/node_modules/shelljs/src/pwd.js | 0 .../dns-sync/node_modules/shelljs/src/rm.js | 0 .../dns-sync/node_modules/shelljs/src/sed.js | 0 .../node_modules/shelljs/src/tempdir.js | 0 .../dns-sync/node_modules/shelljs/src/test.js | 0 .../dns-sync/node_modules/shelljs/src/to.js | 0 .../node_modules/shelljs/src/toEnd.js | 0 .../node_modules/shelljs/src/which.js | 0 .../nodejs/node_modules/dns-sync/package.json | 0 .../dns-sync/scripts/dns-lookup-script.js | 0 .../nodejs/node_modules/dns-sync/test/test.js | 0 .../test/resources/nodejs/npm-shrinkwrap.json | 0 .../test/resources/nodejs/package-lock.json | 0 .../src/test/resources/nsp/empty.json | 0 .../test/resources/nsp/minimal-invalid.json | 0 .../src/test/resources/nsp/package.json | 0 .../src/test/resources/nuspec/test.nuspec | 0 .../src/test/resources/nvdcve-2.0-2012.xml | 0 .../src/test/resources/nvdcve-2.0-2014.xml | 0 .../test/resources/nvdcve-2.0-modified.xml | 0 .../src/test/resources/nvdcve-2012.xml | 0 .../src/test/resources/nvdcve-2014.xml | 0 .../src/test/resources/nvdcve-modified.xml | 0 .../src/test/resources/openssl/opensslv.h | 0 .../src/test/resources/other-suppressions.xml | 0 .../python/Django-1.7.2-py2.py3-none-any.whl | Bin .../python/dist/EggTest-0.0.1-py2.7.egg | Bin .../python/dist/EggTest-0.0.1-py2.7.zip | Bin .../resources/python/eggtest/__about__.py | 0 .../test/resources/python/eggtest/__init__.py | 0 .../resources/python/eggtest/__init__.pyc | Bin .../src/test/resources/python/eggtest/main.py | 0 .../test/resources/python/eggtest/main.pyc | Bin .../src/test/resources/python/setup.py | 0 .../Django-1.7.2.data/scripts/django-admin.py | 0 .../Django-1.7.2.dist-info/DESCRIPTION.rst | 0 .../Django-1.7.2.dist-info/LICENSE.txt | 0 .../Django-1.7.2.dist-info/METADATA | 0 .../Django-1.7.2.dist-info/WHEEL | 0 .../Django-1.7.2.dist-info/entry_points.txt | 0 .../Django-1.7.2.dist-info/metadata.json | 0 .../Django-1.7.2.dist-info/top_level.txt | 0 .../EggTest-0.0.1-py2.7.egg/EGG-INFO/PKG-INFO | 0 .../EGG-INFO/SOURCES.txt | 0 .../EGG-INFO/dependency_links.txt | 0 .../EGG-INFO/top_level.txt | 0 .../EggTest-0.0.1-py2.7.egg/EGG-INFO/zip-safe | 0 .../eggtest/__about__.py | 0 .../eggtest/__about__.pyc | Bin .../eggtest/__init__.py | 0 .../eggtest/__init__.pyc | Bin .../EggTest-0.0.1-py2.7.egg/eggtest/main.py | 0 .../EggTest-0.0.1-py2.7.egg/eggtest/main.pyc | Bin .../site-packages/EggTest.egg-info/PKG-INFO | 0 .../EggTest.egg-info/SOURCES.txt | 0 .../EggTest.egg-info/dependency_links.txt | 0 .../EggTest.egg-info/top_level.txt | 0 .../python/site-packages/django/__init__.py | 0 .../python/site-packages/django/shortcuts.py | 0 .../ruby/vulnerable/gems/rails-4.1.15/Gemfile | 0 .../vulnerable/gems/rails-4.1.15/Gemfile.lock | 0 .../bundle/ruby/2.2.0/gems/pg-0.18.4/Rakefile | 0 .../2.2.0/specifications/dalli-2.7.5.gemspec | 0 .../ruby/vulnerable/gems/sinatra/Gemfile | 0 .../ruby/vulnerable/gems/sinatra/Gemfile.lock | 0 ...cord-oracle_enhanced-adapter-1.1.7.gemspec | 0 .../gems/specifications/i18n-0.7.0.gemspec | 0 .../gems/specifications/mail-2.4.3.gemspec | 0 .../specifications/mime-types-1.25.1.gemspec | 0 .../gems/specifications/netrc-0.10.3.gemspec | 0 .../specifications/polyglot-0.3.5.gemspec | 0 .../specifications/rest-client-1.7.2.gemspec | 0 .../specifications/treetop-1.4.15.gemspec | 0 .../test/resources/stagedhttp-modified.tar | Bin .../src/test/resources/struts.zip | Bin .../src/test/resources/suppressions.xml | 0 .../test/resources/swift/Gloss/Gloss.podspec | 0 .../test/resources/swift/Gloss/Package.swift | 0 .../swift/cocoapods/EasyPeasy.podspec | 0 .../src/test/resources/test.properties | 0 .../src/test/resources/test.zip | Bin .../resources/textFileWithJarExtension.jar | 0 .../src/test/resources/uber-1.0-SNAPSHOT.jar | Bin {dependency-check-maven => maven}/LICENSE.txt | 0 {dependency-check-maven => maven}/NOTICE.txt | 0 {dependency-check-maven => maven}/README.md | 0 {dependency-check-maven => maven}/pom.xml | 0 .../invoker.properties | 0 .../module-java/pom.xml | 0 .../module-web/pom.xml | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../it/617-hierarchical-cross-deps/pom.xml | 0 .../postbuild.groovy | 0 .../618-aggregator-purge/invoker.properties | 0 .../it/618-aggregator-purge/module/pom.xml | 0 .../src/it/618-aggregator-purge/pom.xml | 0 .../it/618-aggregator-purge/postbuild.groovy | 0 .../invoker.properties | 0 .../618-aggregator-update-only/module/pom.xml | 0 .../src/it/618-aggregator-update-only/pom.xml | 0 .../postbuild.groovy | 0 .../629-jackson-dataformat/invoker.properties | 0 .../src/it/629-jackson-dataformat/pom.xml | 0 .../629-jackson-dataformat/postbuild.groovy | 0 .../src/it/690-threadsafety/first-a/pom.xml | 0 .../src/it/690-threadsafety/first-b/pom.xml | 0 .../src/it/690-threadsafety/first/pom.xml | 0 .../src/it/690-threadsafety/fourth-a/pom.xml | 0 .../fourth-a/src/main/webapp/WEB-INF/web.xml | 0 .../src/it/690-threadsafety/fourth-b/pom.xml | 0 .../fourth-b/src/main/webapp/WEB-INF/web.xml | 0 .../src/it/690-threadsafety/fourth/pom.xml | 0 .../fourth/src/main/webapp/WEB-INF/web.xml | 0 .../it/690-threadsafety/invoker.properties | 0 .../src/it/690-threadsafety/pom.xml | 0 .../src/it/690-threadsafety/postbuild.groovy | 0 .../src/it/690-threadsafety/second-a/pom.xml | 0 .../second-a/src/main/webapp/WEB-INF/web.xml | 0 .../src/it/690-threadsafety/second-b/pom.xml | 0 .../second-b/src/main/webapp/WEB-INF/web.xml | 0 .../src/it/690-threadsafety/second/pom.xml | 0 .../second/src/main/webapp/WEB-INF/web.xml | 0 .../src/it/690-threadsafety/third-a/pom.xml | 0 .../third-a/src/main/webapp/WEB-INF/web.xml | 0 .../src/it/690-threadsafety/third-b/pom.xml | 0 .../third-b/src/main/webapp/WEB-INF/web.xml | 0 .../src/it/690-threadsafety/third/pom.xml | 0 .../third/src/main/webapp/WEB-INF/web.xml | 0 .../it/710-pom-parse-error/invoker.properties | 0 .../src/it/710-pom-parse-error/pom.xml | 0 .../it/710-pom-parse-error/postbuild.groovy | 0 .../invoker.properties | 0 .../src/it/729-system-scope-resolved/pom.xml | 0 .../postbuild.groovy | 0 .../invoker.properties | 0 .../src/it/729-system-scope-skipped/pom.xml | 0 .../729-system-scope-skipped/postbuild.groovy | 0 .../invoker.properties | 0 .../pom.xml | 0 .../postbuild.groovy | 0 .../test-suppression1.xml | 0 .../test-suppression2.xml | 0 .../invoker.properties | 0 .../it/730-multiple-suppression-files/pom.xml | 0 .../postbuild.groovy | 0 .../test-suppression1.xml | 0 .../test-suppression2.xml | 0 .../broken-suppression.xml | 0 .../invoker.properties | 0 .../815-broken-suppression-aggregate/pom.xml | 0 .../src/it/846-site-plugin/invoker.properties | 0 .../src/it/846-site-plugin/pom.xml | 0 .../src/it/false-positives/invoker.properties | 0 .../src/it/false-positives/pom.xml | 0 .../src/it/false-positives/postbuild.groovy | 0 .../dependencycheck/maven/AggregateMojo.java | 0 .../maven/ArtifactScopeExcluded.java | 0 .../maven/ArtifactTypeExcluded.java | 0 .../maven/BaseDependencyCheckMojo.java | 0 .../dependencycheck/maven/CheckMojo.java | 0 .../dependencycheck/maven/PurgeMojo.java | 0 .../dependencycheck/maven/UpdateMojo.java | 0 .../dependencycheck/maven/package-info.java | 0 .../META-INF/licenses/maven/LICENSE.txt | 0 .../src/main/resources/mojo.properties | 0 .../src/site/markdown/configuration.md | 0 .../src/site/markdown/index.md.vm | 0 .../src/site/resources/images/dc-maven.svg | 0 .../src/site/site.xml | 0 .../maven/ArtifactScopeExcludedTest.java | 0 .../maven/ArtifactTypeExcludedTest.java | 0 .../maven/BaseDependencyCheckMojoTest.java | 0 .../owasp/dependencycheck/maven/BaseTest.java | 0 .../src/test/resources/mojo.properties | 0 .../src/test/resources/sample.xml | 0 pom.xml | 34 ++++++++++++++---- {dependency-check-utils => utils}/pom.xml | 0 .../owasp/dependencycheck/utils/Checksum.java | 0 .../utils/DownloadFailedException.java | 0 .../dependencycheck/utils/Downloader.java | 0 .../utils/ExpectedObjectInputStream.java | 0 .../utils/ExtractionException.java | 0 .../dependencycheck/utils/FileUtils.java | 0 .../utils/InvalidSettingException.java | 0 .../utils/SSLSocketFactoryEx.java | 0 .../owasp/dependencycheck/utils/Settings.java | 0 .../utils/URLConnectionFactory.java | 0 .../utils/URLConnectionFailureException.java | 0 .../owasp/dependencycheck/utils/XmlUtils.java | 0 .../dependencycheck/utils/package-info.java | 0 .../src/site/markdown/index.md | 0 .../src/site/resources/images/dc-utils.svg | 0 .../src/site/site.xml | 0 .../owasp/dependencycheck/utils/BaseTest.java | 0 .../dependencycheck/utils/ChecksumTest.java | 0 .../dependencycheck/utils/DownloaderIT.java | 0 .../dependencycheck/utils/DownloaderTest.java | 0 .../utils/ExpectedObjectInputStreamTest.java | 0 .../dependencycheck/utils/FileUtilsTest.java | 0 .../dependencycheck/utils/SettingsTest.java | 0 .../dependencycheck/utils/SimplePojo.java | 0 .../src/test/resources/checkSumTest.file | 0 .../test/resources/dependencycheck.properties | 0 .../src/test/resources/logback-test.xml | 0 .../src/test/resources/test.properties | 0 740 files changed, 40 insertions(+), 12 deletions(-) rename {dependency-check-ant => ant}/LICENSE.txt (100%) rename {dependency-check-ant => ant}/NOTICE.txt (100%) rename {dependency-check-ant => ant}/README.md (100%) rename {dependency-check-ant => ant}/pom.xml (100%) rename {dependency-check-ant => ant}/src/main/assembly/release.xml (100%) rename {dependency-check-ant => ant}/src/main/java/org/owasp/dependencycheck/ant/logging/AntLoggerAdapter.java (100%) rename {dependency-check-ant => ant}/src/main/java/org/owasp/dependencycheck/ant/logging/AntLoggerFactory.java (100%) rename {dependency-check-ant => ant}/src/main/java/org/owasp/dependencycheck/ant/logging/package-info.java (100%) rename {dependency-check-ant => ant}/src/main/java/org/owasp/dependencycheck/taskdefs/Check.java (100%) rename {dependency-check-ant => ant}/src/main/java/org/owasp/dependencycheck/taskdefs/Purge.java (100%) rename {dependency-check-ant => ant}/src/main/java/org/owasp/dependencycheck/taskdefs/SuppressionFile.java (100%) rename {dependency-check-ant => ant}/src/main/java/org/owasp/dependencycheck/taskdefs/Update.java (100%) rename {dependency-check-ant => ant}/src/main/java/org/owasp/dependencycheck/taskdefs/package-info.java (100%) rename {dependency-check-ant => ant}/src/main/java/org/slf4j/impl/StaticLoggerBinder.java (100%) rename {dependency-check-ant => ant}/src/main/java/org/slf4j/impl/package-info.java (100%) rename {dependency-check-ant => ant}/src/main/resources/META-INF/licenses/ant/LICENSE.txt (100%) rename {dependency-check-ant => ant}/src/main/resources/dependency-check-taskdefs.properties (100%) rename {dependency-check-ant => ant}/src/main/resources/task.properties (100%) rename {dependency-check-ant => ant}/src/site/markdown/config-purge.md (100%) rename {dependency-check-ant => ant}/src/site/markdown/config-update.md (100%) rename {dependency-check-ant => ant}/src/site/markdown/configuration.md (100%) rename {dependency-check-ant => ant}/src/site/markdown/index.md.vm (100%) rename {dependency-check-ant => ant}/src/site/resources/images/dc-ant.svg (100%) rename {dependency-check-ant => ant}/src/site/site.xml (100%) rename {dependency-check-ant => ant}/src/test/java/org/owasp/dependencycheck/taskdefs/DependencyCheckTaskTest.java (100%) rename {dependency-check-ant => ant}/src/test/resources/build.xml (100%) rename {dependency-check-ant => ant}/src/test/resources/test-suppression.xml (100%) rename {dependency-check-ant => ant}/src/test/resources/test-suppression1.xml (100%) rename {dependency-check-ant => ant}/src/test/resources/test-suppression2.xml (100%) rename {dependency-check-plugin => archetype}/pom.xml (100%) rename {dependency-check-plugin => archetype}/src/main/resources/META-INF/maven/archetype-metadata.xml (100%) rename {dependency-check-plugin => archetype}/src/main/resources/archetype-resources/pom.xml (100%) rename {dependency-check-plugin => archetype}/src/main/resources/archetype-resources/src/main/java/__analyzerName__.java (100%) rename {dependency-check-plugin => archetype}/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.owasp.dependencycheck.analyzer.Analyzer (100%) rename {dependency-check-plugin => archetype}/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.owasp.dependencycheck.data.update.CachedWebDataSource (100%) rename {dependency-check-plugin => archetype}/src/main/resources/archetype-resources/src/test/java/__analyzerName__Test.java (100%) rename {dependency-check-plugin => archetype}/src/main/resources/archetype-resources/src/test/resources/test.file (100%) rename {dependency-check-plugin => archetype}/src/site/markdown/index.md.vm (100%) rename {dependency-check-plugin => archetype}/src/site/resources/images/dc.svg (100%) rename {dependency-check-plugin => archetype}/src/site/site.xml (100%) rename {dependency-check-cli => cli}/LICENSE.txt (100%) rename {dependency-check-cli => cli}/NOTICE.txt (100%) rename {dependency-check-cli => cli}/README.md (100%) rename {dependency-check-cli => cli}/pom.xml (100%) rename {dependency-check-cli => cli}/src/main/assembly/license.txt (100%) rename {dependency-check-cli => cli}/src/main/assembly/release.xml (100%) rename {dependency-check-cli => cli}/src/main/java/org/owasp/dependencycheck/App.java (100%) rename {dependency-check-cli => cli}/src/main/java/org/owasp/dependencycheck/CliParser.java (100%) rename {dependency-check-cli => cli}/src/main/java/org/owasp/dependencycheck/InvalidScanPathException.java (100%) rename {dependency-check-cli => cli}/src/main/java/org/owasp/dependencycheck/package-info.java (100%) rename {dependency-check-cli => cli}/src/main/resources/META-INF/licenses/commons-cli/LICENSE.txt (100%) rename {dependency-check-cli => cli}/src/main/resources/logback.xml (100%) rename {dependency-check-cli => cli}/src/site/markdown/arguments.md (100%) rename {dependency-check-cli => cli}/src/site/markdown/index.md.vm (100%) rename {dependency-check-cli => cli}/src/site/resources/images/dc-cli.svg (100%) rename {dependency-check-cli => cli}/src/site/site.xml (100%) rename {dependency-check-cli => cli}/src/test/java/org/owasp/dependencycheck/AppTest.java (100%) rename {dependency-check-cli => cli}/src/test/java/org/owasp/dependencycheck/BaseTest.java (100%) rename {dependency-check-cli => cli}/src/test/java/org/owasp/dependencycheck/CliParserTest.java (100%) rename {dependency-check-cli => cli}/src/test/resources/checkSumTest.file (100%) rename {dependency-check-cli => cli}/src/test/resources/sample.properties (100%) rename {dependency-check-cli => cli}/src/test/resources/sample2.properties (100%) rename {dependency-check-core => core}/LICENSE.txt (100%) rename {dependency-check-core => core}/NOTICE.txt (100%) rename {dependency-check-core => core}/README.md (100%) rename {dependency-check-core => core}/pom.xml (99%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/AnalysisTask.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/Engine.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/agent/DependencyCheckScanAgent.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/agent/package-info.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/AbstractAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/AbstractDependencyComparingAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/AbstractFileTypeAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/AbstractNpmAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/AnalysisPhase.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/Analyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/AnalyzerService.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/AutoconfAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/CMakeAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/CPEAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/CentralAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/CocoaPodsAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/ComposerLockAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/CpeSuppressionAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/DependencyMergingAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/Experimental.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/FileNameAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/FileTypeAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/HintAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/NexusAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/NodePackageAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/NspAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/NuspecAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/NvdCveAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/OpenSSLAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/PythonDistributionAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/PythonPackageAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/Retired.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/RubyBundlerAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/RubyGemspecAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/SwiftPackageManagerAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/VersionFilterAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/exception/AnalysisException.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/exception/ArchiveExtractionException.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/exception/package-info.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/analyzer/package-info.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/central/CentralSearch.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/central/package-info.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/composer/ComposerDependency.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/composer/ComposerException.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/composer/ComposerLockParser.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/composer/package-info.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/cpe/CpeMemoryIndex.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/cpe/Fields.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/cpe/IndexEntry.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/cpe/IndexException.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/cpe/package-info.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/cwe/CweDB.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/cwe/CweHandler.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/cwe/package-info.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/lucene/AbstractTokenizingFilter.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/lucene/AlphaNumericFilter.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/lucene/AlphaNumericTokenizer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/lucene/DependencySimilarity.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/lucene/LuceneUtils.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/lucene/SearchFieldAnalyzer.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilter.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/lucene/UrlTokenizingFilter.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/lucene/package-info.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/nexus/MavenArtifact.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/nexus/NexusSearch.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/nexus/package-info.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/nsp/Advisory.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/nsp/NspSearch.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/nsp/SanitizePackage.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/nsp/package-info.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/nuget/NugetPackage.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/nuget/NuspecParseException.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/nuget/NuspecParser.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/nuget/XPathNuspecParser.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/nuget/package-info.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/nvdcve/CorruptDatabaseException.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseException.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverLoadException.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverLoader.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverShim.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/nvdcve/package-info.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/update/CachedWebDataSource.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/update/CpeUpdater.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/update/EngineVersionCheck.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/update/NvdCveUpdater.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/update/UpdateService.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/update/cpe/CPEHandler.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/update/cpe/Cpe.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/update/cpe/package-info.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/update/exception/InvalidDataException.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/update/exception/UpdateException.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/update/exception/package-info.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/update/nvd/DownloadTask.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/update/nvd/NvdCve12Handler.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/update/nvd/NvdCve20Handler.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/update/nvd/NvdCveInfo.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/update/nvd/ProcessTask.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/update/nvd/UpdateableNvdCve.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/update/nvd/package-info.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/data/update/package-info.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/dependency/Confidence.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/dependency/Dependency.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/dependency/Evidence.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/dependency/EvidenceCollection.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/dependency/EvidenceType.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/dependency/Identifier.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/dependency/Reference.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/dependency/Vulnerability.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/dependency/VulnerableSoftware.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/dependency/package-info.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/exception/DependencyNotFoundException.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/exception/ExceptionCollection.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/exception/H2DBLockException.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/exception/InitializationException.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/exception/NoDataException.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/exception/ReportException.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/exception/ScanAgentException.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/exception/package-info.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/package-info.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/reporting/EscapeTool.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/reporting/ReportGenerator.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/reporting/VelocityLoggerRedirect.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/reporting/package-info.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/utils/DBUtils.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/utils/DateUtil.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/utils/DependencyVersion.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/utils/DependencyVersionUtil.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/utils/ExtractionUtil.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/utils/FileFilterBuilder.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/utils/Filter.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/utils/H2DBCleanupHook.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/utils/H2DBLock.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/utils/H2DBShutdownHook.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/utils/H2DBShutdownHookFactory.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/utils/Pair.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/utils/UrlStringUtils.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/utils/package-info.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/xml/XmlEntity.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/xml/XmlInputStream.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/xml/hints/EvidenceMatcher.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/xml/hints/HintErrorHandler.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/xml/hints/HintHandler.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/xml/hints/HintParseException.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/xml/hints/HintParser.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/xml/hints/HintRule.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/xml/hints/VendorDuplicatingHintRule.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/xml/hints/package-info.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/xml/package-info.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/xml/pom/License.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/xml/pom/Model.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/xml/pom/PomHandler.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/xml/pom/PomParseException.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/xml/pom/PomParser.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/xml/pom/PomUtils.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/xml/pom/package-info.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/xml/suppression/PropertyType.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionErrorHandler.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionHandler.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionParseException.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionParser.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionRule.java (100%) rename {dependency-check-core => core}/src/main/java/org/owasp/dependencycheck/xml/suppression/package-info.java (100%) rename {dependency-check-core => core}/src/main/resources/GrokAssembly.exe (100%) rename {dependency-check-core => core}/src/main/resources/GrokAssembly.exe.config (100%) rename {dependency-check-core => core}/src/main/resources/META-INF/licenses/StupidTablePlugin/LICENSE.txt (100%) rename {dependency-check-core => core}/src/main/resources/META-INF/licenses/commons-compress/LICENSE.txt (100%) rename {dependency-check-core => core}/src/main/resources/META-INF/licenses/commons-io/LICENSE.txt (100%) rename {dependency-check-core => core}/src/main/resources/META-INF/licenses/cve/license.txt (100%) rename {dependency-check-core => core}/src/main/resources/META-INF/licenses/cwe/license.txt (100%) rename {dependency-check-core => core}/src/main/resources/META-INF/licenses/h2database/license.txt (100%) rename {dependency-check-core => core}/src/main/resources/META-INF/licenses/h2database/readme.txt (100%) rename {dependency-check-core => core}/src/main/resources/META-INF/licenses/jquery/MIT-LICENSE.txt (100%) rename {dependency-check-core => core}/src/main/resources/META-INF/licenses/jsoup/LICENSE.txt (100%) rename {dependency-check-core => core}/src/main/resources/META-INF/licenses/lucene/LICENSE.txt (100%) rename {dependency-check-core => core}/src/main/resources/META-INF/licenses/velocity/LICENSE.txt (100%) rename {dependency-check-core => core}/src/main/resources/META-INF/services/org.owasp.dependencycheck.analyzer.Analyzer (100%) rename {dependency-check-core => core}/src/main/resources/META-INF/services/org.owasp.dependencycheck.data.update.CachedWebDataSource (100%) rename {dependency-check-core => core}/src/main/resources/data/cwe.hashmap.serialized (100%) rename {dependency-check-core => core}/src/main/resources/data/dbStatements.properties (100%) rename {dependency-check-core => core}/src/main/resources/data/dbStatements_h2.properties (100%) rename {dependency-check-core => core}/src/main/resources/data/dbStatements_mysql.properties (100%) rename {dependency-check-core => core}/src/main/resources/data/dbStatements_oracle.properties (100%) rename {dependency-check-core => core}/src/main/resources/data/dbStatements_postgresql.properties (100%) rename {dependency-check-core => core}/src/main/resources/data/initialize.sql (100%) rename {dependency-check-core => core}/src/main/resources/data/initialize_mssql.sql (100%) rename {dependency-check-core => core}/src/main/resources/data/initialize_mysql.sql (100%) rename {dependency-check-core => core}/src/main/resources/data/initialize_oracle.sql (100%) rename {dependency-check-core => core}/src/main/resources/data/initialize_postgres.sql (100%) rename {dependency-check-core => core}/src/main/resources/data/upgrade_2.9.sql (100%) rename {dependency-check-core => core}/src/main/resources/data/upgrade_3.0.sql (100%) rename {dependency-check-core => core}/src/main/resources/data/upgrade_mysql_2.9.sql (100%) rename {dependency-check-core => core}/src/main/resources/dependencycheck-base-hint.xml (100%) rename {dependency-check-core => core}/src/main/resources/dependencycheck-base-suppression.xml (100%) rename {dependency-check-core => core}/src/main/resources/dependencycheck.properties (100%) rename {dependency-check-core => core}/src/main/resources/schema/cpe/cpe-dictionary_2.2.xsd (100%) rename {dependency-check-core => core}/src/main/resources/schema/dependency-check.1.3.xsd (100%) rename {dependency-check-core => core}/src/main/resources/schema/dependency-check.1.4.xsd (100%) rename {dependency-check-core => core}/src/main/resources/schema/dependency-check.1.5.xsd (100%) rename {dependency-check-core => core}/src/main/resources/schema/dependency-check.1.6.xsd (100%) rename {dependency-check-core => core}/src/main/resources/schema/dependency-hint.1.0.xsd (100%) rename {dependency-check-core => core}/src/main/resources/schema/dependency-hint.1.1.xsd (100%) rename {dependency-check-core => core}/src/main/resources/schema/dependency-hint.1.2.xsd (100%) rename {dependency-check-core => core}/src/main/resources/schema/dependency-hint.1.3.xsd (100%) rename {dependency-check-core => core}/src/main/resources/schema/dependency-suppression.1.1.xsd (100%) rename {dependency-check-core => core}/src/main/resources/schema/nvdcve/1_2/nvdcve.xsd (100%) rename {dependency-check-core => core}/src/main/resources/schema/nvdcve/2_0/cce_0.1.xsd (100%) rename {dependency-check-core => core}/src/main/resources/schema/nvdcve/2_0/cpe-language_2.1.xsd (100%) rename {dependency-check-core => core}/src/main/resources/schema/nvdcve/2_0/cve_0.1.xsd (100%) rename {dependency-check-core => core}/src/main/resources/schema/nvdcve/2_0/cvss-v2_0.2.xsd (100%) rename {dependency-check-core => core}/src/main/resources/schema/nvdcve/2_0/nvd-cve-feed_2.0.xsd (100%) rename {dependency-check-core => core}/src/main/resources/schema/nvdcve/2_0/patch_0.1.xsd (100%) rename {dependency-check-core => core}/src/main/resources/schema/nvdcve/2_0/scap-core_0.1.xsd (100%) rename {dependency-check-core => core}/src/main/resources/schema/nvdcve/2_0/vulnerability_0.4.xsd (100%) rename {dependency-check-core => core}/src/main/resources/schema/pom/generateBindings.bat (100%) rename {dependency-check-core => core}/src/main/resources/schema/pom/generateBindings.sh (100%) rename {dependency-check-core => core}/src/main/resources/schema/pom/maven-v4_0_0.xsd (100%) rename {dependency-check-core => core}/src/main/resources/schema/suppression.xsd (100%) rename {dependency-check-core => core}/src/main/resources/templates/csvReport.vsl (100%) rename {dependency-check-core => core}/src/main/resources/templates/htmlReport.vsl (100%) rename {dependency-check-core => core}/src/main/resources/templates/img/minus.gif (100%) rename {dependency-check-core => core}/src/main/resources/templates/img/plus.gif (100%) rename {dependency-check-core => core}/src/main/resources/templates/jsonReport.vsl (100%) rename {dependency-check-core => core}/src/main/resources/templates/scripts/jquery-1.8.0.min.js (100%) rename {dependency-check-core => core}/src/main/resources/templates/vulnReport.vsl (100%) rename {dependency-check-core => core}/src/main/resources/templates/xmlReport.vsl (100%) rename {dependency-check-core => core}/src/site/markdown/index.md (100%) rename {dependency-check-core => core}/src/site/resources/images/dc-core.svg (100%) rename {dependency-check-core => core}/src/site/site.xml (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/AnalysisTaskTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/BaseDBTestCase.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/BaseTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/EngineIT.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/EngineModeIT.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/EngineTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/AbstractFileTypeAnalyzerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/AnalyzerServiceTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerIT.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/AutoconfAnalyzerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/CMakeAnalyzerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerIT.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/CentralAnalyzerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/ComposerLockAnalyzerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzerIT.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/FileNameAnalyzerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/HintAnalyzerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/JarAnalyzerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/NodePackageAnalyzerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/NspAnalyzerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/NuspecAnalyzerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/OpenSSLAnalyzerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/PythonDistributionAnalyzerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/PythonPackageAnalyzerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzerIT.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/RubyBundlerAnalyzerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/RubyGemspecAnalyzerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/SwiftAnalyzersTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/VersionFilterAnalyzerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerIT.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/data/central/CentralSearchTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/data/composer/ComposerLockParserTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/data/cpe/IndexEntryTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/data/cwe/CweDBTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/data/lucene/AlphaNumericFilterTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/data/lucene/FieldAnalyzerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/data/lucene/LuceneUtilsTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/data/lucene/SearchFieldAnalyzerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilterTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/data/lucene/UrlTokenizingFilterTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/data/nexus/NexusSearchTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/data/nsp/NspSearchTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/data/nsp/SanitizePackageTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/data/nuget/XPathNuspecParserTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactoryTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIT.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBMySqlIT.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesIT.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/data/nvdcve/DriverLoaderTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/data/update/EngineVersionCheckTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/data/update/NvdCveUpdaterIT.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/data/update/nvd/DownloadTaskTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/data/update/nvd/NvdCveInfoTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/data/update/nvd/NvdCve_1_2_HandlerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/data/update/nvd/NvdCve_2_0_HandlerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/data/update/nvd/UpdateableNvdCveTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/dependency/DependencyTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/dependency/EvidenceTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/dependency/VulnerabilityTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/dependency/VulnerableSoftwareTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/reporting/EscapeToolTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorIT.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/utils/DateUtilTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/utils/DependencyVersionTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/utils/DependencyVersionUtilTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/utils/FilterTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/utils/UrlStringUtilsTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/xml/XmlEntityTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/xml/XmlInputStreamTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/xml/hints/EvidenceMatcherTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/xml/hints/HintHandlerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/xml/hints/HintParserTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/xml/pom/ModelTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/xml/pom/PomUtilsTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/xml/suppression/PropertyTypeTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/xml/suppression/SuppressionHandlerTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/xml/suppression/SuppressionParserTest.java (100%) rename {dependency-check-core => core}/src/test/java/org/owasp/dependencycheck/xml/suppression/SuppressionRuleTest.java (100%) rename {dependency-check-core => core}/src/test/resources/._avro-ipc-1.5.0.jar (100%) rename {dependency-check-core => core}/src/test/resources/FileHelpers.2.0.0.0.nupkg (100%) rename {dependency-check-core => core}/src/test/resources/MANIFEST.MF (100%) rename {dependency-check-core => core}/src/test/resources/autoconf/binutils/config.in (100%) rename {dependency-check-core => core}/src/test/resources/autoconf/binutils/configure (100%) rename {dependency-check-core => core}/src/test/resources/autoconf/binutils/configure.ac (100%) rename {dependency-check-core => core}/src/test/resources/autoconf/ghostscript/configure.ac (100%) rename {dependency-check-core => core}/src/test/resources/autoconf/readable-code/configure (100%) rename {dependency-check-core => core}/src/test/resources/autoconf/readable-code/configure.ac (100%) rename {dependency-check-core => core}/src/test/resources/avro-ipc-1.5.0.jar (100%) rename {dependency-check-core => core}/src/test/resources/bootable-0.1.0.jar (100%) rename {dependency-check-core => core}/src/test/resources/cmake/README.md (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/3rdparty/ffmpeg/ffmpeg_version.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/CMakeLists.txt (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/LICENSE (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/FindCUDA.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/FindCUDA/make2cmake.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/FindCUDA/parse_cubin.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/FindCUDA/run_nvcc.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVCRTLinkage.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVCompilerOptions.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVConfig.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVDetectAndroidSDK.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVDetectApacheAnt.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVDetectCStripes.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVDetectCUDA.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVDetectCXXCompiler.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVDetectDirectX.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVDetectOpenCL.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVDetectPython.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVDetectTBB.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVDetectVTK.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVExtraTargets.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVFindIPP.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVFindIPPAsync.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVFindIntelPerCSDK.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVFindLATEX.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVFindLibsGUI.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVFindLibsGrfmt.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVFindLibsPerf.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVFindLibsVideo.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVFindMatlab.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVFindOpenEXR.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVFindOpenNI.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVFindOpenNI2.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVFindWebP.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVFindXimea.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVGenABI.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVGenAndroidMK.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVGenConfig.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVGenHeaders.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVGenInfoPlist.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVGenPkgconfig.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVMinDepVersions.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVModule.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVPCHSupport.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVPackaging.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVUtils.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/OpenCVVersion.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/checks/OpenCVDetectCudaArch.cu (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/checks/directx.cpp (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/checks/opencl.cpp (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/checks/vfwtest.cpp (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/checks/win32uitest.cpp (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/cl2cpp.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/copyAndroidLibs.cmake (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/templates/OpenCV.mk.in (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/templates/OpenCVConfig-version.cmake.in (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/templates/OpenCVConfig.cmake.in (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/templates/cmake_uninstall.cmake.in (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/templates/cvconfig.h.in (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/templates/opencv-XXX.pc.in (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/templates/opencv_abi.xml.in (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/templates/opencv_modules.hpp.in (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/templates/opencv_run_all_tests_android.sh.in (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/templates/opencv_run_all_tests_unix.sh.in (100%) rename {dependency-check-core => core}/src/test/resources/cmake/opencv/cmake/templates/opencv_run_all_tests_windows.cmd.in (100%) rename {dependency-check-core => core}/src/test/resources/cmake/zlib/CMakeLists.txt (100%) rename {dependency-check-core => core}/src/test/resources/cmake/zlib/README (100%) rename {dependency-check-core => core}/src/test/resources/commons-fileupload-1.2.1.suppression.xml (100%) rename {dependency-check-core => core}/src/test/resources/composer.lock (100%) rename {dependency-check-core => core}/src/test/resources/cve-1.2-2008_4411.xml (100%) rename {dependency-check-core => core}/src/test/resources/cve-2.0-2008_4411.xml (100%) rename {dependency-check-core => core}/src/test/resources/dependencycheck.properties (100%) rename {dependency-check-core => core}/src/test/resources/dwr-pom.xml (100%) rename {dependency-check-core => core}/src/test/resources/dwr.jar (100%) rename {dependency-check-core => core}/src/test/resources/file.tar (100%) rename {dependency-check-core => core}/src/test/resources/file.tar.bz2 (100%) rename {dependency-check-core => core}/src/test/resources/file.tar.gz (100%) rename {dependency-check-core => core}/src/test/resources/file.tbz2 (100%) rename {dependency-check-core => core}/src/test/resources/file.tgz (100%) rename {dependency-check-core => core}/src/test/resources/hibernate3.jar (100%) rename {dependency-check-core => core}/src/test/resources/hints.xml (100%) rename {dependency-check-core => core}/src/test/resources/hints_12.xml (100%) rename {dependency-check-core => core}/src/test/resources/hints_13.xml (100%) rename {dependency-check-core => core}/src/test/resources/hints_invalid.xml (100%) rename {dependency-check-core => core}/src/test/resources/incorrectSuppressions.xml (100%) rename {dependency-check-core => core}/src/test/resources/jmockit-1.26.pom (100%) rename {dependency-check-core => core}/src/test/resources/log4net.2.0.3.nuspec (100%) rename {dependency-check-core => core}/src/test/resources/log4net.dll (100%) rename {dependency-check-core => core}/src/test/resources/logback-test.xml (100%) rename {dependency-check-core => core}/src/test/resources/mysql-connector-java-5.1.27-bin.jar (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/.jshintrc (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/.npmignore (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/.travis.yml (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/LICENSE (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/Makefile (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/README.md (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/index.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/lib/dns-sync.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/.bin/shjs (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/debug/Readme.md (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/debug/debug.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/debug/index.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/debug/lib/debug.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/debug/package.json (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/.documentup.json (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/.jshintrc (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/.npmignore (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/.travis.yml (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/LICENSE (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/README.md (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/bin/shjs (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/global.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/make.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/package.json (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/scripts/generate-docs.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/scripts/run-tests.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/shell.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/cat.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/cd.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/chmod.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/common.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/cp.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/dirs.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/echo.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/error.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/exec.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/find.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/grep.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/ls.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/mkdir.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/mv.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/popd.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/pushd.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/pwd.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/rm.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/sed.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/tempdir.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/test.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/to.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/toEnd.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/which.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/package.json (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/scripts/dns-lookup-script.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/node_modules/dns-sync/test/test.js (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/npm-shrinkwrap.json (100%) rename {dependency-check-core => core}/src/test/resources/nodejs/package-lock.json (100%) rename {dependency-check-core => core}/src/test/resources/nsp/empty.json (100%) rename {dependency-check-core => core}/src/test/resources/nsp/minimal-invalid.json (100%) rename {dependency-check-core => core}/src/test/resources/nsp/package.json (100%) rename {dependency-check-core => core}/src/test/resources/nuspec/test.nuspec (100%) rename {dependency-check-core => core}/src/test/resources/nvdcve-2.0-2012.xml (100%) rename {dependency-check-core => core}/src/test/resources/nvdcve-2.0-2014.xml (100%) rename {dependency-check-core => core}/src/test/resources/nvdcve-2.0-modified.xml (100%) rename {dependency-check-core => core}/src/test/resources/nvdcve-2012.xml (100%) rename {dependency-check-core => core}/src/test/resources/nvdcve-2014.xml (100%) rename {dependency-check-core => core}/src/test/resources/nvdcve-modified.xml (100%) rename {dependency-check-core => core}/src/test/resources/openssl/opensslv.h (100%) rename {dependency-check-core => core}/src/test/resources/other-suppressions.xml (100%) rename {dependency-check-core => core}/src/test/resources/python/Django-1.7.2-py2.py3-none-any.whl (100%) rename {dependency-check-core => core}/src/test/resources/python/dist/EggTest-0.0.1-py2.7.egg (100%) rename {dependency-check-core => core}/src/test/resources/python/dist/EggTest-0.0.1-py2.7.zip (100%) rename {dependency-check-core => core}/src/test/resources/python/eggtest/__about__.py (100%) rename {dependency-check-core => core}/src/test/resources/python/eggtest/__init__.py (100%) rename {dependency-check-core => core}/src/test/resources/python/eggtest/__init__.pyc (100%) rename {dependency-check-core => core}/src/test/resources/python/eggtest/main.py (100%) rename {dependency-check-core => core}/src/test/resources/python/eggtest/main.pyc (100%) rename {dependency-check-core => core}/src/test/resources/python/setup.py (100%) rename {dependency-check-core => core}/src/test/resources/python/site-packages/Django-1.7.2.data/scripts/django-admin.py (100%) rename {dependency-check-core => core}/src/test/resources/python/site-packages/Django-1.7.2.dist-info/DESCRIPTION.rst (100%) rename {dependency-check-core => core}/src/test/resources/python/site-packages/Django-1.7.2.dist-info/LICENSE.txt (100%) rename {dependency-check-core => core}/src/test/resources/python/site-packages/Django-1.7.2.dist-info/METADATA (100%) rename {dependency-check-core => core}/src/test/resources/python/site-packages/Django-1.7.2.dist-info/WHEEL (100%) rename {dependency-check-core => core}/src/test/resources/python/site-packages/Django-1.7.2.dist-info/entry_points.txt (100%) rename {dependency-check-core => core}/src/test/resources/python/site-packages/Django-1.7.2.dist-info/metadata.json (100%) rename {dependency-check-core => core}/src/test/resources/python/site-packages/Django-1.7.2.dist-info/top_level.txt (100%) rename {dependency-check-core => core}/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/EGG-INFO/PKG-INFO (100%) rename {dependency-check-core => core}/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/EGG-INFO/SOURCES.txt (100%) rename {dependency-check-core => core}/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/EGG-INFO/dependency_links.txt (100%) rename {dependency-check-core => core}/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/EGG-INFO/top_level.txt (100%) rename {dependency-check-core => core}/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/EGG-INFO/zip-safe (100%) rename {dependency-check-core => core}/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/__about__.py (100%) rename {dependency-check-core => core}/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/__about__.pyc (100%) rename {dependency-check-core => core}/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/__init__.py (100%) rename {dependency-check-core => core}/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/__init__.pyc (100%) rename {dependency-check-core => core}/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/main.py (100%) rename {dependency-check-core => core}/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/main.pyc (100%) rename {dependency-check-core => core}/src/test/resources/python/site-packages/EggTest.egg-info/PKG-INFO (100%) rename {dependency-check-core => core}/src/test/resources/python/site-packages/EggTest.egg-info/SOURCES.txt (100%) rename {dependency-check-core => core}/src/test/resources/python/site-packages/EggTest.egg-info/dependency_links.txt (100%) rename {dependency-check-core => core}/src/test/resources/python/site-packages/EggTest.egg-info/top_level.txt (100%) rename {dependency-check-core => core}/src/test/resources/python/site-packages/django/__init__.py (100%) rename {dependency-check-core => core}/src/test/resources/python/site-packages/django/shortcuts.py (100%) rename {dependency-check-core => core}/src/test/resources/ruby/vulnerable/gems/rails-4.1.15/Gemfile (100%) rename {dependency-check-core => core}/src/test/resources/ruby/vulnerable/gems/rails-4.1.15/Gemfile.lock (100%) rename {dependency-check-core => core}/src/test/resources/ruby/vulnerable/gems/rails-4.1.15/vendor/bundle/ruby/2.2.0/gems/pg-0.18.4/Rakefile (100%) rename {dependency-check-core => core}/src/test/resources/ruby/vulnerable/gems/rails-4.1.15/vendor/bundle/ruby/2.2.0/specifications/dalli-2.7.5.gemspec (100%) rename {dependency-check-core => core}/src/test/resources/ruby/vulnerable/gems/sinatra/Gemfile (100%) rename {dependency-check-core => core}/src/test/resources/ruby/vulnerable/gems/sinatra/Gemfile.lock (100%) rename {dependency-check-core => core}/src/test/resources/ruby/vulnerable/gems/specifications/activerecord-oracle_enhanced-adapter-1.1.7.gemspec (100%) rename {dependency-check-core => core}/src/test/resources/ruby/vulnerable/gems/specifications/i18n-0.7.0.gemspec (100%) rename {dependency-check-core => core}/src/test/resources/ruby/vulnerable/gems/specifications/mail-2.4.3.gemspec (100%) rename {dependency-check-core => core}/src/test/resources/ruby/vulnerable/gems/specifications/mime-types-1.25.1.gemspec (100%) rename {dependency-check-core => core}/src/test/resources/ruby/vulnerable/gems/specifications/netrc-0.10.3.gemspec (100%) rename {dependency-check-core => core}/src/test/resources/ruby/vulnerable/gems/specifications/polyglot-0.3.5.gemspec (100%) rename {dependency-check-core => core}/src/test/resources/ruby/vulnerable/gems/specifications/rest-client-1.7.2.gemspec (100%) rename {dependency-check-core => core}/src/test/resources/ruby/vulnerable/gems/specifications/treetop-1.4.15.gemspec (100%) rename {dependency-check-core => core}/src/test/resources/stagedhttp-modified.tar (100%) rename {dependency-check-core => core}/src/test/resources/struts.zip (100%) rename {dependency-check-core => core}/src/test/resources/suppressions.xml (100%) rename {dependency-check-core => core}/src/test/resources/swift/Gloss/Gloss.podspec (100%) rename {dependency-check-core => core}/src/test/resources/swift/Gloss/Package.swift (100%) rename {dependency-check-core => core}/src/test/resources/swift/cocoapods/EasyPeasy.podspec (100%) rename {dependency-check-core => core}/src/test/resources/test.properties (100%) rename {dependency-check-core => core}/src/test/resources/test.zip (100%) rename {dependency-check-core => core}/src/test/resources/textFileWithJarExtension.jar (100%) rename {dependency-check-core => core}/src/test/resources/uber-1.0-SNAPSHOT.jar (100%) rename {dependency-check-maven => maven}/LICENSE.txt (100%) rename {dependency-check-maven => maven}/NOTICE.txt (100%) rename {dependency-check-maven => maven}/README.md (100%) rename {dependency-check-maven => maven}/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/617-hierarchical-cross-deps/invoker.properties (100%) rename {dependency-check-maven => maven}/src/it/617-hierarchical-cross-deps/module-java/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/617-hierarchical-cross-deps/module-web/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/617-hierarchical-cross-deps/module-web/src/main/webapp/WEB-INF/web.xml (100%) rename {dependency-check-maven => maven}/src/it/617-hierarchical-cross-deps/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/617-hierarchical-cross-deps/postbuild.groovy (100%) rename {dependency-check-maven => maven}/src/it/618-aggregator-purge/invoker.properties (100%) rename {dependency-check-maven => maven}/src/it/618-aggregator-purge/module/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/618-aggregator-purge/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/618-aggregator-purge/postbuild.groovy (100%) rename {dependency-check-maven => maven}/src/it/618-aggregator-update-only/invoker.properties (100%) rename {dependency-check-maven => maven}/src/it/618-aggregator-update-only/module/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/618-aggregator-update-only/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/618-aggregator-update-only/postbuild.groovy (100%) rename {dependency-check-maven => maven}/src/it/629-jackson-dataformat/invoker.properties (100%) rename {dependency-check-maven => maven}/src/it/629-jackson-dataformat/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/629-jackson-dataformat/postbuild.groovy (100%) rename {dependency-check-maven => maven}/src/it/690-threadsafety/first-a/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/690-threadsafety/first-b/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/690-threadsafety/first/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/690-threadsafety/fourth-a/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/690-threadsafety/fourth-a/src/main/webapp/WEB-INF/web.xml (100%) rename {dependency-check-maven => maven}/src/it/690-threadsafety/fourth-b/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/690-threadsafety/fourth-b/src/main/webapp/WEB-INF/web.xml (100%) rename {dependency-check-maven => maven}/src/it/690-threadsafety/fourth/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/690-threadsafety/fourth/src/main/webapp/WEB-INF/web.xml (100%) rename {dependency-check-maven => maven}/src/it/690-threadsafety/invoker.properties (100%) rename {dependency-check-maven => maven}/src/it/690-threadsafety/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/690-threadsafety/postbuild.groovy (100%) rename {dependency-check-maven => maven}/src/it/690-threadsafety/second-a/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/690-threadsafety/second-a/src/main/webapp/WEB-INF/web.xml (100%) rename {dependency-check-maven => maven}/src/it/690-threadsafety/second-b/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/690-threadsafety/second-b/src/main/webapp/WEB-INF/web.xml (100%) rename {dependency-check-maven => maven}/src/it/690-threadsafety/second/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/690-threadsafety/second/src/main/webapp/WEB-INF/web.xml (100%) rename {dependency-check-maven => maven}/src/it/690-threadsafety/third-a/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/690-threadsafety/third-a/src/main/webapp/WEB-INF/web.xml (100%) rename {dependency-check-maven => maven}/src/it/690-threadsafety/third-b/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/690-threadsafety/third-b/src/main/webapp/WEB-INF/web.xml (100%) rename {dependency-check-maven => maven}/src/it/690-threadsafety/third/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/690-threadsafety/third/src/main/webapp/WEB-INF/web.xml (100%) rename {dependency-check-maven => maven}/src/it/710-pom-parse-error/invoker.properties (100%) rename {dependency-check-maven => maven}/src/it/710-pom-parse-error/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/710-pom-parse-error/postbuild.groovy (100%) rename {dependency-check-maven => maven}/src/it/729-system-scope-resolved/invoker.properties (100%) rename {dependency-check-maven => maven}/src/it/729-system-scope-resolved/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/729-system-scope-resolved/postbuild.groovy (100%) rename {dependency-check-maven => maven}/src/it/729-system-scope-skipped/invoker.properties (100%) rename {dependency-check-maven => maven}/src/it/729-system-scope-skipped/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/729-system-scope-skipped/postbuild.groovy (100%) rename {dependency-check-maven => maven}/src/it/730-multiple-suppression-files-configs/invoker.properties (100%) rename {dependency-check-maven => maven}/src/it/730-multiple-suppression-files-configs/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/730-multiple-suppression-files-configs/postbuild.groovy (100%) rename {dependency-check-maven => maven}/src/it/730-multiple-suppression-files-configs/test-suppression1.xml (100%) rename {dependency-check-maven => maven}/src/it/730-multiple-suppression-files-configs/test-suppression2.xml (100%) rename {dependency-check-maven => maven}/src/it/730-multiple-suppression-files/invoker.properties (100%) rename {dependency-check-maven => maven}/src/it/730-multiple-suppression-files/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/730-multiple-suppression-files/postbuild.groovy (100%) rename {dependency-check-maven => maven}/src/it/730-multiple-suppression-files/test-suppression1.xml (100%) rename {dependency-check-maven => maven}/src/it/730-multiple-suppression-files/test-suppression2.xml (100%) rename {dependency-check-maven => maven}/src/it/815-broken-suppression-aggregate/broken-suppression.xml (100%) rename {dependency-check-maven => maven}/src/it/815-broken-suppression-aggregate/invoker.properties (100%) rename {dependency-check-maven => maven}/src/it/815-broken-suppression-aggregate/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/846-site-plugin/invoker.properties (100%) rename {dependency-check-maven => maven}/src/it/846-site-plugin/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/false-positives/invoker.properties (100%) rename {dependency-check-maven => maven}/src/it/false-positives/pom.xml (100%) rename {dependency-check-maven => maven}/src/it/false-positives/postbuild.groovy (100%) rename {dependency-check-maven => maven}/src/main/java/org/owasp/dependencycheck/maven/AggregateMojo.java (100%) rename {dependency-check-maven => maven}/src/main/java/org/owasp/dependencycheck/maven/ArtifactScopeExcluded.java (100%) rename {dependency-check-maven => maven}/src/main/java/org/owasp/dependencycheck/maven/ArtifactTypeExcluded.java (100%) rename {dependency-check-maven => maven}/src/main/java/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.java (100%) rename {dependency-check-maven => maven}/src/main/java/org/owasp/dependencycheck/maven/CheckMojo.java (100%) rename {dependency-check-maven => maven}/src/main/java/org/owasp/dependencycheck/maven/PurgeMojo.java (100%) rename {dependency-check-maven => maven}/src/main/java/org/owasp/dependencycheck/maven/UpdateMojo.java (100%) rename {dependency-check-maven => maven}/src/main/java/org/owasp/dependencycheck/maven/package-info.java (100%) rename {dependency-check-maven => maven}/src/main/resources/META-INF/licenses/maven/LICENSE.txt (100%) rename {dependency-check-maven => maven}/src/main/resources/mojo.properties (100%) rename {dependency-check-maven => maven}/src/site/markdown/configuration.md (100%) rename {dependency-check-maven => maven}/src/site/markdown/index.md.vm (100%) rename {dependency-check-maven => maven}/src/site/resources/images/dc-maven.svg (100%) rename {dependency-check-maven => maven}/src/site/site.xml (100%) rename {dependency-check-maven => maven}/src/test/java/org/owasp/dependencycheck/maven/ArtifactScopeExcludedTest.java (100%) rename {dependency-check-maven => maven}/src/test/java/org/owasp/dependencycheck/maven/ArtifactTypeExcludedTest.java (100%) rename {dependency-check-maven => maven}/src/test/java/org/owasp/dependencycheck/maven/BaseDependencyCheckMojoTest.java (100%) rename {dependency-check-maven => maven}/src/test/java/org/owasp/dependencycheck/maven/BaseTest.java (100%) rename {dependency-check-maven => maven}/src/test/resources/mojo.properties (100%) rename {dependency-check-maven => maven}/src/test/resources/sample.xml (100%) rename {dependency-check-utils => utils}/pom.xml (100%) rename {dependency-check-utils => utils}/src/main/java/org/owasp/dependencycheck/utils/Checksum.java (100%) rename {dependency-check-utils => utils}/src/main/java/org/owasp/dependencycheck/utils/DownloadFailedException.java (100%) rename {dependency-check-utils => utils}/src/main/java/org/owasp/dependencycheck/utils/Downloader.java (100%) rename {dependency-check-utils => utils}/src/main/java/org/owasp/dependencycheck/utils/ExpectedObjectInputStream.java (100%) rename {dependency-check-utils => utils}/src/main/java/org/owasp/dependencycheck/utils/ExtractionException.java (100%) rename {dependency-check-utils => utils}/src/main/java/org/owasp/dependencycheck/utils/FileUtils.java (100%) rename {dependency-check-utils => utils}/src/main/java/org/owasp/dependencycheck/utils/InvalidSettingException.java (100%) rename {dependency-check-utils => utils}/src/main/java/org/owasp/dependencycheck/utils/SSLSocketFactoryEx.java (100%) rename {dependency-check-utils => utils}/src/main/java/org/owasp/dependencycheck/utils/Settings.java (100%) rename {dependency-check-utils => utils}/src/main/java/org/owasp/dependencycheck/utils/URLConnectionFactory.java (100%) rename {dependency-check-utils => utils}/src/main/java/org/owasp/dependencycheck/utils/URLConnectionFailureException.java (100%) rename {dependency-check-utils => utils}/src/main/java/org/owasp/dependencycheck/utils/XmlUtils.java (100%) rename {dependency-check-utils => utils}/src/main/java/org/owasp/dependencycheck/utils/package-info.java (100%) rename {dependency-check-utils => utils}/src/site/markdown/index.md (100%) rename {dependency-check-utils => utils}/src/site/resources/images/dc-utils.svg (100%) rename {dependency-check-utils => utils}/src/site/site.xml (100%) rename {dependency-check-utils => utils}/src/test/java/org/owasp/dependencycheck/utils/BaseTest.java (100%) rename {dependency-check-utils => utils}/src/test/java/org/owasp/dependencycheck/utils/ChecksumTest.java (100%) rename {dependency-check-utils => utils}/src/test/java/org/owasp/dependencycheck/utils/DownloaderIT.java (100%) rename {dependency-check-utils => utils}/src/test/java/org/owasp/dependencycheck/utils/DownloaderTest.java (100%) rename {dependency-check-utils => utils}/src/test/java/org/owasp/dependencycheck/utils/ExpectedObjectInputStreamTest.java (100%) rename {dependency-check-utils => utils}/src/test/java/org/owasp/dependencycheck/utils/FileUtilsTest.java (100%) rename {dependency-check-utils => utils}/src/test/java/org/owasp/dependencycheck/utils/SettingsTest.java (100%) rename {dependency-check-utils => utils}/src/test/java/org/owasp/dependencycheck/utils/SimplePojo.java (100%) rename {dependency-check-utils => utils}/src/test/resources/checkSumTest.file (100%) rename {dependency-check-utils => utils}/src/test/resources/dependencycheck.properties (100%) rename {dependency-check-utils => utils}/src/test/resources/logback-test.xml (100%) rename {dependency-check-utils => utils}/src/test/resources/test.properties (100%) diff --git a/dependency-check-ant/LICENSE.txt b/ant/LICENSE.txt similarity index 100% rename from dependency-check-ant/LICENSE.txt rename to ant/LICENSE.txt diff --git a/dependency-check-ant/NOTICE.txt b/ant/NOTICE.txt similarity index 100% rename from dependency-check-ant/NOTICE.txt rename to ant/NOTICE.txt diff --git a/dependency-check-ant/README.md b/ant/README.md similarity index 100% rename from dependency-check-ant/README.md rename to ant/README.md diff --git a/dependency-check-ant/pom.xml b/ant/pom.xml similarity index 100% rename from dependency-check-ant/pom.xml rename to ant/pom.xml diff --git a/dependency-check-ant/src/main/assembly/release.xml b/ant/src/main/assembly/release.xml similarity index 100% rename from dependency-check-ant/src/main/assembly/release.xml rename to ant/src/main/assembly/release.xml diff --git a/dependency-check-ant/src/main/java/org/owasp/dependencycheck/ant/logging/AntLoggerAdapter.java b/ant/src/main/java/org/owasp/dependencycheck/ant/logging/AntLoggerAdapter.java similarity index 100% rename from dependency-check-ant/src/main/java/org/owasp/dependencycheck/ant/logging/AntLoggerAdapter.java rename to ant/src/main/java/org/owasp/dependencycheck/ant/logging/AntLoggerAdapter.java diff --git a/dependency-check-ant/src/main/java/org/owasp/dependencycheck/ant/logging/AntLoggerFactory.java b/ant/src/main/java/org/owasp/dependencycheck/ant/logging/AntLoggerFactory.java similarity index 100% rename from dependency-check-ant/src/main/java/org/owasp/dependencycheck/ant/logging/AntLoggerFactory.java rename to ant/src/main/java/org/owasp/dependencycheck/ant/logging/AntLoggerFactory.java diff --git a/dependency-check-ant/src/main/java/org/owasp/dependencycheck/ant/logging/package-info.java b/ant/src/main/java/org/owasp/dependencycheck/ant/logging/package-info.java similarity index 100% rename from dependency-check-ant/src/main/java/org/owasp/dependencycheck/ant/logging/package-info.java rename to ant/src/main/java/org/owasp/dependencycheck/ant/logging/package-info.java diff --git a/dependency-check-ant/src/main/java/org/owasp/dependencycheck/taskdefs/Check.java b/ant/src/main/java/org/owasp/dependencycheck/taskdefs/Check.java similarity index 100% rename from dependency-check-ant/src/main/java/org/owasp/dependencycheck/taskdefs/Check.java rename to ant/src/main/java/org/owasp/dependencycheck/taskdefs/Check.java diff --git a/dependency-check-ant/src/main/java/org/owasp/dependencycheck/taskdefs/Purge.java b/ant/src/main/java/org/owasp/dependencycheck/taskdefs/Purge.java similarity index 100% rename from dependency-check-ant/src/main/java/org/owasp/dependencycheck/taskdefs/Purge.java rename to ant/src/main/java/org/owasp/dependencycheck/taskdefs/Purge.java diff --git a/dependency-check-ant/src/main/java/org/owasp/dependencycheck/taskdefs/SuppressionFile.java b/ant/src/main/java/org/owasp/dependencycheck/taskdefs/SuppressionFile.java similarity index 100% rename from dependency-check-ant/src/main/java/org/owasp/dependencycheck/taskdefs/SuppressionFile.java rename to ant/src/main/java/org/owasp/dependencycheck/taskdefs/SuppressionFile.java diff --git a/dependency-check-ant/src/main/java/org/owasp/dependencycheck/taskdefs/Update.java b/ant/src/main/java/org/owasp/dependencycheck/taskdefs/Update.java similarity index 100% rename from dependency-check-ant/src/main/java/org/owasp/dependencycheck/taskdefs/Update.java rename to ant/src/main/java/org/owasp/dependencycheck/taskdefs/Update.java diff --git a/dependency-check-ant/src/main/java/org/owasp/dependencycheck/taskdefs/package-info.java b/ant/src/main/java/org/owasp/dependencycheck/taskdefs/package-info.java similarity index 100% rename from dependency-check-ant/src/main/java/org/owasp/dependencycheck/taskdefs/package-info.java rename to ant/src/main/java/org/owasp/dependencycheck/taskdefs/package-info.java diff --git a/dependency-check-ant/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/ant/src/main/java/org/slf4j/impl/StaticLoggerBinder.java similarity index 100% rename from dependency-check-ant/src/main/java/org/slf4j/impl/StaticLoggerBinder.java rename to ant/src/main/java/org/slf4j/impl/StaticLoggerBinder.java diff --git a/dependency-check-ant/src/main/java/org/slf4j/impl/package-info.java b/ant/src/main/java/org/slf4j/impl/package-info.java similarity index 100% rename from dependency-check-ant/src/main/java/org/slf4j/impl/package-info.java rename to ant/src/main/java/org/slf4j/impl/package-info.java diff --git a/dependency-check-ant/src/main/resources/META-INF/licenses/ant/LICENSE.txt b/ant/src/main/resources/META-INF/licenses/ant/LICENSE.txt similarity index 100% rename from dependency-check-ant/src/main/resources/META-INF/licenses/ant/LICENSE.txt rename to ant/src/main/resources/META-INF/licenses/ant/LICENSE.txt diff --git a/dependency-check-ant/src/main/resources/dependency-check-taskdefs.properties b/ant/src/main/resources/dependency-check-taskdefs.properties similarity index 100% rename from dependency-check-ant/src/main/resources/dependency-check-taskdefs.properties rename to ant/src/main/resources/dependency-check-taskdefs.properties diff --git a/dependency-check-ant/src/main/resources/task.properties b/ant/src/main/resources/task.properties similarity index 100% rename from dependency-check-ant/src/main/resources/task.properties rename to ant/src/main/resources/task.properties diff --git a/dependency-check-ant/src/site/markdown/config-purge.md b/ant/src/site/markdown/config-purge.md similarity index 100% rename from dependency-check-ant/src/site/markdown/config-purge.md rename to ant/src/site/markdown/config-purge.md diff --git a/dependency-check-ant/src/site/markdown/config-update.md b/ant/src/site/markdown/config-update.md similarity index 100% rename from dependency-check-ant/src/site/markdown/config-update.md rename to ant/src/site/markdown/config-update.md diff --git a/dependency-check-ant/src/site/markdown/configuration.md b/ant/src/site/markdown/configuration.md similarity index 100% rename from dependency-check-ant/src/site/markdown/configuration.md rename to ant/src/site/markdown/configuration.md diff --git a/dependency-check-ant/src/site/markdown/index.md.vm b/ant/src/site/markdown/index.md.vm similarity index 100% rename from dependency-check-ant/src/site/markdown/index.md.vm rename to ant/src/site/markdown/index.md.vm diff --git a/dependency-check-ant/src/site/resources/images/dc-ant.svg b/ant/src/site/resources/images/dc-ant.svg similarity index 100% rename from dependency-check-ant/src/site/resources/images/dc-ant.svg rename to ant/src/site/resources/images/dc-ant.svg diff --git a/dependency-check-ant/src/site/site.xml b/ant/src/site/site.xml similarity index 100% rename from dependency-check-ant/src/site/site.xml rename to ant/src/site/site.xml diff --git a/dependency-check-ant/src/test/java/org/owasp/dependencycheck/taskdefs/DependencyCheckTaskTest.java b/ant/src/test/java/org/owasp/dependencycheck/taskdefs/DependencyCheckTaskTest.java similarity index 100% rename from dependency-check-ant/src/test/java/org/owasp/dependencycheck/taskdefs/DependencyCheckTaskTest.java rename to ant/src/test/java/org/owasp/dependencycheck/taskdefs/DependencyCheckTaskTest.java diff --git a/dependency-check-ant/src/test/resources/build.xml b/ant/src/test/resources/build.xml similarity index 100% rename from dependency-check-ant/src/test/resources/build.xml rename to ant/src/test/resources/build.xml diff --git a/dependency-check-ant/src/test/resources/test-suppression.xml b/ant/src/test/resources/test-suppression.xml similarity index 100% rename from dependency-check-ant/src/test/resources/test-suppression.xml rename to ant/src/test/resources/test-suppression.xml diff --git a/dependency-check-ant/src/test/resources/test-suppression1.xml b/ant/src/test/resources/test-suppression1.xml similarity index 100% rename from dependency-check-ant/src/test/resources/test-suppression1.xml rename to ant/src/test/resources/test-suppression1.xml diff --git a/dependency-check-ant/src/test/resources/test-suppression2.xml b/ant/src/test/resources/test-suppression2.xml similarity index 100% rename from dependency-check-ant/src/test/resources/test-suppression2.xml rename to ant/src/test/resources/test-suppression2.xml diff --git a/dependency-check-plugin/pom.xml b/archetype/pom.xml similarity index 100% rename from dependency-check-plugin/pom.xml rename to archetype/pom.xml diff --git a/dependency-check-plugin/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml similarity index 100% rename from dependency-check-plugin/src/main/resources/META-INF/maven/archetype-metadata.xml rename to archetype/src/main/resources/META-INF/maven/archetype-metadata.xml diff --git a/dependency-check-plugin/src/main/resources/archetype-resources/pom.xml b/archetype/src/main/resources/archetype-resources/pom.xml similarity index 100% rename from dependency-check-plugin/src/main/resources/archetype-resources/pom.xml rename to archetype/src/main/resources/archetype-resources/pom.xml diff --git a/dependency-check-plugin/src/main/resources/archetype-resources/src/main/java/__analyzerName__.java b/archetype/src/main/resources/archetype-resources/src/main/java/__analyzerName__.java similarity index 100% rename from dependency-check-plugin/src/main/resources/archetype-resources/src/main/java/__analyzerName__.java rename to archetype/src/main/resources/archetype-resources/src/main/java/__analyzerName__.java diff --git a/dependency-check-plugin/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.owasp.dependencycheck.analyzer.Analyzer b/archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.owasp.dependencycheck.analyzer.Analyzer similarity index 100% rename from dependency-check-plugin/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.owasp.dependencycheck.analyzer.Analyzer rename to archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.owasp.dependencycheck.analyzer.Analyzer diff --git a/dependency-check-plugin/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.owasp.dependencycheck.data.update.CachedWebDataSource b/archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.owasp.dependencycheck.data.update.CachedWebDataSource similarity index 100% rename from dependency-check-plugin/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.owasp.dependencycheck.data.update.CachedWebDataSource rename to archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.owasp.dependencycheck.data.update.CachedWebDataSource diff --git a/dependency-check-plugin/src/main/resources/archetype-resources/src/test/java/__analyzerName__Test.java b/archetype/src/main/resources/archetype-resources/src/test/java/__analyzerName__Test.java similarity index 100% rename from dependency-check-plugin/src/main/resources/archetype-resources/src/test/java/__analyzerName__Test.java rename to archetype/src/main/resources/archetype-resources/src/test/java/__analyzerName__Test.java diff --git a/dependency-check-plugin/src/main/resources/archetype-resources/src/test/resources/test.file b/archetype/src/main/resources/archetype-resources/src/test/resources/test.file similarity index 100% rename from dependency-check-plugin/src/main/resources/archetype-resources/src/test/resources/test.file rename to archetype/src/main/resources/archetype-resources/src/test/resources/test.file diff --git a/dependency-check-plugin/src/site/markdown/index.md.vm b/archetype/src/site/markdown/index.md.vm similarity index 100% rename from dependency-check-plugin/src/site/markdown/index.md.vm rename to archetype/src/site/markdown/index.md.vm diff --git a/dependency-check-plugin/src/site/resources/images/dc.svg b/archetype/src/site/resources/images/dc.svg similarity index 100% rename from dependency-check-plugin/src/site/resources/images/dc.svg rename to archetype/src/site/resources/images/dc.svg diff --git a/dependency-check-plugin/src/site/site.xml b/archetype/src/site/site.xml similarity index 100% rename from dependency-check-plugin/src/site/site.xml rename to archetype/src/site/site.xml diff --git a/build-reporting/pom.xml b/build-reporting/pom.xml index 1e7d3a132..e6c5c5d22 100644 --- a/build-reporting/pom.xml +++ b/build-reporting/pom.xml @@ -61,6 +61,13 @@ Copyright (c) 2017 - Jeremy Long. All Rights Reserved. true + + org.apache.maven.plugins + maven-enforcer-plugin + + true + + org.jacoco jacoco-maven-plugin @@ -76,11 +83,11 @@ Copyright (c) 2017 - Jeremy Long. All Rights Reserved. ${project.basedir}/../ - dependency-check-utils/target/coverage-reports/*.exec - dependency-check-core/target/coverage-reports/*.exec - dependency-check-cli/target/coverage-reports/*.exec - dependency-check-ant/target/coverage-reports/*.exec - dependency-check-maven/target/coverage-reports/*.exec + utils/target/coverage-reports/*.exec + core/target/coverage-reports/*.exec + cli/target/coverage-reports/*.exec + ant/target/coverage-reports/*.exec + maven/target/coverage-reports/*.exec diff --git a/dependency-check-cli/LICENSE.txt b/cli/LICENSE.txt similarity index 100% rename from dependency-check-cli/LICENSE.txt rename to cli/LICENSE.txt diff --git a/dependency-check-cli/NOTICE.txt b/cli/NOTICE.txt similarity index 100% rename from dependency-check-cli/NOTICE.txt rename to cli/NOTICE.txt diff --git a/dependency-check-cli/README.md b/cli/README.md similarity index 100% rename from dependency-check-cli/README.md rename to cli/README.md diff --git a/dependency-check-cli/pom.xml b/cli/pom.xml similarity index 100% rename from dependency-check-cli/pom.xml rename to cli/pom.xml diff --git a/dependency-check-cli/src/main/assembly/license.txt b/cli/src/main/assembly/license.txt similarity index 100% rename from dependency-check-cli/src/main/assembly/license.txt rename to cli/src/main/assembly/license.txt diff --git a/dependency-check-cli/src/main/assembly/release.xml b/cli/src/main/assembly/release.xml similarity index 100% rename from dependency-check-cli/src/main/assembly/release.xml rename to cli/src/main/assembly/release.xml diff --git a/dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java b/cli/src/main/java/org/owasp/dependencycheck/App.java similarity index 100% rename from dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java rename to cli/src/main/java/org/owasp/dependencycheck/App.java diff --git a/dependency-check-cli/src/main/java/org/owasp/dependencycheck/CliParser.java b/cli/src/main/java/org/owasp/dependencycheck/CliParser.java similarity index 100% rename from dependency-check-cli/src/main/java/org/owasp/dependencycheck/CliParser.java rename to cli/src/main/java/org/owasp/dependencycheck/CliParser.java diff --git a/dependency-check-cli/src/main/java/org/owasp/dependencycheck/InvalidScanPathException.java b/cli/src/main/java/org/owasp/dependencycheck/InvalidScanPathException.java similarity index 100% rename from dependency-check-cli/src/main/java/org/owasp/dependencycheck/InvalidScanPathException.java rename to cli/src/main/java/org/owasp/dependencycheck/InvalidScanPathException.java diff --git a/dependency-check-cli/src/main/java/org/owasp/dependencycheck/package-info.java b/cli/src/main/java/org/owasp/dependencycheck/package-info.java similarity index 100% rename from dependency-check-cli/src/main/java/org/owasp/dependencycheck/package-info.java rename to cli/src/main/java/org/owasp/dependencycheck/package-info.java diff --git a/dependency-check-cli/src/main/resources/META-INF/licenses/commons-cli/LICENSE.txt b/cli/src/main/resources/META-INF/licenses/commons-cli/LICENSE.txt similarity index 100% rename from dependency-check-cli/src/main/resources/META-INF/licenses/commons-cli/LICENSE.txt rename to cli/src/main/resources/META-INF/licenses/commons-cli/LICENSE.txt diff --git a/dependency-check-cli/src/main/resources/logback.xml b/cli/src/main/resources/logback.xml similarity index 100% rename from dependency-check-cli/src/main/resources/logback.xml rename to cli/src/main/resources/logback.xml diff --git a/dependency-check-cli/src/site/markdown/arguments.md b/cli/src/site/markdown/arguments.md similarity index 100% rename from dependency-check-cli/src/site/markdown/arguments.md rename to cli/src/site/markdown/arguments.md diff --git a/dependency-check-cli/src/site/markdown/index.md.vm b/cli/src/site/markdown/index.md.vm similarity index 100% rename from dependency-check-cli/src/site/markdown/index.md.vm rename to cli/src/site/markdown/index.md.vm diff --git a/dependency-check-cli/src/site/resources/images/dc-cli.svg b/cli/src/site/resources/images/dc-cli.svg similarity index 100% rename from dependency-check-cli/src/site/resources/images/dc-cli.svg rename to cli/src/site/resources/images/dc-cli.svg diff --git a/dependency-check-cli/src/site/site.xml b/cli/src/site/site.xml similarity index 100% rename from dependency-check-cli/src/site/site.xml rename to cli/src/site/site.xml diff --git a/dependency-check-cli/src/test/java/org/owasp/dependencycheck/AppTest.java b/cli/src/test/java/org/owasp/dependencycheck/AppTest.java similarity index 100% rename from dependency-check-cli/src/test/java/org/owasp/dependencycheck/AppTest.java rename to cli/src/test/java/org/owasp/dependencycheck/AppTest.java diff --git a/dependency-check-cli/src/test/java/org/owasp/dependencycheck/BaseTest.java b/cli/src/test/java/org/owasp/dependencycheck/BaseTest.java similarity index 100% rename from dependency-check-cli/src/test/java/org/owasp/dependencycheck/BaseTest.java rename to cli/src/test/java/org/owasp/dependencycheck/BaseTest.java diff --git a/dependency-check-cli/src/test/java/org/owasp/dependencycheck/CliParserTest.java b/cli/src/test/java/org/owasp/dependencycheck/CliParserTest.java similarity index 100% rename from dependency-check-cli/src/test/java/org/owasp/dependencycheck/CliParserTest.java rename to cli/src/test/java/org/owasp/dependencycheck/CliParserTest.java diff --git a/dependency-check-cli/src/test/resources/checkSumTest.file b/cli/src/test/resources/checkSumTest.file similarity index 100% rename from dependency-check-cli/src/test/resources/checkSumTest.file rename to cli/src/test/resources/checkSumTest.file diff --git a/dependency-check-cli/src/test/resources/sample.properties b/cli/src/test/resources/sample.properties similarity index 100% rename from dependency-check-cli/src/test/resources/sample.properties rename to cli/src/test/resources/sample.properties diff --git a/dependency-check-cli/src/test/resources/sample2.properties b/cli/src/test/resources/sample2.properties similarity index 100% rename from dependency-check-cli/src/test/resources/sample2.properties rename to cli/src/test/resources/sample2.properties diff --git a/dependency-check-core/LICENSE.txt b/core/LICENSE.txt similarity index 100% rename from dependency-check-core/LICENSE.txt rename to core/LICENSE.txt diff --git a/dependency-check-core/NOTICE.txt b/core/NOTICE.txt similarity index 100% rename from dependency-check-core/NOTICE.txt rename to core/NOTICE.txt diff --git a/dependency-check-core/README.md b/core/README.md similarity index 100% rename from dependency-check-core/README.md rename to core/README.md diff --git a/dependency-check-core/pom.xml b/core/pom.xml similarity index 99% rename from dependency-check-core/pom.xml rename to core/pom.xml index 330169545..c08a7e658 100644 --- a/dependency-check-core/pom.xml +++ b/core/pom.xml @@ -90,6 +90,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. ${project.build.directory}/test-classes test + dependency-check-utils diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/AnalysisTask.java b/core/src/main/java/org/owasp/dependencycheck/AnalysisTask.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/AnalysisTask.java rename to core/src/main/java/org/owasp/dependencycheck/AnalysisTask.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java b/core/src/main/java/org/owasp/dependencycheck/Engine.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java rename to core/src/main/java/org/owasp/dependencycheck/Engine.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/agent/DependencyCheckScanAgent.java b/core/src/main/java/org/owasp/dependencycheck/agent/DependencyCheckScanAgent.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/agent/DependencyCheckScanAgent.java rename to core/src/main/java/org/owasp/dependencycheck/agent/DependencyCheckScanAgent.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/agent/package-info.java b/core/src/main/java/org/owasp/dependencycheck/agent/package-info.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/agent/package-info.java rename to core/src/main/java/org/owasp/dependencycheck/agent/package-info.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractDependencyComparingAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractDependencyComparingAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractDependencyComparingAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractDependencyComparingAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractFileTypeAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractFileTypeAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractFileTypeAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractFileTypeAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractNpmAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractNpmAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractNpmAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractNpmAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AnalysisPhase.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/AnalysisPhase.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AnalysisPhase.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/AnalysisPhase.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/Analyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/Analyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/Analyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/Analyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AnalyzerService.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/AnalyzerService.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AnalyzerService.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/AnalyzerService.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AutoconfAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/AutoconfAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AutoconfAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/AutoconfAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CMakeAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/CMakeAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CMakeAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/CMakeAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CPEAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/CPEAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CPEAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/CPEAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CentralAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/CentralAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CentralAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/CentralAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CocoaPodsAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/CocoaPodsAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CocoaPodsAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/CocoaPodsAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/ComposerLockAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/ComposerLockAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/ComposerLockAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/ComposerLockAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CpeSuppressionAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/CpeSuppressionAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CpeSuppressionAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/CpeSuppressionAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/DependencyMergingAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/DependencyMergingAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/DependencyMergingAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/DependencyMergingAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/Experimental.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/Experimental.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/Experimental.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/Experimental.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/FileNameAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/FileNameAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/FileNameAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/FileNameAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/FileTypeAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/FileTypeAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/FileTypeAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/FileTypeAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/HintAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/HintAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/HintAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/HintAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NexusAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/NexusAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NexusAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/NexusAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NodePackageAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/NodePackageAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NodePackageAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/NodePackageAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NspAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/NspAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NspAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/NspAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NuspecAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/NuspecAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NuspecAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/NuspecAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NvdCveAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/NvdCveAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NvdCveAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/NvdCveAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/OpenSSLAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/OpenSSLAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/OpenSSLAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/OpenSSLAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/PythonDistributionAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/PythonDistributionAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/PythonDistributionAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/PythonDistributionAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/PythonPackageAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/PythonPackageAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/PythonPackageAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/PythonPackageAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/Retired.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/Retired.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/Retired.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/Retired.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/RubyBundlerAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/RubyBundlerAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/RubyBundlerAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/RubyBundlerAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/RubyGemspecAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/RubyGemspecAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/RubyGemspecAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/RubyGemspecAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/SwiftPackageManagerAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/SwiftPackageManagerAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/SwiftPackageManagerAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/SwiftPackageManagerAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/VersionFilterAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/VersionFilterAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/VersionFilterAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/VersionFilterAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/exception/AnalysisException.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/exception/AnalysisException.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/exception/AnalysisException.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/exception/AnalysisException.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/exception/ArchiveExtractionException.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/exception/ArchiveExtractionException.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/exception/ArchiveExtractionException.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/exception/ArchiveExtractionException.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/exception/package-info.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/exception/package-info.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/exception/package-info.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/exception/package-info.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/package-info.java b/core/src/main/java/org/owasp/dependencycheck/analyzer/package-info.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/package-info.java rename to core/src/main/java/org/owasp/dependencycheck/analyzer/package-info.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/central/CentralSearch.java b/core/src/main/java/org/owasp/dependencycheck/data/central/CentralSearch.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/central/CentralSearch.java rename to core/src/main/java/org/owasp/dependencycheck/data/central/CentralSearch.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/central/package-info.java b/core/src/main/java/org/owasp/dependencycheck/data/central/package-info.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/central/package-info.java rename to core/src/main/java/org/owasp/dependencycheck/data/central/package-info.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/composer/ComposerDependency.java b/core/src/main/java/org/owasp/dependencycheck/data/composer/ComposerDependency.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/composer/ComposerDependency.java rename to core/src/main/java/org/owasp/dependencycheck/data/composer/ComposerDependency.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/composer/ComposerException.java b/core/src/main/java/org/owasp/dependencycheck/data/composer/ComposerException.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/composer/ComposerException.java rename to core/src/main/java/org/owasp/dependencycheck/data/composer/ComposerException.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/composer/ComposerLockParser.java b/core/src/main/java/org/owasp/dependencycheck/data/composer/ComposerLockParser.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/composer/ComposerLockParser.java rename to core/src/main/java/org/owasp/dependencycheck/data/composer/ComposerLockParser.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/composer/package-info.java b/core/src/main/java/org/owasp/dependencycheck/data/composer/package-info.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/composer/package-info.java rename to core/src/main/java/org/owasp/dependencycheck/data/composer/package-info.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cpe/CpeMemoryIndex.java b/core/src/main/java/org/owasp/dependencycheck/data/cpe/CpeMemoryIndex.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cpe/CpeMemoryIndex.java rename to core/src/main/java/org/owasp/dependencycheck/data/cpe/CpeMemoryIndex.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cpe/Fields.java b/core/src/main/java/org/owasp/dependencycheck/data/cpe/Fields.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cpe/Fields.java rename to core/src/main/java/org/owasp/dependencycheck/data/cpe/Fields.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cpe/IndexEntry.java b/core/src/main/java/org/owasp/dependencycheck/data/cpe/IndexEntry.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cpe/IndexEntry.java rename to core/src/main/java/org/owasp/dependencycheck/data/cpe/IndexEntry.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cpe/IndexException.java b/core/src/main/java/org/owasp/dependencycheck/data/cpe/IndexException.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cpe/IndexException.java rename to core/src/main/java/org/owasp/dependencycheck/data/cpe/IndexException.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cpe/package-info.java b/core/src/main/java/org/owasp/dependencycheck/data/cpe/package-info.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cpe/package-info.java rename to core/src/main/java/org/owasp/dependencycheck/data/cpe/package-info.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cwe/CweDB.java b/core/src/main/java/org/owasp/dependencycheck/data/cwe/CweDB.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cwe/CweDB.java rename to core/src/main/java/org/owasp/dependencycheck/data/cwe/CweDB.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cwe/CweHandler.java b/core/src/main/java/org/owasp/dependencycheck/data/cwe/CweHandler.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cwe/CweHandler.java rename to core/src/main/java/org/owasp/dependencycheck/data/cwe/CweHandler.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cwe/package-info.java b/core/src/main/java/org/owasp/dependencycheck/data/cwe/package-info.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cwe/package-info.java rename to core/src/main/java/org/owasp/dependencycheck/data/cwe/package-info.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/AbstractTokenizingFilter.java b/core/src/main/java/org/owasp/dependencycheck/data/lucene/AbstractTokenizingFilter.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/AbstractTokenizingFilter.java rename to core/src/main/java/org/owasp/dependencycheck/data/lucene/AbstractTokenizingFilter.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/AlphaNumericFilter.java b/core/src/main/java/org/owasp/dependencycheck/data/lucene/AlphaNumericFilter.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/AlphaNumericFilter.java rename to core/src/main/java/org/owasp/dependencycheck/data/lucene/AlphaNumericFilter.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/AlphaNumericTokenizer.java b/core/src/main/java/org/owasp/dependencycheck/data/lucene/AlphaNumericTokenizer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/AlphaNumericTokenizer.java rename to core/src/main/java/org/owasp/dependencycheck/data/lucene/AlphaNumericTokenizer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/DependencySimilarity.java b/core/src/main/java/org/owasp/dependencycheck/data/lucene/DependencySimilarity.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/DependencySimilarity.java rename to core/src/main/java/org/owasp/dependencycheck/data/lucene/DependencySimilarity.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/LuceneUtils.java b/core/src/main/java/org/owasp/dependencycheck/data/lucene/LuceneUtils.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/LuceneUtils.java rename to core/src/main/java/org/owasp/dependencycheck/data/lucene/LuceneUtils.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/SearchFieldAnalyzer.java b/core/src/main/java/org/owasp/dependencycheck/data/lucene/SearchFieldAnalyzer.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/SearchFieldAnalyzer.java rename to core/src/main/java/org/owasp/dependencycheck/data/lucene/SearchFieldAnalyzer.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilter.java b/core/src/main/java/org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilter.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilter.java rename to core/src/main/java/org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilter.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/UrlTokenizingFilter.java b/core/src/main/java/org/owasp/dependencycheck/data/lucene/UrlTokenizingFilter.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/UrlTokenizingFilter.java rename to core/src/main/java/org/owasp/dependencycheck/data/lucene/UrlTokenizingFilter.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/package-info.java b/core/src/main/java/org/owasp/dependencycheck/data/lucene/package-info.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/package-info.java rename to core/src/main/java/org/owasp/dependencycheck/data/lucene/package-info.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nexus/MavenArtifact.java b/core/src/main/java/org/owasp/dependencycheck/data/nexus/MavenArtifact.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nexus/MavenArtifact.java rename to core/src/main/java/org/owasp/dependencycheck/data/nexus/MavenArtifact.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nexus/NexusSearch.java b/core/src/main/java/org/owasp/dependencycheck/data/nexus/NexusSearch.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nexus/NexusSearch.java rename to core/src/main/java/org/owasp/dependencycheck/data/nexus/NexusSearch.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nexus/package-info.java b/core/src/main/java/org/owasp/dependencycheck/data/nexus/package-info.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nexus/package-info.java rename to core/src/main/java/org/owasp/dependencycheck/data/nexus/package-info.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nsp/Advisory.java b/core/src/main/java/org/owasp/dependencycheck/data/nsp/Advisory.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nsp/Advisory.java rename to core/src/main/java/org/owasp/dependencycheck/data/nsp/Advisory.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nsp/NspSearch.java b/core/src/main/java/org/owasp/dependencycheck/data/nsp/NspSearch.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nsp/NspSearch.java rename to core/src/main/java/org/owasp/dependencycheck/data/nsp/NspSearch.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nsp/SanitizePackage.java b/core/src/main/java/org/owasp/dependencycheck/data/nsp/SanitizePackage.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nsp/SanitizePackage.java rename to core/src/main/java/org/owasp/dependencycheck/data/nsp/SanitizePackage.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nsp/package-info.java b/core/src/main/java/org/owasp/dependencycheck/data/nsp/package-info.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nsp/package-info.java rename to core/src/main/java/org/owasp/dependencycheck/data/nsp/package-info.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nuget/NugetPackage.java b/core/src/main/java/org/owasp/dependencycheck/data/nuget/NugetPackage.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nuget/NugetPackage.java rename to core/src/main/java/org/owasp/dependencycheck/data/nuget/NugetPackage.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nuget/NuspecParseException.java b/core/src/main/java/org/owasp/dependencycheck/data/nuget/NuspecParseException.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nuget/NuspecParseException.java rename to core/src/main/java/org/owasp/dependencycheck/data/nuget/NuspecParseException.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nuget/NuspecParser.java b/core/src/main/java/org/owasp/dependencycheck/data/nuget/NuspecParser.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nuget/NuspecParser.java rename to core/src/main/java/org/owasp/dependencycheck/data/nuget/NuspecParser.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nuget/XPathNuspecParser.java b/core/src/main/java/org/owasp/dependencycheck/data/nuget/XPathNuspecParser.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nuget/XPathNuspecParser.java rename to core/src/main/java/org/owasp/dependencycheck/data/nuget/XPathNuspecParser.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nuget/package-info.java b/core/src/main/java/org/owasp/dependencycheck/data/nuget/package-info.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nuget/package-info.java rename to core/src/main/java/org/owasp/dependencycheck/data/nuget/package-info.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java b/core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java rename to core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CorruptDatabaseException.java b/core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CorruptDatabaseException.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CorruptDatabaseException.java rename to core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CorruptDatabaseException.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java b/core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java rename to core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseException.java b/core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseException.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseException.java rename to core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseException.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.java b/core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.java rename to core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverLoadException.java b/core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverLoadException.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverLoadException.java rename to core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverLoadException.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverLoader.java b/core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverLoader.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverLoader.java rename to core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverLoader.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverShim.java b/core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverShim.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverShim.java rename to core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverShim.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/package-info.java b/core/src/main/java/org/owasp/dependencycheck/data/nvdcve/package-info.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/package-info.java rename to core/src/main/java/org/owasp/dependencycheck/data/nvdcve/package-info.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/CachedWebDataSource.java b/core/src/main/java/org/owasp/dependencycheck/data/update/CachedWebDataSource.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/CachedWebDataSource.java rename to core/src/main/java/org/owasp/dependencycheck/data/update/CachedWebDataSource.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/CpeUpdater.java b/core/src/main/java/org/owasp/dependencycheck/data/update/CpeUpdater.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/CpeUpdater.java rename to core/src/main/java/org/owasp/dependencycheck/data/update/CpeUpdater.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/EngineVersionCheck.java b/core/src/main/java/org/owasp/dependencycheck/data/update/EngineVersionCheck.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/EngineVersionCheck.java rename to core/src/main/java/org/owasp/dependencycheck/data/update/EngineVersionCheck.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/NvdCveUpdater.java b/core/src/main/java/org/owasp/dependencycheck/data/update/NvdCveUpdater.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/NvdCveUpdater.java rename to core/src/main/java/org/owasp/dependencycheck/data/update/NvdCveUpdater.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/UpdateService.java b/core/src/main/java/org/owasp/dependencycheck/data/update/UpdateService.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/UpdateService.java rename to core/src/main/java/org/owasp/dependencycheck/data/update/UpdateService.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/cpe/CPEHandler.java b/core/src/main/java/org/owasp/dependencycheck/data/update/cpe/CPEHandler.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/cpe/CPEHandler.java rename to core/src/main/java/org/owasp/dependencycheck/data/update/cpe/CPEHandler.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/cpe/Cpe.java b/core/src/main/java/org/owasp/dependencycheck/data/update/cpe/Cpe.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/cpe/Cpe.java rename to core/src/main/java/org/owasp/dependencycheck/data/update/cpe/Cpe.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/cpe/package-info.java b/core/src/main/java/org/owasp/dependencycheck/data/update/cpe/package-info.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/cpe/package-info.java rename to core/src/main/java/org/owasp/dependencycheck/data/update/cpe/package-info.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/exception/InvalidDataException.java b/core/src/main/java/org/owasp/dependencycheck/data/update/exception/InvalidDataException.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/exception/InvalidDataException.java rename to core/src/main/java/org/owasp/dependencycheck/data/update/exception/InvalidDataException.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/exception/UpdateException.java b/core/src/main/java/org/owasp/dependencycheck/data/update/exception/UpdateException.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/exception/UpdateException.java rename to core/src/main/java/org/owasp/dependencycheck/data/update/exception/UpdateException.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/exception/package-info.java b/core/src/main/java/org/owasp/dependencycheck/data/update/exception/package-info.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/exception/package-info.java rename to core/src/main/java/org/owasp/dependencycheck/data/update/exception/package-info.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/nvd/DownloadTask.java b/core/src/main/java/org/owasp/dependencycheck/data/update/nvd/DownloadTask.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/nvd/DownloadTask.java rename to core/src/main/java/org/owasp/dependencycheck/data/update/nvd/DownloadTask.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/nvd/NvdCve12Handler.java b/core/src/main/java/org/owasp/dependencycheck/data/update/nvd/NvdCve12Handler.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/nvd/NvdCve12Handler.java rename to core/src/main/java/org/owasp/dependencycheck/data/update/nvd/NvdCve12Handler.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/nvd/NvdCve20Handler.java b/core/src/main/java/org/owasp/dependencycheck/data/update/nvd/NvdCve20Handler.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/nvd/NvdCve20Handler.java rename to core/src/main/java/org/owasp/dependencycheck/data/update/nvd/NvdCve20Handler.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/nvd/NvdCveInfo.java b/core/src/main/java/org/owasp/dependencycheck/data/update/nvd/NvdCveInfo.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/nvd/NvdCveInfo.java rename to core/src/main/java/org/owasp/dependencycheck/data/update/nvd/NvdCveInfo.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/nvd/ProcessTask.java b/core/src/main/java/org/owasp/dependencycheck/data/update/nvd/ProcessTask.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/nvd/ProcessTask.java rename to core/src/main/java/org/owasp/dependencycheck/data/update/nvd/ProcessTask.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/nvd/UpdateableNvdCve.java b/core/src/main/java/org/owasp/dependencycheck/data/update/nvd/UpdateableNvdCve.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/nvd/UpdateableNvdCve.java rename to core/src/main/java/org/owasp/dependencycheck/data/update/nvd/UpdateableNvdCve.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/nvd/package-info.java b/core/src/main/java/org/owasp/dependencycheck/data/update/nvd/package-info.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/nvd/package-info.java rename to core/src/main/java/org/owasp/dependencycheck/data/update/nvd/package-info.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/package-info.java b/core/src/main/java/org/owasp/dependencycheck/data/update/package-info.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/package-info.java rename to core/src/main/java/org/owasp/dependencycheck/data/update/package-info.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Confidence.java b/core/src/main/java/org/owasp/dependencycheck/dependency/Confidence.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Confidence.java rename to core/src/main/java/org/owasp/dependencycheck/dependency/Confidence.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Dependency.java b/core/src/main/java/org/owasp/dependencycheck/dependency/Dependency.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Dependency.java rename to core/src/main/java/org/owasp/dependencycheck/dependency/Dependency.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Evidence.java b/core/src/main/java/org/owasp/dependencycheck/dependency/Evidence.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Evidence.java rename to core/src/main/java/org/owasp/dependencycheck/dependency/Evidence.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/EvidenceCollection.java b/core/src/main/java/org/owasp/dependencycheck/dependency/EvidenceCollection.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/EvidenceCollection.java rename to core/src/main/java/org/owasp/dependencycheck/dependency/EvidenceCollection.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/EvidenceType.java b/core/src/main/java/org/owasp/dependencycheck/dependency/EvidenceType.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/EvidenceType.java rename to core/src/main/java/org/owasp/dependencycheck/dependency/EvidenceType.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Identifier.java b/core/src/main/java/org/owasp/dependencycheck/dependency/Identifier.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Identifier.java rename to core/src/main/java/org/owasp/dependencycheck/dependency/Identifier.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Reference.java b/core/src/main/java/org/owasp/dependencycheck/dependency/Reference.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Reference.java rename to core/src/main/java/org/owasp/dependencycheck/dependency/Reference.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Vulnerability.java b/core/src/main/java/org/owasp/dependencycheck/dependency/Vulnerability.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Vulnerability.java rename to core/src/main/java/org/owasp/dependencycheck/dependency/Vulnerability.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/VulnerableSoftware.java b/core/src/main/java/org/owasp/dependencycheck/dependency/VulnerableSoftware.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/VulnerableSoftware.java rename to core/src/main/java/org/owasp/dependencycheck/dependency/VulnerableSoftware.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/package-info.java b/core/src/main/java/org/owasp/dependencycheck/dependency/package-info.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/package-info.java rename to core/src/main/java/org/owasp/dependencycheck/dependency/package-info.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/exception/DependencyNotFoundException.java b/core/src/main/java/org/owasp/dependencycheck/exception/DependencyNotFoundException.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/exception/DependencyNotFoundException.java rename to core/src/main/java/org/owasp/dependencycheck/exception/DependencyNotFoundException.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/exception/ExceptionCollection.java b/core/src/main/java/org/owasp/dependencycheck/exception/ExceptionCollection.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/exception/ExceptionCollection.java rename to core/src/main/java/org/owasp/dependencycheck/exception/ExceptionCollection.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/exception/H2DBLockException.java b/core/src/main/java/org/owasp/dependencycheck/exception/H2DBLockException.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/exception/H2DBLockException.java rename to core/src/main/java/org/owasp/dependencycheck/exception/H2DBLockException.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/exception/InitializationException.java b/core/src/main/java/org/owasp/dependencycheck/exception/InitializationException.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/exception/InitializationException.java rename to core/src/main/java/org/owasp/dependencycheck/exception/InitializationException.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/exception/NoDataException.java b/core/src/main/java/org/owasp/dependencycheck/exception/NoDataException.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/exception/NoDataException.java rename to core/src/main/java/org/owasp/dependencycheck/exception/NoDataException.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/exception/ReportException.java b/core/src/main/java/org/owasp/dependencycheck/exception/ReportException.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/exception/ReportException.java rename to core/src/main/java/org/owasp/dependencycheck/exception/ReportException.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/exception/ScanAgentException.java b/core/src/main/java/org/owasp/dependencycheck/exception/ScanAgentException.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/exception/ScanAgentException.java rename to core/src/main/java/org/owasp/dependencycheck/exception/ScanAgentException.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/exception/package-info.java b/core/src/main/java/org/owasp/dependencycheck/exception/package-info.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/exception/package-info.java rename to core/src/main/java/org/owasp/dependencycheck/exception/package-info.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/package-info.java b/core/src/main/java/org/owasp/dependencycheck/package-info.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/package-info.java rename to core/src/main/java/org/owasp/dependencycheck/package-info.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/reporting/EscapeTool.java b/core/src/main/java/org/owasp/dependencycheck/reporting/EscapeTool.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/reporting/EscapeTool.java rename to core/src/main/java/org/owasp/dependencycheck/reporting/EscapeTool.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/reporting/ReportGenerator.java b/core/src/main/java/org/owasp/dependencycheck/reporting/ReportGenerator.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/reporting/ReportGenerator.java rename to core/src/main/java/org/owasp/dependencycheck/reporting/ReportGenerator.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/reporting/VelocityLoggerRedirect.java b/core/src/main/java/org/owasp/dependencycheck/reporting/VelocityLoggerRedirect.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/reporting/VelocityLoggerRedirect.java rename to core/src/main/java/org/owasp/dependencycheck/reporting/VelocityLoggerRedirect.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/reporting/package-info.java b/core/src/main/java/org/owasp/dependencycheck/reporting/package-info.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/reporting/package-info.java rename to core/src/main/java/org/owasp/dependencycheck/reporting/package-info.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/DBUtils.java b/core/src/main/java/org/owasp/dependencycheck/utils/DBUtils.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/DBUtils.java rename to core/src/main/java/org/owasp/dependencycheck/utils/DBUtils.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/DateUtil.java b/core/src/main/java/org/owasp/dependencycheck/utils/DateUtil.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/DateUtil.java rename to core/src/main/java/org/owasp/dependencycheck/utils/DateUtil.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/DependencyVersion.java b/core/src/main/java/org/owasp/dependencycheck/utils/DependencyVersion.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/DependencyVersion.java rename to core/src/main/java/org/owasp/dependencycheck/utils/DependencyVersion.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/DependencyVersionUtil.java b/core/src/main/java/org/owasp/dependencycheck/utils/DependencyVersionUtil.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/DependencyVersionUtil.java rename to core/src/main/java/org/owasp/dependencycheck/utils/DependencyVersionUtil.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/ExtractionUtil.java b/core/src/main/java/org/owasp/dependencycheck/utils/ExtractionUtil.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/ExtractionUtil.java rename to core/src/main/java/org/owasp/dependencycheck/utils/ExtractionUtil.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/FileFilterBuilder.java b/core/src/main/java/org/owasp/dependencycheck/utils/FileFilterBuilder.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/FileFilterBuilder.java rename to core/src/main/java/org/owasp/dependencycheck/utils/FileFilterBuilder.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Filter.java b/core/src/main/java/org/owasp/dependencycheck/utils/Filter.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Filter.java rename to core/src/main/java/org/owasp/dependencycheck/utils/Filter.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/H2DBCleanupHook.java b/core/src/main/java/org/owasp/dependencycheck/utils/H2DBCleanupHook.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/H2DBCleanupHook.java rename to core/src/main/java/org/owasp/dependencycheck/utils/H2DBCleanupHook.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/H2DBLock.java b/core/src/main/java/org/owasp/dependencycheck/utils/H2DBLock.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/H2DBLock.java rename to core/src/main/java/org/owasp/dependencycheck/utils/H2DBLock.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/H2DBShutdownHook.java b/core/src/main/java/org/owasp/dependencycheck/utils/H2DBShutdownHook.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/H2DBShutdownHook.java rename to core/src/main/java/org/owasp/dependencycheck/utils/H2DBShutdownHook.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/H2DBShutdownHookFactory.java b/core/src/main/java/org/owasp/dependencycheck/utils/H2DBShutdownHookFactory.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/H2DBShutdownHookFactory.java rename to core/src/main/java/org/owasp/dependencycheck/utils/H2DBShutdownHookFactory.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Pair.java b/core/src/main/java/org/owasp/dependencycheck/utils/Pair.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Pair.java rename to core/src/main/java/org/owasp/dependencycheck/utils/Pair.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/UrlStringUtils.java b/core/src/main/java/org/owasp/dependencycheck/utils/UrlStringUtils.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/UrlStringUtils.java rename to core/src/main/java/org/owasp/dependencycheck/utils/UrlStringUtils.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/package-info.java b/core/src/main/java/org/owasp/dependencycheck/utils/package-info.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/package-info.java rename to core/src/main/java/org/owasp/dependencycheck/utils/package-info.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/XmlEntity.java b/core/src/main/java/org/owasp/dependencycheck/xml/XmlEntity.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/XmlEntity.java rename to core/src/main/java/org/owasp/dependencycheck/xml/XmlEntity.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/XmlInputStream.java b/core/src/main/java/org/owasp/dependencycheck/xml/XmlInputStream.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/XmlInputStream.java rename to core/src/main/java/org/owasp/dependencycheck/xml/XmlInputStream.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/EvidenceMatcher.java b/core/src/main/java/org/owasp/dependencycheck/xml/hints/EvidenceMatcher.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/EvidenceMatcher.java rename to core/src/main/java/org/owasp/dependencycheck/xml/hints/EvidenceMatcher.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/HintErrorHandler.java b/core/src/main/java/org/owasp/dependencycheck/xml/hints/HintErrorHandler.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/HintErrorHandler.java rename to core/src/main/java/org/owasp/dependencycheck/xml/hints/HintErrorHandler.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/HintHandler.java b/core/src/main/java/org/owasp/dependencycheck/xml/hints/HintHandler.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/HintHandler.java rename to core/src/main/java/org/owasp/dependencycheck/xml/hints/HintHandler.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/HintParseException.java b/core/src/main/java/org/owasp/dependencycheck/xml/hints/HintParseException.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/HintParseException.java rename to core/src/main/java/org/owasp/dependencycheck/xml/hints/HintParseException.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/HintParser.java b/core/src/main/java/org/owasp/dependencycheck/xml/hints/HintParser.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/HintParser.java rename to core/src/main/java/org/owasp/dependencycheck/xml/hints/HintParser.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/HintRule.java b/core/src/main/java/org/owasp/dependencycheck/xml/hints/HintRule.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/HintRule.java rename to core/src/main/java/org/owasp/dependencycheck/xml/hints/HintRule.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/VendorDuplicatingHintRule.java b/core/src/main/java/org/owasp/dependencycheck/xml/hints/VendorDuplicatingHintRule.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/VendorDuplicatingHintRule.java rename to core/src/main/java/org/owasp/dependencycheck/xml/hints/VendorDuplicatingHintRule.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/package-info.java b/core/src/main/java/org/owasp/dependencycheck/xml/hints/package-info.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/package-info.java rename to core/src/main/java/org/owasp/dependencycheck/xml/hints/package-info.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/package-info.java b/core/src/main/java/org/owasp/dependencycheck/xml/package-info.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/package-info.java rename to core/src/main/java/org/owasp/dependencycheck/xml/package-info.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/pom/License.java b/core/src/main/java/org/owasp/dependencycheck/xml/pom/License.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/pom/License.java rename to core/src/main/java/org/owasp/dependencycheck/xml/pom/License.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/pom/Model.java b/core/src/main/java/org/owasp/dependencycheck/xml/pom/Model.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/pom/Model.java rename to core/src/main/java/org/owasp/dependencycheck/xml/pom/Model.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/pom/PomHandler.java b/core/src/main/java/org/owasp/dependencycheck/xml/pom/PomHandler.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/pom/PomHandler.java rename to core/src/main/java/org/owasp/dependencycheck/xml/pom/PomHandler.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/pom/PomParseException.java b/core/src/main/java/org/owasp/dependencycheck/xml/pom/PomParseException.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/pom/PomParseException.java rename to core/src/main/java/org/owasp/dependencycheck/xml/pom/PomParseException.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/pom/PomParser.java b/core/src/main/java/org/owasp/dependencycheck/xml/pom/PomParser.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/pom/PomParser.java rename to core/src/main/java/org/owasp/dependencycheck/xml/pom/PomParser.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/pom/PomUtils.java b/core/src/main/java/org/owasp/dependencycheck/xml/pom/PomUtils.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/pom/PomUtils.java rename to core/src/main/java/org/owasp/dependencycheck/xml/pom/PomUtils.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/pom/package-info.java b/core/src/main/java/org/owasp/dependencycheck/xml/pom/package-info.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/pom/package-info.java rename to core/src/main/java/org/owasp/dependencycheck/xml/pom/package-info.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/PropertyType.java b/core/src/main/java/org/owasp/dependencycheck/xml/suppression/PropertyType.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/PropertyType.java rename to core/src/main/java/org/owasp/dependencycheck/xml/suppression/PropertyType.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionErrorHandler.java b/core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionErrorHandler.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionErrorHandler.java rename to core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionErrorHandler.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionHandler.java b/core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionHandler.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionHandler.java rename to core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionHandler.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionParseException.java b/core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionParseException.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionParseException.java rename to core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionParseException.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionParser.java b/core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionParser.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionParser.java rename to core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionParser.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionRule.java b/core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionRule.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionRule.java rename to core/src/main/java/org/owasp/dependencycheck/xml/suppression/SuppressionRule.java diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/package-info.java b/core/src/main/java/org/owasp/dependencycheck/xml/suppression/package-info.java similarity index 100% rename from dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/suppression/package-info.java rename to core/src/main/java/org/owasp/dependencycheck/xml/suppression/package-info.java diff --git a/dependency-check-core/src/main/resources/GrokAssembly.exe b/core/src/main/resources/GrokAssembly.exe similarity index 100% rename from dependency-check-core/src/main/resources/GrokAssembly.exe rename to core/src/main/resources/GrokAssembly.exe diff --git a/dependency-check-core/src/main/resources/GrokAssembly.exe.config b/core/src/main/resources/GrokAssembly.exe.config similarity index 100% rename from dependency-check-core/src/main/resources/GrokAssembly.exe.config rename to core/src/main/resources/GrokAssembly.exe.config diff --git a/dependency-check-core/src/main/resources/META-INF/licenses/StupidTablePlugin/LICENSE.txt b/core/src/main/resources/META-INF/licenses/StupidTablePlugin/LICENSE.txt similarity index 100% rename from dependency-check-core/src/main/resources/META-INF/licenses/StupidTablePlugin/LICENSE.txt rename to core/src/main/resources/META-INF/licenses/StupidTablePlugin/LICENSE.txt diff --git a/dependency-check-core/src/main/resources/META-INF/licenses/commons-compress/LICENSE.txt b/core/src/main/resources/META-INF/licenses/commons-compress/LICENSE.txt similarity index 100% rename from dependency-check-core/src/main/resources/META-INF/licenses/commons-compress/LICENSE.txt rename to core/src/main/resources/META-INF/licenses/commons-compress/LICENSE.txt diff --git a/dependency-check-core/src/main/resources/META-INF/licenses/commons-io/LICENSE.txt b/core/src/main/resources/META-INF/licenses/commons-io/LICENSE.txt similarity index 100% rename from dependency-check-core/src/main/resources/META-INF/licenses/commons-io/LICENSE.txt rename to core/src/main/resources/META-INF/licenses/commons-io/LICENSE.txt diff --git a/dependency-check-core/src/main/resources/META-INF/licenses/cve/license.txt b/core/src/main/resources/META-INF/licenses/cve/license.txt similarity index 100% rename from dependency-check-core/src/main/resources/META-INF/licenses/cve/license.txt rename to core/src/main/resources/META-INF/licenses/cve/license.txt diff --git a/dependency-check-core/src/main/resources/META-INF/licenses/cwe/license.txt b/core/src/main/resources/META-INF/licenses/cwe/license.txt similarity index 100% rename from dependency-check-core/src/main/resources/META-INF/licenses/cwe/license.txt rename to core/src/main/resources/META-INF/licenses/cwe/license.txt diff --git a/dependency-check-core/src/main/resources/META-INF/licenses/h2database/license.txt b/core/src/main/resources/META-INF/licenses/h2database/license.txt similarity index 100% rename from dependency-check-core/src/main/resources/META-INF/licenses/h2database/license.txt rename to core/src/main/resources/META-INF/licenses/h2database/license.txt diff --git a/dependency-check-core/src/main/resources/META-INF/licenses/h2database/readme.txt b/core/src/main/resources/META-INF/licenses/h2database/readme.txt similarity index 100% rename from dependency-check-core/src/main/resources/META-INF/licenses/h2database/readme.txt rename to core/src/main/resources/META-INF/licenses/h2database/readme.txt diff --git a/dependency-check-core/src/main/resources/META-INF/licenses/jquery/MIT-LICENSE.txt b/core/src/main/resources/META-INF/licenses/jquery/MIT-LICENSE.txt similarity index 100% rename from dependency-check-core/src/main/resources/META-INF/licenses/jquery/MIT-LICENSE.txt rename to core/src/main/resources/META-INF/licenses/jquery/MIT-LICENSE.txt diff --git a/dependency-check-core/src/main/resources/META-INF/licenses/jsoup/LICENSE.txt b/core/src/main/resources/META-INF/licenses/jsoup/LICENSE.txt similarity index 100% rename from dependency-check-core/src/main/resources/META-INF/licenses/jsoup/LICENSE.txt rename to core/src/main/resources/META-INF/licenses/jsoup/LICENSE.txt diff --git a/dependency-check-core/src/main/resources/META-INF/licenses/lucene/LICENSE.txt b/core/src/main/resources/META-INF/licenses/lucene/LICENSE.txt similarity index 100% rename from dependency-check-core/src/main/resources/META-INF/licenses/lucene/LICENSE.txt rename to core/src/main/resources/META-INF/licenses/lucene/LICENSE.txt diff --git a/dependency-check-core/src/main/resources/META-INF/licenses/velocity/LICENSE.txt b/core/src/main/resources/META-INF/licenses/velocity/LICENSE.txt similarity index 100% rename from dependency-check-core/src/main/resources/META-INF/licenses/velocity/LICENSE.txt rename to core/src/main/resources/META-INF/licenses/velocity/LICENSE.txt diff --git a/dependency-check-core/src/main/resources/META-INF/services/org.owasp.dependencycheck.analyzer.Analyzer b/core/src/main/resources/META-INF/services/org.owasp.dependencycheck.analyzer.Analyzer similarity index 100% rename from dependency-check-core/src/main/resources/META-INF/services/org.owasp.dependencycheck.analyzer.Analyzer rename to core/src/main/resources/META-INF/services/org.owasp.dependencycheck.analyzer.Analyzer diff --git a/dependency-check-core/src/main/resources/META-INF/services/org.owasp.dependencycheck.data.update.CachedWebDataSource b/core/src/main/resources/META-INF/services/org.owasp.dependencycheck.data.update.CachedWebDataSource similarity index 100% rename from dependency-check-core/src/main/resources/META-INF/services/org.owasp.dependencycheck.data.update.CachedWebDataSource rename to core/src/main/resources/META-INF/services/org.owasp.dependencycheck.data.update.CachedWebDataSource diff --git a/dependency-check-core/src/main/resources/data/cwe.hashmap.serialized b/core/src/main/resources/data/cwe.hashmap.serialized similarity index 100% rename from dependency-check-core/src/main/resources/data/cwe.hashmap.serialized rename to core/src/main/resources/data/cwe.hashmap.serialized diff --git a/dependency-check-core/src/main/resources/data/dbStatements.properties b/core/src/main/resources/data/dbStatements.properties similarity index 100% rename from dependency-check-core/src/main/resources/data/dbStatements.properties rename to core/src/main/resources/data/dbStatements.properties diff --git a/dependency-check-core/src/main/resources/data/dbStatements_h2.properties b/core/src/main/resources/data/dbStatements_h2.properties similarity index 100% rename from dependency-check-core/src/main/resources/data/dbStatements_h2.properties rename to core/src/main/resources/data/dbStatements_h2.properties diff --git a/dependency-check-core/src/main/resources/data/dbStatements_mysql.properties b/core/src/main/resources/data/dbStatements_mysql.properties similarity index 100% rename from dependency-check-core/src/main/resources/data/dbStatements_mysql.properties rename to core/src/main/resources/data/dbStatements_mysql.properties diff --git a/dependency-check-core/src/main/resources/data/dbStatements_oracle.properties b/core/src/main/resources/data/dbStatements_oracle.properties similarity index 100% rename from dependency-check-core/src/main/resources/data/dbStatements_oracle.properties rename to core/src/main/resources/data/dbStatements_oracle.properties diff --git a/dependency-check-core/src/main/resources/data/dbStatements_postgresql.properties b/core/src/main/resources/data/dbStatements_postgresql.properties similarity index 100% rename from dependency-check-core/src/main/resources/data/dbStatements_postgresql.properties rename to core/src/main/resources/data/dbStatements_postgresql.properties diff --git a/dependency-check-core/src/main/resources/data/initialize.sql b/core/src/main/resources/data/initialize.sql similarity index 100% rename from dependency-check-core/src/main/resources/data/initialize.sql rename to core/src/main/resources/data/initialize.sql diff --git a/dependency-check-core/src/main/resources/data/initialize_mssql.sql b/core/src/main/resources/data/initialize_mssql.sql similarity index 100% rename from dependency-check-core/src/main/resources/data/initialize_mssql.sql rename to core/src/main/resources/data/initialize_mssql.sql diff --git a/dependency-check-core/src/main/resources/data/initialize_mysql.sql b/core/src/main/resources/data/initialize_mysql.sql similarity index 100% rename from dependency-check-core/src/main/resources/data/initialize_mysql.sql rename to core/src/main/resources/data/initialize_mysql.sql diff --git a/dependency-check-core/src/main/resources/data/initialize_oracle.sql b/core/src/main/resources/data/initialize_oracle.sql similarity index 100% rename from dependency-check-core/src/main/resources/data/initialize_oracle.sql rename to core/src/main/resources/data/initialize_oracle.sql diff --git a/dependency-check-core/src/main/resources/data/initialize_postgres.sql b/core/src/main/resources/data/initialize_postgres.sql similarity index 100% rename from dependency-check-core/src/main/resources/data/initialize_postgres.sql rename to core/src/main/resources/data/initialize_postgres.sql diff --git a/dependency-check-core/src/main/resources/data/upgrade_2.9.sql b/core/src/main/resources/data/upgrade_2.9.sql similarity index 100% rename from dependency-check-core/src/main/resources/data/upgrade_2.9.sql rename to core/src/main/resources/data/upgrade_2.9.sql diff --git a/dependency-check-core/src/main/resources/data/upgrade_3.0.sql b/core/src/main/resources/data/upgrade_3.0.sql similarity index 100% rename from dependency-check-core/src/main/resources/data/upgrade_3.0.sql rename to core/src/main/resources/data/upgrade_3.0.sql diff --git a/dependency-check-core/src/main/resources/data/upgrade_mysql_2.9.sql b/core/src/main/resources/data/upgrade_mysql_2.9.sql similarity index 100% rename from dependency-check-core/src/main/resources/data/upgrade_mysql_2.9.sql rename to core/src/main/resources/data/upgrade_mysql_2.9.sql diff --git a/dependency-check-core/src/main/resources/dependencycheck-base-hint.xml b/core/src/main/resources/dependencycheck-base-hint.xml similarity index 100% rename from dependency-check-core/src/main/resources/dependencycheck-base-hint.xml rename to core/src/main/resources/dependencycheck-base-hint.xml diff --git a/dependency-check-core/src/main/resources/dependencycheck-base-suppression.xml b/core/src/main/resources/dependencycheck-base-suppression.xml similarity index 100% rename from dependency-check-core/src/main/resources/dependencycheck-base-suppression.xml rename to core/src/main/resources/dependencycheck-base-suppression.xml diff --git a/dependency-check-core/src/main/resources/dependencycheck.properties b/core/src/main/resources/dependencycheck.properties similarity index 100% rename from dependency-check-core/src/main/resources/dependencycheck.properties rename to core/src/main/resources/dependencycheck.properties diff --git a/dependency-check-core/src/main/resources/schema/cpe/cpe-dictionary_2.2.xsd b/core/src/main/resources/schema/cpe/cpe-dictionary_2.2.xsd similarity index 100% rename from dependency-check-core/src/main/resources/schema/cpe/cpe-dictionary_2.2.xsd rename to core/src/main/resources/schema/cpe/cpe-dictionary_2.2.xsd diff --git a/dependency-check-core/src/main/resources/schema/dependency-check.1.3.xsd b/core/src/main/resources/schema/dependency-check.1.3.xsd similarity index 100% rename from dependency-check-core/src/main/resources/schema/dependency-check.1.3.xsd rename to core/src/main/resources/schema/dependency-check.1.3.xsd diff --git a/dependency-check-core/src/main/resources/schema/dependency-check.1.4.xsd b/core/src/main/resources/schema/dependency-check.1.4.xsd similarity index 100% rename from dependency-check-core/src/main/resources/schema/dependency-check.1.4.xsd rename to core/src/main/resources/schema/dependency-check.1.4.xsd diff --git a/dependency-check-core/src/main/resources/schema/dependency-check.1.5.xsd b/core/src/main/resources/schema/dependency-check.1.5.xsd similarity index 100% rename from dependency-check-core/src/main/resources/schema/dependency-check.1.5.xsd rename to core/src/main/resources/schema/dependency-check.1.5.xsd diff --git a/dependency-check-core/src/main/resources/schema/dependency-check.1.6.xsd b/core/src/main/resources/schema/dependency-check.1.6.xsd similarity index 100% rename from dependency-check-core/src/main/resources/schema/dependency-check.1.6.xsd rename to core/src/main/resources/schema/dependency-check.1.6.xsd diff --git a/dependency-check-core/src/main/resources/schema/dependency-hint.1.0.xsd b/core/src/main/resources/schema/dependency-hint.1.0.xsd similarity index 100% rename from dependency-check-core/src/main/resources/schema/dependency-hint.1.0.xsd rename to core/src/main/resources/schema/dependency-hint.1.0.xsd diff --git a/dependency-check-core/src/main/resources/schema/dependency-hint.1.1.xsd b/core/src/main/resources/schema/dependency-hint.1.1.xsd similarity index 100% rename from dependency-check-core/src/main/resources/schema/dependency-hint.1.1.xsd rename to core/src/main/resources/schema/dependency-hint.1.1.xsd diff --git a/dependency-check-core/src/main/resources/schema/dependency-hint.1.2.xsd b/core/src/main/resources/schema/dependency-hint.1.2.xsd similarity index 100% rename from dependency-check-core/src/main/resources/schema/dependency-hint.1.2.xsd rename to core/src/main/resources/schema/dependency-hint.1.2.xsd diff --git a/dependency-check-core/src/main/resources/schema/dependency-hint.1.3.xsd b/core/src/main/resources/schema/dependency-hint.1.3.xsd similarity index 100% rename from dependency-check-core/src/main/resources/schema/dependency-hint.1.3.xsd rename to core/src/main/resources/schema/dependency-hint.1.3.xsd diff --git a/dependency-check-core/src/main/resources/schema/dependency-suppression.1.1.xsd b/core/src/main/resources/schema/dependency-suppression.1.1.xsd similarity index 100% rename from dependency-check-core/src/main/resources/schema/dependency-suppression.1.1.xsd rename to core/src/main/resources/schema/dependency-suppression.1.1.xsd diff --git a/dependency-check-core/src/main/resources/schema/nvdcve/1_2/nvdcve.xsd b/core/src/main/resources/schema/nvdcve/1_2/nvdcve.xsd similarity index 100% rename from dependency-check-core/src/main/resources/schema/nvdcve/1_2/nvdcve.xsd rename to core/src/main/resources/schema/nvdcve/1_2/nvdcve.xsd diff --git a/dependency-check-core/src/main/resources/schema/nvdcve/2_0/cce_0.1.xsd b/core/src/main/resources/schema/nvdcve/2_0/cce_0.1.xsd similarity index 100% rename from dependency-check-core/src/main/resources/schema/nvdcve/2_0/cce_0.1.xsd rename to core/src/main/resources/schema/nvdcve/2_0/cce_0.1.xsd diff --git a/dependency-check-core/src/main/resources/schema/nvdcve/2_0/cpe-language_2.1.xsd b/core/src/main/resources/schema/nvdcve/2_0/cpe-language_2.1.xsd similarity index 100% rename from dependency-check-core/src/main/resources/schema/nvdcve/2_0/cpe-language_2.1.xsd rename to core/src/main/resources/schema/nvdcve/2_0/cpe-language_2.1.xsd diff --git a/dependency-check-core/src/main/resources/schema/nvdcve/2_0/cve_0.1.xsd b/core/src/main/resources/schema/nvdcve/2_0/cve_0.1.xsd similarity index 100% rename from dependency-check-core/src/main/resources/schema/nvdcve/2_0/cve_0.1.xsd rename to core/src/main/resources/schema/nvdcve/2_0/cve_0.1.xsd diff --git a/dependency-check-core/src/main/resources/schema/nvdcve/2_0/cvss-v2_0.2.xsd b/core/src/main/resources/schema/nvdcve/2_0/cvss-v2_0.2.xsd similarity index 100% rename from dependency-check-core/src/main/resources/schema/nvdcve/2_0/cvss-v2_0.2.xsd rename to core/src/main/resources/schema/nvdcve/2_0/cvss-v2_0.2.xsd diff --git a/dependency-check-core/src/main/resources/schema/nvdcve/2_0/nvd-cve-feed_2.0.xsd b/core/src/main/resources/schema/nvdcve/2_0/nvd-cve-feed_2.0.xsd similarity index 100% rename from dependency-check-core/src/main/resources/schema/nvdcve/2_0/nvd-cve-feed_2.0.xsd rename to core/src/main/resources/schema/nvdcve/2_0/nvd-cve-feed_2.0.xsd diff --git a/dependency-check-core/src/main/resources/schema/nvdcve/2_0/patch_0.1.xsd b/core/src/main/resources/schema/nvdcve/2_0/patch_0.1.xsd similarity index 100% rename from dependency-check-core/src/main/resources/schema/nvdcve/2_0/patch_0.1.xsd rename to core/src/main/resources/schema/nvdcve/2_0/patch_0.1.xsd diff --git a/dependency-check-core/src/main/resources/schema/nvdcve/2_0/scap-core_0.1.xsd b/core/src/main/resources/schema/nvdcve/2_0/scap-core_0.1.xsd similarity index 100% rename from dependency-check-core/src/main/resources/schema/nvdcve/2_0/scap-core_0.1.xsd rename to core/src/main/resources/schema/nvdcve/2_0/scap-core_0.1.xsd diff --git a/dependency-check-core/src/main/resources/schema/nvdcve/2_0/vulnerability_0.4.xsd b/core/src/main/resources/schema/nvdcve/2_0/vulnerability_0.4.xsd similarity index 100% rename from dependency-check-core/src/main/resources/schema/nvdcve/2_0/vulnerability_0.4.xsd rename to core/src/main/resources/schema/nvdcve/2_0/vulnerability_0.4.xsd diff --git a/dependency-check-core/src/main/resources/schema/pom/generateBindings.bat b/core/src/main/resources/schema/pom/generateBindings.bat similarity index 100% rename from dependency-check-core/src/main/resources/schema/pom/generateBindings.bat rename to core/src/main/resources/schema/pom/generateBindings.bat diff --git a/dependency-check-core/src/main/resources/schema/pom/generateBindings.sh b/core/src/main/resources/schema/pom/generateBindings.sh similarity index 100% rename from dependency-check-core/src/main/resources/schema/pom/generateBindings.sh rename to core/src/main/resources/schema/pom/generateBindings.sh diff --git a/dependency-check-core/src/main/resources/schema/pom/maven-v4_0_0.xsd b/core/src/main/resources/schema/pom/maven-v4_0_0.xsd similarity index 100% rename from dependency-check-core/src/main/resources/schema/pom/maven-v4_0_0.xsd rename to core/src/main/resources/schema/pom/maven-v4_0_0.xsd diff --git a/dependency-check-core/src/main/resources/schema/suppression.xsd b/core/src/main/resources/schema/suppression.xsd similarity index 100% rename from dependency-check-core/src/main/resources/schema/suppression.xsd rename to core/src/main/resources/schema/suppression.xsd diff --git a/dependency-check-core/src/main/resources/templates/csvReport.vsl b/core/src/main/resources/templates/csvReport.vsl similarity index 100% rename from dependency-check-core/src/main/resources/templates/csvReport.vsl rename to core/src/main/resources/templates/csvReport.vsl diff --git a/dependency-check-core/src/main/resources/templates/htmlReport.vsl b/core/src/main/resources/templates/htmlReport.vsl similarity index 100% rename from dependency-check-core/src/main/resources/templates/htmlReport.vsl rename to core/src/main/resources/templates/htmlReport.vsl diff --git a/dependency-check-core/src/main/resources/templates/img/minus.gif b/core/src/main/resources/templates/img/minus.gif similarity index 100% rename from dependency-check-core/src/main/resources/templates/img/minus.gif rename to core/src/main/resources/templates/img/minus.gif diff --git a/dependency-check-core/src/main/resources/templates/img/plus.gif b/core/src/main/resources/templates/img/plus.gif similarity index 100% rename from dependency-check-core/src/main/resources/templates/img/plus.gif rename to core/src/main/resources/templates/img/plus.gif diff --git a/dependency-check-core/src/main/resources/templates/jsonReport.vsl b/core/src/main/resources/templates/jsonReport.vsl similarity index 100% rename from dependency-check-core/src/main/resources/templates/jsonReport.vsl rename to core/src/main/resources/templates/jsonReport.vsl diff --git a/dependency-check-core/src/main/resources/templates/scripts/jquery-1.8.0.min.js b/core/src/main/resources/templates/scripts/jquery-1.8.0.min.js similarity index 100% rename from dependency-check-core/src/main/resources/templates/scripts/jquery-1.8.0.min.js rename to core/src/main/resources/templates/scripts/jquery-1.8.0.min.js diff --git a/dependency-check-core/src/main/resources/templates/vulnReport.vsl b/core/src/main/resources/templates/vulnReport.vsl similarity index 100% rename from dependency-check-core/src/main/resources/templates/vulnReport.vsl rename to core/src/main/resources/templates/vulnReport.vsl diff --git a/dependency-check-core/src/main/resources/templates/xmlReport.vsl b/core/src/main/resources/templates/xmlReport.vsl similarity index 100% rename from dependency-check-core/src/main/resources/templates/xmlReport.vsl rename to core/src/main/resources/templates/xmlReport.vsl diff --git a/dependency-check-core/src/site/markdown/index.md b/core/src/site/markdown/index.md similarity index 100% rename from dependency-check-core/src/site/markdown/index.md rename to core/src/site/markdown/index.md diff --git a/dependency-check-core/src/site/resources/images/dc-core.svg b/core/src/site/resources/images/dc-core.svg similarity index 100% rename from dependency-check-core/src/site/resources/images/dc-core.svg rename to core/src/site/resources/images/dc-core.svg diff --git a/dependency-check-core/src/site/site.xml b/core/src/site/site.xml similarity index 100% rename from dependency-check-core/src/site/site.xml rename to core/src/site/site.xml diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/AnalysisTaskTest.java b/core/src/test/java/org/owasp/dependencycheck/AnalysisTaskTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/AnalysisTaskTest.java rename to core/src/test/java/org/owasp/dependencycheck/AnalysisTaskTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/BaseDBTestCase.java b/core/src/test/java/org/owasp/dependencycheck/BaseDBTestCase.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/BaseDBTestCase.java rename to core/src/test/java/org/owasp/dependencycheck/BaseDBTestCase.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/BaseTest.java b/core/src/test/java/org/owasp/dependencycheck/BaseTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/BaseTest.java rename to core/src/test/java/org/owasp/dependencycheck/BaseTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineIT.java b/core/src/test/java/org/owasp/dependencycheck/EngineIT.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineIT.java rename to core/src/test/java/org/owasp/dependencycheck/EngineIT.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineModeIT.java b/core/src/test/java/org/owasp/dependencycheck/EngineModeIT.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineModeIT.java rename to core/src/test/java/org/owasp/dependencycheck/EngineModeIT.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineTest.java b/core/src/test/java/org/owasp/dependencycheck/EngineTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineTest.java rename to core/src/test/java/org/owasp/dependencycheck/EngineTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AbstractFileTypeAnalyzerTest.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/AbstractFileTypeAnalyzerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AbstractFileTypeAnalyzerTest.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/AbstractFileTypeAnalyzerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzerTest.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzerTest.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AnalyzerServiceTest.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/AnalyzerServiceTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AnalyzerServiceTest.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/AnalyzerServiceTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerIT.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerIT.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerIT.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerIT.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerTest.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerTest.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AutoconfAnalyzerTest.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/AutoconfAnalyzerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AutoconfAnalyzerTest.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/AutoconfAnalyzerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CMakeAnalyzerTest.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/CMakeAnalyzerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CMakeAnalyzerTest.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/CMakeAnalyzerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerIT.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerIT.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerIT.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerIT.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerTest.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerTest.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CentralAnalyzerTest.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/CentralAnalyzerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CentralAnalyzerTest.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/CentralAnalyzerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ComposerLockAnalyzerTest.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/ComposerLockAnalyzerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ComposerLockAnalyzerTest.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/ComposerLockAnalyzerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzerIT.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzerIT.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzerIT.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzerIT.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzerTest.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzerTest.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzerTest.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzerTest.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/FileNameAnalyzerTest.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/FileNameAnalyzerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/FileNameAnalyzerTest.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/FileNameAnalyzerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/HintAnalyzerTest.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/HintAnalyzerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/HintAnalyzerTest.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/HintAnalyzerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/JarAnalyzerTest.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/JarAnalyzerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/JarAnalyzerTest.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/JarAnalyzerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/NodePackageAnalyzerTest.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/NodePackageAnalyzerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/NodePackageAnalyzerTest.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/NodePackageAnalyzerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/NspAnalyzerTest.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/NspAnalyzerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/NspAnalyzerTest.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/NspAnalyzerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/NuspecAnalyzerTest.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/NuspecAnalyzerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/NuspecAnalyzerTest.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/NuspecAnalyzerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/OpenSSLAnalyzerTest.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/OpenSSLAnalyzerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/OpenSSLAnalyzerTest.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/OpenSSLAnalyzerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/PythonDistributionAnalyzerTest.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/PythonDistributionAnalyzerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/PythonDistributionAnalyzerTest.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/PythonDistributionAnalyzerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/PythonPackageAnalyzerTest.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/PythonPackageAnalyzerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/PythonPackageAnalyzerTest.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/PythonPackageAnalyzerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzerIT.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzerIT.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzerIT.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzerIT.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/RubyBundlerAnalyzerTest.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/RubyBundlerAnalyzerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/RubyBundlerAnalyzerTest.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/RubyBundlerAnalyzerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/RubyGemspecAnalyzerTest.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/RubyGemspecAnalyzerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/RubyGemspecAnalyzerTest.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/RubyGemspecAnalyzerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/SwiftAnalyzersTest.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/SwiftAnalyzersTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/SwiftAnalyzersTest.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/SwiftAnalyzersTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VersionFilterAnalyzerTest.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/VersionFilterAnalyzerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VersionFilterAnalyzerTest.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/VersionFilterAnalyzerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerIT.java b/core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerIT.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerIT.java rename to core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerIT.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/central/CentralSearchTest.java b/core/src/test/java/org/owasp/dependencycheck/data/central/CentralSearchTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/central/CentralSearchTest.java rename to core/src/test/java/org/owasp/dependencycheck/data/central/CentralSearchTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/composer/ComposerLockParserTest.java b/core/src/test/java/org/owasp/dependencycheck/data/composer/ComposerLockParserTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/composer/ComposerLockParserTest.java rename to core/src/test/java/org/owasp/dependencycheck/data/composer/ComposerLockParserTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/cpe/IndexEntryTest.java b/core/src/test/java/org/owasp/dependencycheck/data/cpe/IndexEntryTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/cpe/IndexEntryTest.java rename to core/src/test/java/org/owasp/dependencycheck/data/cpe/IndexEntryTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/cwe/CweDBTest.java b/core/src/test/java/org/owasp/dependencycheck/data/cwe/CweDBTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/cwe/CweDBTest.java rename to core/src/test/java/org/owasp/dependencycheck/data/cwe/CweDBTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/AlphaNumericFilterTest.java b/core/src/test/java/org/owasp/dependencycheck/data/lucene/AlphaNumericFilterTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/AlphaNumericFilterTest.java rename to core/src/test/java/org/owasp/dependencycheck/data/lucene/AlphaNumericFilterTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/FieldAnalyzerTest.java b/core/src/test/java/org/owasp/dependencycheck/data/lucene/FieldAnalyzerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/FieldAnalyzerTest.java rename to core/src/test/java/org/owasp/dependencycheck/data/lucene/FieldAnalyzerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/LuceneUtilsTest.java b/core/src/test/java/org/owasp/dependencycheck/data/lucene/LuceneUtilsTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/LuceneUtilsTest.java rename to core/src/test/java/org/owasp/dependencycheck/data/lucene/LuceneUtilsTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/SearchFieldAnalyzerTest.java b/core/src/test/java/org/owasp/dependencycheck/data/lucene/SearchFieldAnalyzerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/SearchFieldAnalyzerTest.java rename to core/src/test/java/org/owasp/dependencycheck/data/lucene/SearchFieldAnalyzerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilterTest.java b/core/src/test/java/org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilterTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilterTest.java rename to core/src/test/java/org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilterTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/UrlTokenizingFilterTest.java b/core/src/test/java/org/owasp/dependencycheck/data/lucene/UrlTokenizingFilterTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/UrlTokenizingFilterTest.java rename to core/src/test/java/org/owasp/dependencycheck/data/lucene/UrlTokenizingFilterTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nexus/NexusSearchTest.java b/core/src/test/java/org/owasp/dependencycheck/data/nexus/NexusSearchTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nexus/NexusSearchTest.java rename to core/src/test/java/org/owasp/dependencycheck/data/nexus/NexusSearchTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nsp/NspSearchTest.java b/core/src/test/java/org/owasp/dependencycheck/data/nsp/NspSearchTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nsp/NspSearchTest.java rename to core/src/test/java/org/owasp/dependencycheck/data/nsp/NspSearchTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nsp/SanitizePackageTest.java b/core/src/test/java/org/owasp/dependencycheck/data/nsp/SanitizePackageTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nsp/SanitizePackageTest.java rename to core/src/test/java/org/owasp/dependencycheck/data/nsp/SanitizePackageTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nuget/XPathNuspecParserTest.java b/core/src/test/java/org/owasp/dependencycheck/data/nuget/XPathNuspecParserTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nuget/XPathNuspecParserTest.java rename to core/src/test/java/org/owasp/dependencycheck/data/nuget/XPathNuspecParserTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactoryTest.java b/core/src/test/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactoryTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactoryTest.java rename to core/src/test/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactoryTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIT.java b/core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIT.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIT.java rename to core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIT.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBMySqlIT.java b/core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBMySqlIT.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBMySqlIT.java rename to core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBMySqlIT.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesIT.java b/core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesIT.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesIT.java rename to core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesIT.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DriverLoaderTest.java b/core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DriverLoaderTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DriverLoaderTest.java rename to core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DriverLoaderTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/EngineVersionCheckTest.java b/core/src/test/java/org/owasp/dependencycheck/data/update/EngineVersionCheckTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/EngineVersionCheckTest.java rename to core/src/test/java/org/owasp/dependencycheck/data/update/EngineVersionCheckTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/NvdCveUpdaterIT.java b/core/src/test/java/org/owasp/dependencycheck/data/update/NvdCveUpdaterIT.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/NvdCveUpdaterIT.java rename to core/src/test/java/org/owasp/dependencycheck/data/update/NvdCveUpdaterIT.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/nvd/DownloadTaskTest.java b/core/src/test/java/org/owasp/dependencycheck/data/update/nvd/DownloadTaskTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/nvd/DownloadTaskTest.java rename to core/src/test/java/org/owasp/dependencycheck/data/update/nvd/DownloadTaskTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/nvd/NvdCveInfoTest.java b/core/src/test/java/org/owasp/dependencycheck/data/update/nvd/NvdCveInfoTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/nvd/NvdCveInfoTest.java rename to core/src/test/java/org/owasp/dependencycheck/data/update/nvd/NvdCveInfoTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/nvd/NvdCve_1_2_HandlerTest.java b/core/src/test/java/org/owasp/dependencycheck/data/update/nvd/NvdCve_1_2_HandlerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/nvd/NvdCve_1_2_HandlerTest.java rename to core/src/test/java/org/owasp/dependencycheck/data/update/nvd/NvdCve_1_2_HandlerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/nvd/NvdCve_2_0_HandlerTest.java b/core/src/test/java/org/owasp/dependencycheck/data/update/nvd/NvdCve_2_0_HandlerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/nvd/NvdCve_2_0_HandlerTest.java rename to core/src/test/java/org/owasp/dependencycheck/data/update/nvd/NvdCve_2_0_HandlerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/nvd/UpdateableNvdCveTest.java b/core/src/test/java/org/owasp/dependencycheck/data/update/nvd/UpdateableNvdCveTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/nvd/UpdateableNvdCveTest.java rename to core/src/test/java/org/owasp/dependencycheck/data/update/nvd/UpdateableNvdCveTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/dependency/DependencyTest.java b/core/src/test/java/org/owasp/dependencycheck/dependency/DependencyTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/dependency/DependencyTest.java rename to core/src/test/java/org/owasp/dependencycheck/dependency/DependencyTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/dependency/EvidenceTest.java b/core/src/test/java/org/owasp/dependencycheck/dependency/EvidenceTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/dependency/EvidenceTest.java rename to core/src/test/java/org/owasp/dependencycheck/dependency/EvidenceTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/dependency/VulnerabilityTest.java b/core/src/test/java/org/owasp/dependencycheck/dependency/VulnerabilityTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/dependency/VulnerabilityTest.java rename to core/src/test/java/org/owasp/dependencycheck/dependency/VulnerabilityTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/dependency/VulnerableSoftwareTest.java b/core/src/test/java/org/owasp/dependencycheck/dependency/VulnerableSoftwareTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/dependency/VulnerableSoftwareTest.java rename to core/src/test/java/org/owasp/dependencycheck/dependency/VulnerableSoftwareTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/EscapeToolTest.java b/core/src/test/java/org/owasp/dependencycheck/reporting/EscapeToolTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/EscapeToolTest.java rename to core/src/test/java/org/owasp/dependencycheck/reporting/EscapeToolTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorIT.java b/core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorIT.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorIT.java rename to core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorIT.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/DateUtilTest.java b/core/src/test/java/org/owasp/dependencycheck/utils/DateUtilTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/DateUtilTest.java rename to core/src/test/java/org/owasp/dependencycheck/utils/DateUtilTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/DependencyVersionTest.java b/core/src/test/java/org/owasp/dependencycheck/utils/DependencyVersionTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/DependencyVersionTest.java rename to core/src/test/java/org/owasp/dependencycheck/utils/DependencyVersionTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/DependencyVersionUtilTest.java b/core/src/test/java/org/owasp/dependencycheck/utils/DependencyVersionUtilTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/DependencyVersionUtilTest.java rename to core/src/test/java/org/owasp/dependencycheck/utils/DependencyVersionUtilTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/FilterTest.java b/core/src/test/java/org/owasp/dependencycheck/utils/FilterTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/FilterTest.java rename to core/src/test/java/org/owasp/dependencycheck/utils/FilterTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/UrlStringUtilsTest.java b/core/src/test/java/org/owasp/dependencycheck/utils/UrlStringUtilsTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/UrlStringUtilsTest.java rename to core/src/test/java/org/owasp/dependencycheck/utils/UrlStringUtilsTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/XmlEntityTest.java b/core/src/test/java/org/owasp/dependencycheck/xml/XmlEntityTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/XmlEntityTest.java rename to core/src/test/java/org/owasp/dependencycheck/xml/XmlEntityTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/XmlInputStreamTest.java b/core/src/test/java/org/owasp/dependencycheck/xml/XmlInputStreamTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/XmlInputStreamTest.java rename to core/src/test/java/org/owasp/dependencycheck/xml/XmlInputStreamTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/hints/EvidenceMatcherTest.java b/core/src/test/java/org/owasp/dependencycheck/xml/hints/EvidenceMatcherTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/hints/EvidenceMatcherTest.java rename to core/src/test/java/org/owasp/dependencycheck/xml/hints/EvidenceMatcherTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/hints/HintHandlerTest.java b/core/src/test/java/org/owasp/dependencycheck/xml/hints/HintHandlerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/hints/HintHandlerTest.java rename to core/src/test/java/org/owasp/dependencycheck/xml/hints/HintHandlerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/hints/HintParserTest.java b/core/src/test/java/org/owasp/dependencycheck/xml/hints/HintParserTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/hints/HintParserTest.java rename to core/src/test/java/org/owasp/dependencycheck/xml/hints/HintParserTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/pom/ModelTest.java b/core/src/test/java/org/owasp/dependencycheck/xml/pom/ModelTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/pom/ModelTest.java rename to core/src/test/java/org/owasp/dependencycheck/xml/pom/ModelTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/pom/PomUtilsTest.java b/core/src/test/java/org/owasp/dependencycheck/xml/pom/PomUtilsTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/pom/PomUtilsTest.java rename to core/src/test/java/org/owasp/dependencycheck/xml/pom/PomUtilsTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/suppression/PropertyTypeTest.java b/core/src/test/java/org/owasp/dependencycheck/xml/suppression/PropertyTypeTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/suppression/PropertyTypeTest.java rename to core/src/test/java/org/owasp/dependencycheck/xml/suppression/PropertyTypeTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/suppression/SuppressionHandlerTest.java b/core/src/test/java/org/owasp/dependencycheck/xml/suppression/SuppressionHandlerTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/suppression/SuppressionHandlerTest.java rename to core/src/test/java/org/owasp/dependencycheck/xml/suppression/SuppressionHandlerTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/suppression/SuppressionParserTest.java b/core/src/test/java/org/owasp/dependencycheck/xml/suppression/SuppressionParserTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/suppression/SuppressionParserTest.java rename to core/src/test/java/org/owasp/dependencycheck/xml/suppression/SuppressionParserTest.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/suppression/SuppressionRuleTest.java b/core/src/test/java/org/owasp/dependencycheck/xml/suppression/SuppressionRuleTest.java similarity index 100% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/suppression/SuppressionRuleTest.java rename to core/src/test/java/org/owasp/dependencycheck/xml/suppression/SuppressionRuleTest.java diff --git a/dependency-check-core/src/test/resources/._avro-ipc-1.5.0.jar b/core/src/test/resources/._avro-ipc-1.5.0.jar similarity index 100% rename from dependency-check-core/src/test/resources/._avro-ipc-1.5.0.jar rename to core/src/test/resources/._avro-ipc-1.5.0.jar diff --git a/dependency-check-core/src/test/resources/FileHelpers.2.0.0.0.nupkg b/core/src/test/resources/FileHelpers.2.0.0.0.nupkg similarity index 100% rename from dependency-check-core/src/test/resources/FileHelpers.2.0.0.0.nupkg rename to core/src/test/resources/FileHelpers.2.0.0.0.nupkg diff --git a/dependency-check-core/src/test/resources/MANIFEST.MF b/core/src/test/resources/MANIFEST.MF similarity index 100% rename from dependency-check-core/src/test/resources/MANIFEST.MF rename to core/src/test/resources/MANIFEST.MF diff --git a/dependency-check-core/src/test/resources/autoconf/binutils/config.in b/core/src/test/resources/autoconf/binutils/config.in similarity index 100% rename from dependency-check-core/src/test/resources/autoconf/binutils/config.in rename to core/src/test/resources/autoconf/binutils/config.in diff --git a/dependency-check-core/src/test/resources/autoconf/binutils/configure b/core/src/test/resources/autoconf/binutils/configure similarity index 100% rename from dependency-check-core/src/test/resources/autoconf/binutils/configure rename to core/src/test/resources/autoconf/binutils/configure diff --git a/dependency-check-core/src/test/resources/autoconf/binutils/configure.ac b/core/src/test/resources/autoconf/binutils/configure.ac similarity index 100% rename from dependency-check-core/src/test/resources/autoconf/binutils/configure.ac rename to core/src/test/resources/autoconf/binutils/configure.ac diff --git a/dependency-check-core/src/test/resources/autoconf/ghostscript/configure.ac b/core/src/test/resources/autoconf/ghostscript/configure.ac similarity index 100% rename from dependency-check-core/src/test/resources/autoconf/ghostscript/configure.ac rename to core/src/test/resources/autoconf/ghostscript/configure.ac diff --git a/dependency-check-core/src/test/resources/autoconf/readable-code/configure b/core/src/test/resources/autoconf/readable-code/configure similarity index 100% rename from dependency-check-core/src/test/resources/autoconf/readable-code/configure rename to core/src/test/resources/autoconf/readable-code/configure diff --git a/dependency-check-core/src/test/resources/autoconf/readable-code/configure.ac b/core/src/test/resources/autoconf/readable-code/configure.ac similarity index 100% rename from dependency-check-core/src/test/resources/autoconf/readable-code/configure.ac rename to core/src/test/resources/autoconf/readable-code/configure.ac diff --git a/dependency-check-core/src/test/resources/avro-ipc-1.5.0.jar b/core/src/test/resources/avro-ipc-1.5.0.jar similarity index 100% rename from dependency-check-core/src/test/resources/avro-ipc-1.5.0.jar rename to core/src/test/resources/avro-ipc-1.5.0.jar diff --git a/dependency-check-core/src/test/resources/bootable-0.1.0.jar b/core/src/test/resources/bootable-0.1.0.jar similarity index 100% rename from dependency-check-core/src/test/resources/bootable-0.1.0.jar rename to core/src/test/resources/bootable-0.1.0.jar diff --git a/dependency-check-core/src/test/resources/cmake/README.md b/core/src/test/resources/cmake/README.md similarity index 100% rename from dependency-check-core/src/test/resources/cmake/README.md rename to core/src/test/resources/cmake/README.md diff --git a/dependency-check-core/src/test/resources/cmake/opencv/3rdparty/ffmpeg/ffmpeg_version.cmake b/core/src/test/resources/cmake/opencv/3rdparty/ffmpeg/ffmpeg_version.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/3rdparty/ffmpeg/ffmpeg_version.cmake rename to core/src/test/resources/cmake/opencv/3rdparty/ffmpeg/ffmpeg_version.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/CMakeLists.txt b/core/src/test/resources/cmake/opencv/CMakeLists.txt similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/CMakeLists.txt rename to core/src/test/resources/cmake/opencv/CMakeLists.txt diff --git a/dependency-check-core/src/test/resources/cmake/opencv/LICENSE b/core/src/test/resources/cmake/opencv/LICENSE similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/LICENSE rename to core/src/test/resources/cmake/opencv/LICENSE diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/FindCUDA.cmake b/core/src/test/resources/cmake/opencv/cmake/FindCUDA.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/FindCUDA.cmake rename to core/src/test/resources/cmake/opencv/cmake/FindCUDA.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/FindCUDA/make2cmake.cmake b/core/src/test/resources/cmake/opencv/cmake/FindCUDA/make2cmake.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/FindCUDA/make2cmake.cmake rename to core/src/test/resources/cmake/opencv/cmake/FindCUDA/make2cmake.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/FindCUDA/parse_cubin.cmake b/core/src/test/resources/cmake/opencv/cmake/FindCUDA/parse_cubin.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/FindCUDA/parse_cubin.cmake rename to core/src/test/resources/cmake/opencv/cmake/FindCUDA/parse_cubin.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/FindCUDA/run_nvcc.cmake b/core/src/test/resources/cmake/opencv/cmake/FindCUDA/run_nvcc.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/FindCUDA/run_nvcc.cmake rename to core/src/test/resources/cmake/opencv/cmake/FindCUDA/run_nvcc.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVCRTLinkage.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVCRTLinkage.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVCRTLinkage.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVCRTLinkage.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVCompilerOptions.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVCompilerOptions.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVCompilerOptions.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVCompilerOptions.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVConfig.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVConfig.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVConfig.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVConfig.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVDetectAndroidSDK.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVDetectAndroidSDK.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVDetectAndroidSDK.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVDetectAndroidSDK.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVDetectApacheAnt.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVDetectApacheAnt.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVDetectApacheAnt.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVDetectApacheAnt.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVDetectCStripes.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVDetectCStripes.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVDetectCStripes.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVDetectCStripes.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVDetectCUDA.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVDetectCUDA.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVDetectCUDA.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVDetectCUDA.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVDetectCXXCompiler.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVDetectCXXCompiler.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVDetectCXXCompiler.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVDetectCXXCompiler.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVDetectDirectX.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVDetectDirectX.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVDetectDirectX.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVDetectDirectX.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVDetectOpenCL.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVDetectOpenCL.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVDetectOpenCL.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVDetectOpenCL.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVDetectPython.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVDetectPython.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVDetectPython.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVDetectPython.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVDetectTBB.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVDetectTBB.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVDetectTBB.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVDetectTBB.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVDetectVTK.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVDetectVTK.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVDetectVTK.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVDetectVTK.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVExtraTargets.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVExtraTargets.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVExtraTargets.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVExtraTargets.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindIPP.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVFindIPP.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindIPP.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVFindIPP.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindIPPAsync.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVFindIPPAsync.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindIPPAsync.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVFindIPPAsync.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindIntelPerCSDK.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVFindIntelPerCSDK.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindIntelPerCSDK.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVFindIntelPerCSDK.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindLATEX.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVFindLATEX.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindLATEX.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVFindLATEX.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindLibsGUI.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVFindLibsGUI.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindLibsGUI.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVFindLibsGUI.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindLibsGrfmt.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVFindLibsGrfmt.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindLibsGrfmt.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVFindLibsGrfmt.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindLibsPerf.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVFindLibsPerf.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindLibsPerf.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVFindLibsPerf.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindLibsVideo.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVFindLibsVideo.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindLibsVideo.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVFindLibsVideo.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindMatlab.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVFindMatlab.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindMatlab.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVFindMatlab.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindOpenEXR.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVFindOpenEXR.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindOpenEXR.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVFindOpenEXR.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindOpenNI.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVFindOpenNI.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindOpenNI.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVFindOpenNI.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindOpenNI2.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVFindOpenNI2.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindOpenNI2.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVFindOpenNI2.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindWebP.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVFindWebP.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindWebP.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVFindWebP.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindXimea.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVFindXimea.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVFindXimea.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVFindXimea.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVGenABI.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVGenABI.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVGenABI.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVGenABI.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVGenAndroidMK.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVGenAndroidMK.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVGenAndroidMK.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVGenAndroidMK.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVGenConfig.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVGenConfig.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVGenConfig.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVGenConfig.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVGenHeaders.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVGenHeaders.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVGenHeaders.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVGenHeaders.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVGenInfoPlist.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVGenInfoPlist.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVGenInfoPlist.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVGenInfoPlist.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVGenPkgconfig.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVGenPkgconfig.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVGenPkgconfig.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVGenPkgconfig.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVMinDepVersions.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVMinDepVersions.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVMinDepVersions.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVMinDepVersions.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVModule.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVModule.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVModule.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVModule.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVPCHSupport.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVPCHSupport.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVPCHSupport.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVPCHSupport.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVPackaging.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVPackaging.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVPackaging.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVPackaging.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVUtils.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVUtils.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVUtils.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVUtils.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVVersion.cmake b/core/src/test/resources/cmake/opencv/cmake/OpenCVVersion.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/OpenCVVersion.cmake rename to core/src/test/resources/cmake/opencv/cmake/OpenCVVersion.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/checks/OpenCVDetectCudaArch.cu b/core/src/test/resources/cmake/opencv/cmake/checks/OpenCVDetectCudaArch.cu similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/checks/OpenCVDetectCudaArch.cu rename to core/src/test/resources/cmake/opencv/cmake/checks/OpenCVDetectCudaArch.cu diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/checks/directx.cpp b/core/src/test/resources/cmake/opencv/cmake/checks/directx.cpp similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/checks/directx.cpp rename to core/src/test/resources/cmake/opencv/cmake/checks/directx.cpp diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/checks/opencl.cpp b/core/src/test/resources/cmake/opencv/cmake/checks/opencl.cpp similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/checks/opencl.cpp rename to core/src/test/resources/cmake/opencv/cmake/checks/opencl.cpp diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/checks/vfwtest.cpp b/core/src/test/resources/cmake/opencv/cmake/checks/vfwtest.cpp similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/checks/vfwtest.cpp rename to core/src/test/resources/cmake/opencv/cmake/checks/vfwtest.cpp diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/checks/win32uitest.cpp b/core/src/test/resources/cmake/opencv/cmake/checks/win32uitest.cpp similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/checks/win32uitest.cpp rename to core/src/test/resources/cmake/opencv/cmake/checks/win32uitest.cpp diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/cl2cpp.cmake b/core/src/test/resources/cmake/opencv/cmake/cl2cpp.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/cl2cpp.cmake rename to core/src/test/resources/cmake/opencv/cmake/cl2cpp.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/copyAndroidLibs.cmake b/core/src/test/resources/cmake/opencv/cmake/copyAndroidLibs.cmake similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/copyAndroidLibs.cmake rename to core/src/test/resources/cmake/opencv/cmake/copyAndroidLibs.cmake diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/templates/OpenCV.mk.in b/core/src/test/resources/cmake/opencv/cmake/templates/OpenCV.mk.in similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/templates/OpenCV.mk.in rename to core/src/test/resources/cmake/opencv/cmake/templates/OpenCV.mk.in diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/templates/OpenCVConfig-version.cmake.in b/core/src/test/resources/cmake/opencv/cmake/templates/OpenCVConfig-version.cmake.in similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/templates/OpenCVConfig-version.cmake.in rename to core/src/test/resources/cmake/opencv/cmake/templates/OpenCVConfig-version.cmake.in diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/templates/OpenCVConfig.cmake.in b/core/src/test/resources/cmake/opencv/cmake/templates/OpenCVConfig.cmake.in similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/templates/OpenCVConfig.cmake.in rename to core/src/test/resources/cmake/opencv/cmake/templates/OpenCVConfig.cmake.in diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/templates/cmake_uninstall.cmake.in b/core/src/test/resources/cmake/opencv/cmake/templates/cmake_uninstall.cmake.in similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/templates/cmake_uninstall.cmake.in rename to core/src/test/resources/cmake/opencv/cmake/templates/cmake_uninstall.cmake.in diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/templates/cvconfig.h.in b/core/src/test/resources/cmake/opencv/cmake/templates/cvconfig.h.in similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/templates/cvconfig.h.in rename to core/src/test/resources/cmake/opencv/cmake/templates/cvconfig.h.in diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/templates/opencv-XXX.pc.in b/core/src/test/resources/cmake/opencv/cmake/templates/opencv-XXX.pc.in similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/templates/opencv-XXX.pc.in rename to core/src/test/resources/cmake/opencv/cmake/templates/opencv-XXX.pc.in diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/templates/opencv_abi.xml.in b/core/src/test/resources/cmake/opencv/cmake/templates/opencv_abi.xml.in similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/templates/opencv_abi.xml.in rename to core/src/test/resources/cmake/opencv/cmake/templates/opencv_abi.xml.in diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/templates/opencv_modules.hpp.in b/core/src/test/resources/cmake/opencv/cmake/templates/opencv_modules.hpp.in similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/templates/opencv_modules.hpp.in rename to core/src/test/resources/cmake/opencv/cmake/templates/opencv_modules.hpp.in diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/templates/opencv_run_all_tests_android.sh.in b/core/src/test/resources/cmake/opencv/cmake/templates/opencv_run_all_tests_android.sh.in similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/templates/opencv_run_all_tests_android.sh.in rename to core/src/test/resources/cmake/opencv/cmake/templates/opencv_run_all_tests_android.sh.in diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/templates/opencv_run_all_tests_unix.sh.in b/core/src/test/resources/cmake/opencv/cmake/templates/opencv_run_all_tests_unix.sh.in similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/templates/opencv_run_all_tests_unix.sh.in rename to core/src/test/resources/cmake/opencv/cmake/templates/opencv_run_all_tests_unix.sh.in diff --git a/dependency-check-core/src/test/resources/cmake/opencv/cmake/templates/opencv_run_all_tests_windows.cmd.in b/core/src/test/resources/cmake/opencv/cmake/templates/opencv_run_all_tests_windows.cmd.in similarity index 100% rename from dependency-check-core/src/test/resources/cmake/opencv/cmake/templates/opencv_run_all_tests_windows.cmd.in rename to core/src/test/resources/cmake/opencv/cmake/templates/opencv_run_all_tests_windows.cmd.in diff --git a/dependency-check-core/src/test/resources/cmake/zlib/CMakeLists.txt b/core/src/test/resources/cmake/zlib/CMakeLists.txt similarity index 100% rename from dependency-check-core/src/test/resources/cmake/zlib/CMakeLists.txt rename to core/src/test/resources/cmake/zlib/CMakeLists.txt diff --git a/dependency-check-core/src/test/resources/cmake/zlib/README b/core/src/test/resources/cmake/zlib/README similarity index 100% rename from dependency-check-core/src/test/resources/cmake/zlib/README rename to core/src/test/resources/cmake/zlib/README diff --git a/dependency-check-core/src/test/resources/commons-fileupload-1.2.1.suppression.xml b/core/src/test/resources/commons-fileupload-1.2.1.suppression.xml similarity index 100% rename from dependency-check-core/src/test/resources/commons-fileupload-1.2.1.suppression.xml rename to core/src/test/resources/commons-fileupload-1.2.1.suppression.xml diff --git a/dependency-check-core/src/test/resources/composer.lock b/core/src/test/resources/composer.lock similarity index 100% rename from dependency-check-core/src/test/resources/composer.lock rename to core/src/test/resources/composer.lock diff --git a/dependency-check-core/src/test/resources/cve-1.2-2008_4411.xml b/core/src/test/resources/cve-1.2-2008_4411.xml similarity index 100% rename from dependency-check-core/src/test/resources/cve-1.2-2008_4411.xml rename to core/src/test/resources/cve-1.2-2008_4411.xml diff --git a/dependency-check-core/src/test/resources/cve-2.0-2008_4411.xml b/core/src/test/resources/cve-2.0-2008_4411.xml similarity index 100% rename from dependency-check-core/src/test/resources/cve-2.0-2008_4411.xml rename to core/src/test/resources/cve-2.0-2008_4411.xml diff --git a/dependency-check-core/src/test/resources/dependencycheck.properties b/core/src/test/resources/dependencycheck.properties similarity index 100% rename from dependency-check-core/src/test/resources/dependencycheck.properties rename to core/src/test/resources/dependencycheck.properties diff --git a/dependency-check-core/src/test/resources/dwr-pom.xml b/core/src/test/resources/dwr-pom.xml similarity index 100% rename from dependency-check-core/src/test/resources/dwr-pom.xml rename to core/src/test/resources/dwr-pom.xml diff --git a/dependency-check-core/src/test/resources/dwr.jar b/core/src/test/resources/dwr.jar similarity index 100% rename from dependency-check-core/src/test/resources/dwr.jar rename to core/src/test/resources/dwr.jar diff --git a/dependency-check-core/src/test/resources/file.tar b/core/src/test/resources/file.tar similarity index 100% rename from dependency-check-core/src/test/resources/file.tar rename to core/src/test/resources/file.tar diff --git a/dependency-check-core/src/test/resources/file.tar.bz2 b/core/src/test/resources/file.tar.bz2 similarity index 100% rename from dependency-check-core/src/test/resources/file.tar.bz2 rename to core/src/test/resources/file.tar.bz2 diff --git a/dependency-check-core/src/test/resources/file.tar.gz b/core/src/test/resources/file.tar.gz similarity index 100% rename from dependency-check-core/src/test/resources/file.tar.gz rename to core/src/test/resources/file.tar.gz diff --git a/dependency-check-core/src/test/resources/file.tbz2 b/core/src/test/resources/file.tbz2 similarity index 100% rename from dependency-check-core/src/test/resources/file.tbz2 rename to core/src/test/resources/file.tbz2 diff --git a/dependency-check-core/src/test/resources/file.tgz b/core/src/test/resources/file.tgz similarity index 100% rename from dependency-check-core/src/test/resources/file.tgz rename to core/src/test/resources/file.tgz diff --git a/dependency-check-core/src/test/resources/hibernate3.jar b/core/src/test/resources/hibernate3.jar similarity index 100% rename from dependency-check-core/src/test/resources/hibernate3.jar rename to core/src/test/resources/hibernate3.jar diff --git a/dependency-check-core/src/test/resources/hints.xml b/core/src/test/resources/hints.xml similarity index 100% rename from dependency-check-core/src/test/resources/hints.xml rename to core/src/test/resources/hints.xml diff --git a/dependency-check-core/src/test/resources/hints_12.xml b/core/src/test/resources/hints_12.xml similarity index 100% rename from dependency-check-core/src/test/resources/hints_12.xml rename to core/src/test/resources/hints_12.xml diff --git a/dependency-check-core/src/test/resources/hints_13.xml b/core/src/test/resources/hints_13.xml similarity index 100% rename from dependency-check-core/src/test/resources/hints_13.xml rename to core/src/test/resources/hints_13.xml diff --git a/dependency-check-core/src/test/resources/hints_invalid.xml b/core/src/test/resources/hints_invalid.xml similarity index 100% rename from dependency-check-core/src/test/resources/hints_invalid.xml rename to core/src/test/resources/hints_invalid.xml diff --git a/dependency-check-core/src/test/resources/incorrectSuppressions.xml b/core/src/test/resources/incorrectSuppressions.xml similarity index 100% rename from dependency-check-core/src/test/resources/incorrectSuppressions.xml rename to core/src/test/resources/incorrectSuppressions.xml diff --git a/dependency-check-core/src/test/resources/jmockit-1.26.pom b/core/src/test/resources/jmockit-1.26.pom similarity index 100% rename from dependency-check-core/src/test/resources/jmockit-1.26.pom rename to core/src/test/resources/jmockit-1.26.pom diff --git a/dependency-check-core/src/test/resources/log4net.2.0.3.nuspec b/core/src/test/resources/log4net.2.0.3.nuspec similarity index 100% rename from dependency-check-core/src/test/resources/log4net.2.0.3.nuspec rename to core/src/test/resources/log4net.2.0.3.nuspec diff --git a/dependency-check-core/src/test/resources/log4net.dll b/core/src/test/resources/log4net.dll similarity index 100% rename from dependency-check-core/src/test/resources/log4net.dll rename to core/src/test/resources/log4net.dll diff --git a/dependency-check-core/src/test/resources/logback-test.xml b/core/src/test/resources/logback-test.xml similarity index 100% rename from dependency-check-core/src/test/resources/logback-test.xml rename to core/src/test/resources/logback-test.xml diff --git a/dependency-check-core/src/test/resources/mysql-connector-java-5.1.27-bin.jar b/core/src/test/resources/mysql-connector-java-5.1.27-bin.jar similarity index 100% rename from dependency-check-core/src/test/resources/mysql-connector-java-5.1.27-bin.jar rename to core/src/test/resources/mysql-connector-java-5.1.27-bin.jar diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/.jshintrc b/core/src/test/resources/nodejs/node_modules/dns-sync/.jshintrc similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/.jshintrc rename to core/src/test/resources/nodejs/node_modules/dns-sync/.jshintrc diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/.npmignore b/core/src/test/resources/nodejs/node_modules/dns-sync/.npmignore similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/.npmignore rename to core/src/test/resources/nodejs/node_modules/dns-sync/.npmignore diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/.travis.yml b/core/src/test/resources/nodejs/node_modules/dns-sync/.travis.yml similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/.travis.yml rename to core/src/test/resources/nodejs/node_modules/dns-sync/.travis.yml diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/LICENSE b/core/src/test/resources/nodejs/node_modules/dns-sync/LICENSE similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/LICENSE rename to core/src/test/resources/nodejs/node_modules/dns-sync/LICENSE diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/Makefile b/core/src/test/resources/nodejs/node_modules/dns-sync/Makefile similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/Makefile rename to core/src/test/resources/nodejs/node_modules/dns-sync/Makefile diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/README.md b/core/src/test/resources/nodejs/node_modules/dns-sync/README.md similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/README.md rename to core/src/test/resources/nodejs/node_modules/dns-sync/README.md diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/index.js b/core/src/test/resources/nodejs/node_modules/dns-sync/index.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/index.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/index.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/lib/dns-sync.js b/core/src/test/resources/nodejs/node_modules/dns-sync/lib/dns-sync.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/lib/dns-sync.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/lib/dns-sync.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/.bin/shjs b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/.bin/shjs similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/.bin/shjs rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/.bin/shjs diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/debug/Readme.md b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/debug/Readme.md similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/debug/Readme.md rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/debug/Readme.md diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/debug/debug.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/debug/debug.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/debug/debug.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/debug/debug.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/debug/index.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/debug/index.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/debug/index.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/debug/index.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/debug/lib/debug.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/debug/lib/debug.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/debug/lib/debug.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/debug/lib/debug.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/debug/package.json b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/debug/package.json similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/debug/package.json rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/debug/package.json diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/.documentup.json b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/.documentup.json similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/.documentup.json rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/.documentup.json diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/.jshintrc b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/.jshintrc similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/.jshintrc rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/.jshintrc diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/.npmignore b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/.npmignore similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/.npmignore rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/.npmignore diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/.travis.yml b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/.travis.yml similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/.travis.yml rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/.travis.yml diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/LICENSE b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/LICENSE similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/LICENSE rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/LICENSE diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/README.md b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/README.md similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/README.md rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/README.md diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/bin/shjs b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/bin/shjs similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/bin/shjs rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/bin/shjs diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/global.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/global.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/global.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/global.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/make.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/make.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/make.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/make.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/package.json b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/package.json similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/package.json rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/package.json diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/scripts/generate-docs.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/scripts/generate-docs.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/scripts/generate-docs.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/scripts/generate-docs.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/scripts/run-tests.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/scripts/run-tests.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/scripts/run-tests.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/scripts/run-tests.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/shell.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/shell.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/shell.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/shell.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/cat.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/cat.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/cat.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/cat.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/cd.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/cd.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/cd.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/cd.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/chmod.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/chmod.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/chmod.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/chmod.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/common.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/common.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/common.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/common.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/cp.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/cp.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/cp.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/cp.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/dirs.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/dirs.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/dirs.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/dirs.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/echo.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/echo.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/echo.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/echo.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/error.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/error.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/error.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/error.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/exec.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/exec.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/exec.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/exec.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/find.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/find.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/find.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/find.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/grep.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/grep.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/grep.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/grep.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/ls.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/ls.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/ls.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/ls.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/mkdir.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/mkdir.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/mkdir.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/mkdir.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/mv.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/mv.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/mv.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/mv.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/popd.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/popd.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/popd.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/popd.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/pushd.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/pushd.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/pushd.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/pushd.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/pwd.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/pwd.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/pwd.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/pwd.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/rm.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/rm.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/rm.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/rm.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/sed.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/sed.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/sed.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/sed.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/tempdir.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/tempdir.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/tempdir.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/tempdir.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/test.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/test.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/test.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/test.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/to.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/to.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/to.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/to.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/toEnd.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/toEnd.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/toEnd.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/toEnd.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/which.js b/core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/which.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/which.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/node_modules/shelljs/src/which.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/package.json b/core/src/test/resources/nodejs/node_modules/dns-sync/package.json similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/package.json rename to core/src/test/resources/nodejs/node_modules/dns-sync/package.json diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/scripts/dns-lookup-script.js b/core/src/test/resources/nodejs/node_modules/dns-sync/scripts/dns-lookup-script.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/scripts/dns-lookup-script.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/scripts/dns-lookup-script.js diff --git a/dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/test/test.js b/core/src/test/resources/nodejs/node_modules/dns-sync/test/test.js similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/node_modules/dns-sync/test/test.js rename to core/src/test/resources/nodejs/node_modules/dns-sync/test/test.js diff --git a/dependency-check-core/src/test/resources/nodejs/npm-shrinkwrap.json b/core/src/test/resources/nodejs/npm-shrinkwrap.json similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/npm-shrinkwrap.json rename to core/src/test/resources/nodejs/npm-shrinkwrap.json diff --git a/dependency-check-core/src/test/resources/nodejs/package-lock.json b/core/src/test/resources/nodejs/package-lock.json similarity index 100% rename from dependency-check-core/src/test/resources/nodejs/package-lock.json rename to core/src/test/resources/nodejs/package-lock.json diff --git a/dependency-check-core/src/test/resources/nsp/empty.json b/core/src/test/resources/nsp/empty.json similarity index 100% rename from dependency-check-core/src/test/resources/nsp/empty.json rename to core/src/test/resources/nsp/empty.json diff --git a/dependency-check-core/src/test/resources/nsp/minimal-invalid.json b/core/src/test/resources/nsp/minimal-invalid.json similarity index 100% rename from dependency-check-core/src/test/resources/nsp/minimal-invalid.json rename to core/src/test/resources/nsp/minimal-invalid.json diff --git a/dependency-check-core/src/test/resources/nsp/package.json b/core/src/test/resources/nsp/package.json similarity index 100% rename from dependency-check-core/src/test/resources/nsp/package.json rename to core/src/test/resources/nsp/package.json diff --git a/dependency-check-core/src/test/resources/nuspec/test.nuspec b/core/src/test/resources/nuspec/test.nuspec similarity index 100% rename from dependency-check-core/src/test/resources/nuspec/test.nuspec rename to core/src/test/resources/nuspec/test.nuspec diff --git a/dependency-check-core/src/test/resources/nvdcve-2.0-2012.xml b/core/src/test/resources/nvdcve-2.0-2012.xml similarity index 100% rename from dependency-check-core/src/test/resources/nvdcve-2.0-2012.xml rename to core/src/test/resources/nvdcve-2.0-2012.xml diff --git a/dependency-check-core/src/test/resources/nvdcve-2.0-2014.xml b/core/src/test/resources/nvdcve-2.0-2014.xml similarity index 100% rename from dependency-check-core/src/test/resources/nvdcve-2.0-2014.xml rename to core/src/test/resources/nvdcve-2.0-2014.xml diff --git a/dependency-check-core/src/test/resources/nvdcve-2.0-modified.xml b/core/src/test/resources/nvdcve-2.0-modified.xml similarity index 100% rename from dependency-check-core/src/test/resources/nvdcve-2.0-modified.xml rename to core/src/test/resources/nvdcve-2.0-modified.xml diff --git a/dependency-check-core/src/test/resources/nvdcve-2012.xml b/core/src/test/resources/nvdcve-2012.xml similarity index 100% rename from dependency-check-core/src/test/resources/nvdcve-2012.xml rename to core/src/test/resources/nvdcve-2012.xml diff --git a/dependency-check-core/src/test/resources/nvdcve-2014.xml b/core/src/test/resources/nvdcve-2014.xml similarity index 100% rename from dependency-check-core/src/test/resources/nvdcve-2014.xml rename to core/src/test/resources/nvdcve-2014.xml diff --git a/dependency-check-core/src/test/resources/nvdcve-modified.xml b/core/src/test/resources/nvdcve-modified.xml similarity index 100% rename from dependency-check-core/src/test/resources/nvdcve-modified.xml rename to core/src/test/resources/nvdcve-modified.xml diff --git a/dependency-check-core/src/test/resources/openssl/opensslv.h b/core/src/test/resources/openssl/opensslv.h similarity index 100% rename from dependency-check-core/src/test/resources/openssl/opensslv.h rename to core/src/test/resources/openssl/opensslv.h diff --git a/dependency-check-core/src/test/resources/other-suppressions.xml b/core/src/test/resources/other-suppressions.xml similarity index 100% rename from dependency-check-core/src/test/resources/other-suppressions.xml rename to core/src/test/resources/other-suppressions.xml diff --git a/dependency-check-core/src/test/resources/python/Django-1.7.2-py2.py3-none-any.whl b/core/src/test/resources/python/Django-1.7.2-py2.py3-none-any.whl similarity index 100% rename from dependency-check-core/src/test/resources/python/Django-1.7.2-py2.py3-none-any.whl rename to core/src/test/resources/python/Django-1.7.2-py2.py3-none-any.whl diff --git a/dependency-check-core/src/test/resources/python/dist/EggTest-0.0.1-py2.7.egg b/core/src/test/resources/python/dist/EggTest-0.0.1-py2.7.egg similarity index 100% rename from dependency-check-core/src/test/resources/python/dist/EggTest-0.0.1-py2.7.egg rename to core/src/test/resources/python/dist/EggTest-0.0.1-py2.7.egg diff --git a/dependency-check-core/src/test/resources/python/dist/EggTest-0.0.1-py2.7.zip b/core/src/test/resources/python/dist/EggTest-0.0.1-py2.7.zip similarity index 100% rename from dependency-check-core/src/test/resources/python/dist/EggTest-0.0.1-py2.7.zip rename to core/src/test/resources/python/dist/EggTest-0.0.1-py2.7.zip diff --git a/dependency-check-core/src/test/resources/python/eggtest/__about__.py b/core/src/test/resources/python/eggtest/__about__.py similarity index 100% rename from dependency-check-core/src/test/resources/python/eggtest/__about__.py rename to core/src/test/resources/python/eggtest/__about__.py diff --git a/dependency-check-core/src/test/resources/python/eggtest/__init__.py b/core/src/test/resources/python/eggtest/__init__.py similarity index 100% rename from dependency-check-core/src/test/resources/python/eggtest/__init__.py rename to core/src/test/resources/python/eggtest/__init__.py diff --git a/dependency-check-core/src/test/resources/python/eggtest/__init__.pyc b/core/src/test/resources/python/eggtest/__init__.pyc similarity index 100% rename from dependency-check-core/src/test/resources/python/eggtest/__init__.pyc rename to core/src/test/resources/python/eggtest/__init__.pyc diff --git a/dependency-check-core/src/test/resources/python/eggtest/main.py b/core/src/test/resources/python/eggtest/main.py similarity index 100% rename from dependency-check-core/src/test/resources/python/eggtest/main.py rename to core/src/test/resources/python/eggtest/main.py diff --git a/dependency-check-core/src/test/resources/python/eggtest/main.pyc b/core/src/test/resources/python/eggtest/main.pyc similarity index 100% rename from dependency-check-core/src/test/resources/python/eggtest/main.pyc rename to core/src/test/resources/python/eggtest/main.pyc diff --git a/dependency-check-core/src/test/resources/python/setup.py b/core/src/test/resources/python/setup.py similarity index 100% rename from dependency-check-core/src/test/resources/python/setup.py rename to core/src/test/resources/python/setup.py diff --git a/dependency-check-core/src/test/resources/python/site-packages/Django-1.7.2.data/scripts/django-admin.py b/core/src/test/resources/python/site-packages/Django-1.7.2.data/scripts/django-admin.py similarity index 100% rename from dependency-check-core/src/test/resources/python/site-packages/Django-1.7.2.data/scripts/django-admin.py rename to core/src/test/resources/python/site-packages/Django-1.7.2.data/scripts/django-admin.py diff --git a/dependency-check-core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/DESCRIPTION.rst b/core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/DESCRIPTION.rst similarity index 100% rename from dependency-check-core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/DESCRIPTION.rst rename to core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/DESCRIPTION.rst diff --git a/dependency-check-core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/LICENSE.txt b/core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/LICENSE.txt similarity index 100% rename from dependency-check-core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/LICENSE.txt rename to core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/LICENSE.txt diff --git a/dependency-check-core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/METADATA b/core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/METADATA similarity index 100% rename from dependency-check-core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/METADATA rename to core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/METADATA diff --git a/dependency-check-core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/WHEEL b/core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/WHEEL similarity index 100% rename from dependency-check-core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/WHEEL rename to core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/WHEEL diff --git a/dependency-check-core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/entry_points.txt b/core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/entry_points.txt similarity index 100% rename from dependency-check-core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/entry_points.txt rename to core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/entry_points.txt diff --git a/dependency-check-core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/metadata.json b/core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/metadata.json similarity index 100% rename from dependency-check-core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/metadata.json rename to core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/metadata.json diff --git a/dependency-check-core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/top_level.txt b/core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/top_level.txt similarity index 100% rename from dependency-check-core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/top_level.txt rename to core/src/test/resources/python/site-packages/Django-1.7.2.dist-info/top_level.txt diff --git a/dependency-check-core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/EGG-INFO/PKG-INFO b/core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/EGG-INFO/PKG-INFO similarity index 100% rename from dependency-check-core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/EGG-INFO/PKG-INFO rename to core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/EGG-INFO/PKG-INFO diff --git a/dependency-check-core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/EGG-INFO/SOURCES.txt b/core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/EGG-INFO/SOURCES.txt similarity index 100% rename from dependency-check-core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/EGG-INFO/SOURCES.txt rename to core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/EGG-INFO/SOURCES.txt diff --git a/dependency-check-core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/EGG-INFO/dependency_links.txt b/core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/EGG-INFO/dependency_links.txt similarity index 100% rename from dependency-check-core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/EGG-INFO/dependency_links.txt rename to core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/EGG-INFO/dependency_links.txt diff --git a/dependency-check-core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/EGG-INFO/top_level.txt b/core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/EGG-INFO/top_level.txt similarity index 100% rename from dependency-check-core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/EGG-INFO/top_level.txt rename to core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/EGG-INFO/top_level.txt diff --git a/dependency-check-core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/EGG-INFO/zip-safe b/core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/EGG-INFO/zip-safe similarity index 100% rename from dependency-check-core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/EGG-INFO/zip-safe rename to core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/EGG-INFO/zip-safe diff --git a/dependency-check-core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/__about__.py b/core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/__about__.py similarity index 100% rename from dependency-check-core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/__about__.py rename to core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/__about__.py diff --git a/dependency-check-core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/__about__.pyc b/core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/__about__.pyc similarity index 100% rename from dependency-check-core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/__about__.pyc rename to core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/__about__.pyc diff --git a/dependency-check-core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/__init__.py b/core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/__init__.py similarity index 100% rename from dependency-check-core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/__init__.py rename to core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/__init__.py diff --git a/dependency-check-core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/__init__.pyc b/core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/__init__.pyc similarity index 100% rename from dependency-check-core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/__init__.pyc rename to core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/__init__.pyc diff --git a/dependency-check-core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/main.py b/core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/main.py similarity index 100% rename from dependency-check-core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/main.py rename to core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/main.py diff --git a/dependency-check-core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/main.pyc b/core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/main.pyc similarity index 100% rename from dependency-check-core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/main.pyc rename to core/src/test/resources/python/site-packages/EggTest-0.0.1-py2.7.egg/eggtest/main.pyc diff --git a/dependency-check-core/src/test/resources/python/site-packages/EggTest.egg-info/PKG-INFO b/core/src/test/resources/python/site-packages/EggTest.egg-info/PKG-INFO similarity index 100% rename from dependency-check-core/src/test/resources/python/site-packages/EggTest.egg-info/PKG-INFO rename to core/src/test/resources/python/site-packages/EggTest.egg-info/PKG-INFO diff --git a/dependency-check-core/src/test/resources/python/site-packages/EggTest.egg-info/SOURCES.txt b/core/src/test/resources/python/site-packages/EggTest.egg-info/SOURCES.txt similarity index 100% rename from dependency-check-core/src/test/resources/python/site-packages/EggTest.egg-info/SOURCES.txt rename to core/src/test/resources/python/site-packages/EggTest.egg-info/SOURCES.txt diff --git a/dependency-check-core/src/test/resources/python/site-packages/EggTest.egg-info/dependency_links.txt b/core/src/test/resources/python/site-packages/EggTest.egg-info/dependency_links.txt similarity index 100% rename from dependency-check-core/src/test/resources/python/site-packages/EggTest.egg-info/dependency_links.txt rename to core/src/test/resources/python/site-packages/EggTest.egg-info/dependency_links.txt diff --git a/dependency-check-core/src/test/resources/python/site-packages/EggTest.egg-info/top_level.txt b/core/src/test/resources/python/site-packages/EggTest.egg-info/top_level.txt similarity index 100% rename from dependency-check-core/src/test/resources/python/site-packages/EggTest.egg-info/top_level.txt rename to core/src/test/resources/python/site-packages/EggTest.egg-info/top_level.txt diff --git a/dependency-check-core/src/test/resources/python/site-packages/django/__init__.py b/core/src/test/resources/python/site-packages/django/__init__.py similarity index 100% rename from dependency-check-core/src/test/resources/python/site-packages/django/__init__.py rename to core/src/test/resources/python/site-packages/django/__init__.py diff --git a/dependency-check-core/src/test/resources/python/site-packages/django/shortcuts.py b/core/src/test/resources/python/site-packages/django/shortcuts.py similarity index 100% rename from dependency-check-core/src/test/resources/python/site-packages/django/shortcuts.py rename to core/src/test/resources/python/site-packages/django/shortcuts.py diff --git a/dependency-check-core/src/test/resources/ruby/vulnerable/gems/rails-4.1.15/Gemfile b/core/src/test/resources/ruby/vulnerable/gems/rails-4.1.15/Gemfile similarity index 100% rename from dependency-check-core/src/test/resources/ruby/vulnerable/gems/rails-4.1.15/Gemfile rename to core/src/test/resources/ruby/vulnerable/gems/rails-4.1.15/Gemfile diff --git a/dependency-check-core/src/test/resources/ruby/vulnerable/gems/rails-4.1.15/Gemfile.lock b/core/src/test/resources/ruby/vulnerable/gems/rails-4.1.15/Gemfile.lock similarity index 100% rename from dependency-check-core/src/test/resources/ruby/vulnerable/gems/rails-4.1.15/Gemfile.lock rename to core/src/test/resources/ruby/vulnerable/gems/rails-4.1.15/Gemfile.lock diff --git a/dependency-check-core/src/test/resources/ruby/vulnerable/gems/rails-4.1.15/vendor/bundle/ruby/2.2.0/gems/pg-0.18.4/Rakefile b/core/src/test/resources/ruby/vulnerable/gems/rails-4.1.15/vendor/bundle/ruby/2.2.0/gems/pg-0.18.4/Rakefile similarity index 100% rename from dependency-check-core/src/test/resources/ruby/vulnerable/gems/rails-4.1.15/vendor/bundle/ruby/2.2.0/gems/pg-0.18.4/Rakefile rename to core/src/test/resources/ruby/vulnerable/gems/rails-4.1.15/vendor/bundle/ruby/2.2.0/gems/pg-0.18.4/Rakefile diff --git a/dependency-check-core/src/test/resources/ruby/vulnerable/gems/rails-4.1.15/vendor/bundle/ruby/2.2.0/specifications/dalli-2.7.5.gemspec b/core/src/test/resources/ruby/vulnerable/gems/rails-4.1.15/vendor/bundle/ruby/2.2.0/specifications/dalli-2.7.5.gemspec similarity index 100% rename from dependency-check-core/src/test/resources/ruby/vulnerable/gems/rails-4.1.15/vendor/bundle/ruby/2.2.0/specifications/dalli-2.7.5.gemspec rename to core/src/test/resources/ruby/vulnerable/gems/rails-4.1.15/vendor/bundle/ruby/2.2.0/specifications/dalli-2.7.5.gemspec diff --git a/dependency-check-core/src/test/resources/ruby/vulnerable/gems/sinatra/Gemfile b/core/src/test/resources/ruby/vulnerable/gems/sinatra/Gemfile similarity index 100% rename from dependency-check-core/src/test/resources/ruby/vulnerable/gems/sinatra/Gemfile rename to core/src/test/resources/ruby/vulnerable/gems/sinatra/Gemfile diff --git a/dependency-check-core/src/test/resources/ruby/vulnerable/gems/sinatra/Gemfile.lock b/core/src/test/resources/ruby/vulnerable/gems/sinatra/Gemfile.lock similarity index 100% rename from dependency-check-core/src/test/resources/ruby/vulnerable/gems/sinatra/Gemfile.lock rename to core/src/test/resources/ruby/vulnerable/gems/sinatra/Gemfile.lock diff --git a/dependency-check-core/src/test/resources/ruby/vulnerable/gems/specifications/activerecord-oracle_enhanced-adapter-1.1.7.gemspec b/core/src/test/resources/ruby/vulnerable/gems/specifications/activerecord-oracle_enhanced-adapter-1.1.7.gemspec similarity index 100% rename from dependency-check-core/src/test/resources/ruby/vulnerable/gems/specifications/activerecord-oracle_enhanced-adapter-1.1.7.gemspec rename to core/src/test/resources/ruby/vulnerable/gems/specifications/activerecord-oracle_enhanced-adapter-1.1.7.gemspec diff --git a/dependency-check-core/src/test/resources/ruby/vulnerable/gems/specifications/i18n-0.7.0.gemspec b/core/src/test/resources/ruby/vulnerable/gems/specifications/i18n-0.7.0.gemspec similarity index 100% rename from dependency-check-core/src/test/resources/ruby/vulnerable/gems/specifications/i18n-0.7.0.gemspec rename to core/src/test/resources/ruby/vulnerable/gems/specifications/i18n-0.7.0.gemspec diff --git a/dependency-check-core/src/test/resources/ruby/vulnerable/gems/specifications/mail-2.4.3.gemspec b/core/src/test/resources/ruby/vulnerable/gems/specifications/mail-2.4.3.gemspec similarity index 100% rename from dependency-check-core/src/test/resources/ruby/vulnerable/gems/specifications/mail-2.4.3.gemspec rename to core/src/test/resources/ruby/vulnerable/gems/specifications/mail-2.4.3.gemspec diff --git a/dependency-check-core/src/test/resources/ruby/vulnerable/gems/specifications/mime-types-1.25.1.gemspec b/core/src/test/resources/ruby/vulnerable/gems/specifications/mime-types-1.25.1.gemspec similarity index 100% rename from dependency-check-core/src/test/resources/ruby/vulnerable/gems/specifications/mime-types-1.25.1.gemspec rename to core/src/test/resources/ruby/vulnerable/gems/specifications/mime-types-1.25.1.gemspec diff --git a/dependency-check-core/src/test/resources/ruby/vulnerable/gems/specifications/netrc-0.10.3.gemspec b/core/src/test/resources/ruby/vulnerable/gems/specifications/netrc-0.10.3.gemspec similarity index 100% rename from dependency-check-core/src/test/resources/ruby/vulnerable/gems/specifications/netrc-0.10.3.gemspec rename to core/src/test/resources/ruby/vulnerable/gems/specifications/netrc-0.10.3.gemspec diff --git a/dependency-check-core/src/test/resources/ruby/vulnerable/gems/specifications/polyglot-0.3.5.gemspec b/core/src/test/resources/ruby/vulnerable/gems/specifications/polyglot-0.3.5.gemspec similarity index 100% rename from dependency-check-core/src/test/resources/ruby/vulnerable/gems/specifications/polyglot-0.3.5.gemspec rename to core/src/test/resources/ruby/vulnerable/gems/specifications/polyglot-0.3.5.gemspec diff --git a/dependency-check-core/src/test/resources/ruby/vulnerable/gems/specifications/rest-client-1.7.2.gemspec b/core/src/test/resources/ruby/vulnerable/gems/specifications/rest-client-1.7.2.gemspec similarity index 100% rename from dependency-check-core/src/test/resources/ruby/vulnerable/gems/specifications/rest-client-1.7.2.gemspec rename to core/src/test/resources/ruby/vulnerable/gems/specifications/rest-client-1.7.2.gemspec diff --git a/dependency-check-core/src/test/resources/ruby/vulnerable/gems/specifications/treetop-1.4.15.gemspec b/core/src/test/resources/ruby/vulnerable/gems/specifications/treetop-1.4.15.gemspec similarity index 100% rename from dependency-check-core/src/test/resources/ruby/vulnerable/gems/specifications/treetop-1.4.15.gemspec rename to core/src/test/resources/ruby/vulnerable/gems/specifications/treetop-1.4.15.gemspec diff --git a/dependency-check-core/src/test/resources/stagedhttp-modified.tar b/core/src/test/resources/stagedhttp-modified.tar similarity index 100% rename from dependency-check-core/src/test/resources/stagedhttp-modified.tar rename to core/src/test/resources/stagedhttp-modified.tar diff --git a/dependency-check-core/src/test/resources/struts.zip b/core/src/test/resources/struts.zip similarity index 100% rename from dependency-check-core/src/test/resources/struts.zip rename to core/src/test/resources/struts.zip diff --git a/dependency-check-core/src/test/resources/suppressions.xml b/core/src/test/resources/suppressions.xml similarity index 100% rename from dependency-check-core/src/test/resources/suppressions.xml rename to core/src/test/resources/suppressions.xml diff --git a/dependency-check-core/src/test/resources/swift/Gloss/Gloss.podspec b/core/src/test/resources/swift/Gloss/Gloss.podspec similarity index 100% rename from dependency-check-core/src/test/resources/swift/Gloss/Gloss.podspec rename to core/src/test/resources/swift/Gloss/Gloss.podspec diff --git a/dependency-check-core/src/test/resources/swift/Gloss/Package.swift b/core/src/test/resources/swift/Gloss/Package.swift similarity index 100% rename from dependency-check-core/src/test/resources/swift/Gloss/Package.swift rename to core/src/test/resources/swift/Gloss/Package.swift diff --git a/dependency-check-core/src/test/resources/swift/cocoapods/EasyPeasy.podspec b/core/src/test/resources/swift/cocoapods/EasyPeasy.podspec similarity index 100% rename from dependency-check-core/src/test/resources/swift/cocoapods/EasyPeasy.podspec rename to core/src/test/resources/swift/cocoapods/EasyPeasy.podspec diff --git a/dependency-check-core/src/test/resources/test.properties b/core/src/test/resources/test.properties similarity index 100% rename from dependency-check-core/src/test/resources/test.properties rename to core/src/test/resources/test.properties diff --git a/dependency-check-core/src/test/resources/test.zip b/core/src/test/resources/test.zip similarity index 100% rename from dependency-check-core/src/test/resources/test.zip rename to core/src/test/resources/test.zip diff --git a/dependency-check-core/src/test/resources/textFileWithJarExtension.jar b/core/src/test/resources/textFileWithJarExtension.jar similarity index 100% rename from dependency-check-core/src/test/resources/textFileWithJarExtension.jar rename to core/src/test/resources/textFileWithJarExtension.jar diff --git a/dependency-check-core/src/test/resources/uber-1.0-SNAPSHOT.jar b/core/src/test/resources/uber-1.0-SNAPSHOT.jar similarity index 100% rename from dependency-check-core/src/test/resources/uber-1.0-SNAPSHOT.jar rename to core/src/test/resources/uber-1.0-SNAPSHOT.jar diff --git a/dependency-check-maven/LICENSE.txt b/maven/LICENSE.txt similarity index 100% rename from dependency-check-maven/LICENSE.txt rename to maven/LICENSE.txt diff --git a/dependency-check-maven/NOTICE.txt b/maven/NOTICE.txt similarity index 100% rename from dependency-check-maven/NOTICE.txt rename to maven/NOTICE.txt diff --git a/dependency-check-maven/README.md b/maven/README.md similarity index 100% rename from dependency-check-maven/README.md rename to maven/README.md diff --git a/dependency-check-maven/pom.xml b/maven/pom.xml similarity index 100% rename from dependency-check-maven/pom.xml rename to maven/pom.xml diff --git a/dependency-check-maven/src/it/617-hierarchical-cross-deps/invoker.properties b/maven/src/it/617-hierarchical-cross-deps/invoker.properties similarity index 100% rename from dependency-check-maven/src/it/617-hierarchical-cross-deps/invoker.properties rename to maven/src/it/617-hierarchical-cross-deps/invoker.properties diff --git a/dependency-check-maven/src/it/617-hierarchical-cross-deps/module-java/pom.xml b/maven/src/it/617-hierarchical-cross-deps/module-java/pom.xml similarity index 100% rename from dependency-check-maven/src/it/617-hierarchical-cross-deps/module-java/pom.xml rename to maven/src/it/617-hierarchical-cross-deps/module-java/pom.xml diff --git a/dependency-check-maven/src/it/617-hierarchical-cross-deps/module-web/pom.xml b/maven/src/it/617-hierarchical-cross-deps/module-web/pom.xml similarity index 100% rename from dependency-check-maven/src/it/617-hierarchical-cross-deps/module-web/pom.xml rename to maven/src/it/617-hierarchical-cross-deps/module-web/pom.xml diff --git a/dependency-check-maven/src/it/617-hierarchical-cross-deps/module-web/src/main/webapp/WEB-INF/web.xml b/maven/src/it/617-hierarchical-cross-deps/module-web/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from dependency-check-maven/src/it/617-hierarchical-cross-deps/module-web/src/main/webapp/WEB-INF/web.xml rename to maven/src/it/617-hierarchical-cross-deps/module-web/src/main/webapp/WEB-INF/web.xml diff --git a/dependency-check-maven/src/it/617-hierarchical-cross-deps/pom.xml b/maven/src/it/617-hierarchical-cross-deps/pom.xml similarity index 100% rename from dependency-check-maven/src/it/617-hierarchical-cross-deps/pom.xml rename to maven/src/it/617-hierarchical-cross-deps/pom.xml diff --git a/dependency-check-maven/src/it/617-hierarchical-cross-deps/postbuild.groovy b/maven/src/it/617-hierarchical-cross-deps/postbuild.groovy similarity index 100% rename from dependency-check-maven/src/it/617-hierarchical-cross-deps/postbuild.groovy rename to maven/src/it/617-hierarchical-cross-deps/postbuild.groovy diff --git a/dependency-check-maven/src/it/618-aggregator-purge/invoker.properties b/maven/src/it/618-aggregator-purge/invoker.properties similarity index 100% rename from dependency-check-maven/src/it/618-aggregator-purge/invoker.properties rename to maven/src/it/618-aggregator-purge/invoker.properties diff --git a/dependency-check-maven/src/it/618-aggregator-purge/module/pom.xml b/maven/src/it/618-aggregator-purge/module/pom.xml similarity index 100% rename from dependency-check-maven/src/it/618-aggregator-purge/module/pom.xml rename to maven/src/it/618-aggregator-purge/module/pom.xml diff --git a/dependency-check-maven/src/it/618-aggregator-purge/pom.xml b/maven/src/it/618-aggregator-purge/pom.xml similarity index 100% rename from dependency-check-maven/src/it/618-aggregator-purge/pom.xml rename to maven/src/it/618-aggregator-purge/pom.xml diff --git a/dependency-check-maven/src/it/618-aggregator-purge/postbuild.groovy b/maven/src/it/618-aggregator-purge/postbuild.groovy similarity index 100% rename from dependency-check-maven/src/it/618-aggregator-purge/postbuild.groovy rename to maven/src/it/618-aggregator-purge/postbuild.groovy diff --git a/dependency-check-maven/src/it/618-aggregator-update-only/invoker.properties b/maven/src/it/618-aggregator-update-only/invoker.properties similarity index 100% rename from dependency-check-maven/src/it/618-aggregator-update-only/invoker.properties rename to maven/src/it/618-aggregator-update-only/invoker.properties diff --git a/dependency-check-maven/src/it/618-aggregator-update-only/module/pom.xml b/maven/src/it/618-aggregator-update-only/module/pom.xml similarity index 100% rename from dependency-check-maven/src/it/618-aggregator-update-only/module/pom.xml rename to maven/src/it/618-aggregator-update-only/module/pom.xml diff --git a/dependency-check-maven/src/it/618-aggregator-update-only/pom.xml b/maven/src/it/618-aggregator-update-only/pom.xml similarity index 100% rename from dependency-check-maven/src/it/618-aggregator-update-only/pom.xml rename to maven/src/it/618-aggregator-update-only/pom.xml diff --git a/dependency-check-maven/src/it/618-aggregator-update-only/postbuild.groovy b/maven/src/it/618-aggregator-update-only/postbuild.groovy similarity index 100% rename from dependency-check-maven/src/it/618-aggregator-update-only/postbuild.groovy rename to maven/src/it/618-aggregator-update-only/postbuild.groovy diff --git a/dependency-check-maven/src/it/629-jackson-dataformat/invoker.properties b/maven/src/it/629-jackson-dataformat/invoker.properties similarity index 100% rename from dependency-check-maven/src/it/629-jackson-dataformat/invoker.properties rename to maven/src/it/629-jackson-dataformat/invoker.properties diff --git a/dependency-check-maven/src/it/629-jackson-dataformat/pom.xml b/maven/src/it/629-jackson-dataformat/pom.xml similarity index 100% rename from dependency-check-maven/src/it/629-jackson-dataformat/pom.xml rename to maven/src/it/629-jackson-dataformat/pom.xml diff --git a/dependency-check-maven/src/it/629-jackson-dataformat/postbuild.groovy b/maven/src/it/629-jackson-dataformat/postbuild.groovy similarity index 100% rename from dependency-check-maven/src/it/629-jackson-dataformat/postbuild.groovy rename to maven/src/it/629-jackson-dataformat/postbuild.groovy diff --git a/dependency-check-maven/src/it/690-threadsafety/first-a/pom.xml b/maven/src/it/690-threadsafety/first-a/pom.xml similarity index 100% rename from dependency-check-maven/src/it/690-threadsafety/first-a/pom.xml rename to maven/src/it/690-threadsafety/first-a/pom.xml diff --git a/dependency-check-maven/src/it/690-threadsafety/first-b/pom.xml b/maven/src/it/690-threadsafety/first-b/pom.xml similarity index 100% rename from dependency-check-maven/src/it/690-threadsafety/first-b/pom.xml rename to maven/src/it/690-threadsafety/first-b/pom.xml diff --git a/dependency-check-maven/src/it/690-threadsafety/first/pom.xml b/maven/src/it/690-threadsafety/first/pom.xml similarity index 100% rename from dependency-check-maven/src/it/690-threadsafety/first/pom.xml rename to maven/src/it/690-threadsafety/first/pom.xml diff --git a/dependency-check-maven/src/it/690-threadsafety/fourth-a/pom.xml b/maven/src/it/690-threadsafety/fourth-a/pom.xml similarity index 100% rename from dependency-check-maven/src/it/690-threadsafety/fourth-a/pom.xml rename to maven/src/it/690-threadsafety/fourth-a/pom.xml diff --git a/dependency-check-maven/src/it/690-threadsafety/fourth-a/src/main/webapp/WEB-INF/web.xml b/maven/src/it/690-threadsafety/fourth-a/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from dependency-check-maven/src/it/690-threadsafety/fourth-a/src/main/webapp/WEB-INF/web.xml rename to maven/src/it/690-threadsafety/fourth-a/src/main/webapp/WEB-INF/web.xml diff --git a/dependency-check-maven/src/it/690-threadsafety/fourth-b/pom.xml b/maven/src/it/690-threadsafety/fourth-b/pom.xml similarity index 100% rename from dependency-check-maven/src/it/690-threadsafety/fourth-b/pom.xml rename to maven/src/it/690-threadsafety/fourth-b/pom.xml diff --git a/dependency-check-maven/src/it/690-threadsafety/fourth-b/src/main/webapp/WEB-INF/web.xml b/maven/src/it/690-threadsafety/fourth-b/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from dependency-check-maven/src/it/690-threadsafety/fourth-b/src/main/webapp/WEB-INF/web.xml rename to maven/src/it/690-threadsafety/fourth-b/src/main/webapp/WEB-INF/web.xml diff --git a/dependency-check-maven/src/it/690-threadsafety/fourth/pom.xml b/maven/src/it/690-threadsafety/fourth/pom.xml similarity index 100% rename from dependency-check-maven/src/it/690-threadsafety/fourth/pom.xml rename to maven/src/it/690-threadsafety/fourth/pom.xml diff --git a/dependency-check-maven/src/it/690-threadsafety/fourth/src/main/webapp/WEB-INF/web.xml b/maven/src/it/690-threadsafety/fourth/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from dependency-check-maven/src/it/690-threadsafety/fourth/src/main/webapp/WEB-INF/web.xml rename to maven/src/it/690-threadsafety/fourth/src/main/webapp/WEB-INF/web.xml diff --git a/dependency-check-maven/src/it/690-threadsafety/invoker.properties b/maven/src/it/690-threadsafety/invoker.properties similarity index 100% rename from dependency-check-maven/src/it/690-threadsafety/invoker.properties rename to maven/src/it/690-threadsafety/invoker.properties diff --git a/dependency-check-maven/src/it/690-threadsafety/pom.xml b/maven/src/it/690-threadsafety/pom.xml similarity index 100% rename from dependency-check-maven/src/it/690-threadsafety/pom.xml rename to maven/src/it/690-threadsafety/pom.xml diff --git a/dependency-check-maven/src/it/690-threadsafety/postbuild.groovy b/maven/src/it/690-threadsafety/postbuild.groovy similarity index 100% rename from dependency-check-maven/src/it/690-threadsafety/postbuild.groovy rename to maven/src/it/690-threadsafety/postbuild.groovy diff --git a/dependency-check-maven/src/it/690-threadsafety/second-a/pom.xml b/maven/src/it/690-threadsafety/second-a/pom.xml similarity index 100% rename from dependency-check-maven/src/it/690-threadsafety/second-a/pom.xml rename to maven/src/it/690-threadsafety/second-a/pom.xml diff --git a/dependency-check-maven/src/it/690-threadsafety/second-a/src/main/webapp/WEB-INF/web.xml b/maven/src/it/690-threadsafety/second-a/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from dependency-check-maven/src/it/690-threadsafety/second-a/src/main/webapp/WEB-INF/web.xml rename to maven/src/it/690-threadsafety/second-a/src/main/webapp/WEB-INF/web.xml diff --git a/dependency-check-maven/src/it/690-threadsafety/second-b/pom.xml b/maven/src/it/690-threadsafety/second-b/pom.xml similarity index 100% rename from dependency-check-maven/src/it/690-threadsafety/second-b/pom.xml rename to maven/src/it/690-threadsafety/second-b/pom.xml diff --git a/dependency-check-maven/src/it/690-threadsafety/second-b/src/main/webapp/WEB-INF/web.xml b/maven/src/it/690-threadsafety/second-b/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from dependency-check-maven/src/it/690-threadsafety/second-b/src/main/webapp/WEB-INF/web.xml rename to maven/src/it/690-threadsafety/second-b/src/main/webapp/WEB-INF/web.xml diff --git a/dependency-check-maven/src/it/690-threadsafety/second/pom.xml b/maven/src/it/690-threadsafety/second/pom.xml similarity index 100% rename from dependency-check-maven/src/it/690-threadsafety/second/pom.xml rename to maven/src/it/690-threadsafety/second/pom.xml diff --git a/dependency-check-maven/src/it/690-threadsafety/second/src/main/webapp/WEB-INF/web.xml b/maven/src/it/690-threadsafety/second/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from dependency-check-maven/src/it/690-threadsafety/second/src/main/webapp/WEB-INF/web.xml rename to maven/src/it/690-threadsafety/second/src/main/webapp/WEB-INF/web.xml diff --git a/dependency-check-maven/src/it/690-threadsafety/third-a/pom.xml b/maven/src/it/690-threadsafety/third-a/pom.xml similarity index 100% rename from dependency-check-maven/src/it/690-threadsafety/third-a/pom.xml rename to maven/src/it/690-threadsafety/third-a/pom.xml diff --git a/dependency-check-maven/src/it/690-threadsafety/third-a/src/main/webapp/WEB-INF/web.xml b/maven/src/it/690-threadsafety/third-a/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from dependency-check-maven/src/it/690-threadsafety/third-a/src/main/webapp/WEB-INF/web.xml rename to maven/src/it/690-threadsafety/third-a/src/main/webapp/WEB-INF/web.xml diff --git a/dependency-check-maven/src/it/690-threadsafety/third-b/pom.xml b/maven/src/it/690-threadsafety/third-b/pom.xml similarity index 100% rename from dependency-check-maven/src/it/690-threadsafety/third-b/pom.xml rename to maven/src/it/690-threadsafety/third-b/pom.xml diff --git a/dependency-check-maven/src/it/690-threadsafety/third-b/src/main/webapp/WEB-INF/web.xml b/maven/src/it/690-threadsafety/third-b/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from dependency-check-maven/src/it/690-threadsafety/third-b/src/main/webapp/WEB-INF/web.xml rename to maven/src/it/690-threadsafety/third-b/src/main/webapp/WEB-INF/web.xml diff --git a/dependency-check-maven/src/it/690-threadsafety/third/pom.xml b/maven/src/it/690-threadsafety/third/pom.xml similarity index 100% rename from dependency-check-maven/src/it/690-threadsafety/third/pom.xml rename to maven/src/it/690-threadsafety/third/pom.xml diff --git a/dependency-check-maven/src/it/690-threadsafety/third/src/main/webapp/WEB-INF/web.xml b/maven/src/it/690-threadsafety/third/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from dependency-check-maven/src/it/690-threadsafety/third/src/main/webapp/WEB-INF/web.xml rename to maven/src/it/690-threadsafety/third/src/main/webapp/WEB-INF/web.xml diff --git a/dependency-check-maven/src/it/710-pom-parse-error/invoker.properties b/maven/src/it/710-pom-parse-error/invoker.properties similarity index 100% rename from dependency-check-maven/src/it/710-pom-parse-error/invoker.properties rename to maven/src/it/710-pom-parse-error/invoker.properties diff --git a/dependency-check-maven/src/it/710-pom-parse-error/pom.xml b/maven/src/it/710-pom-parse-error/pom.xml similarity index 100% rename from dependency-check-maven/src/it/710-pom-parse-error/pom.xml rename to maven/src/it/710-pom-parse-error/pom.xml diff --git a/dependency-check-maven/src/it/710-pom-parse-error/postbuild.groovy b/maven/src/it/710-pom-parse-error/postbuild.groovy similarity index 100% rename from dependency-check-maven/src/it/710-pom-parse-error/postbuild.groovy rename to maven/src/it/710-pom-parse-error/postbuild.groovy diff --git a/dependency-check-maven/src/it/729-system-scope-resolved/invoker.properties b/maven/src/it/729-system-scope-resolved/invoker.properties similarity index 100% rename from dependency-check-maven/src/it/729-system-scope-resolved/invoker.properties rename to maven/src/it/729-system-scope-resolved/invoker.properties diff --git a/dependency-check-maven/src/it/729-system-scope-resolved/pom.xml b/maven/src/it/729-system-scope-resolved/pom.xml similarity index 100% rename from dependency-check-maven/src/it/729-system-scope-resolved/pom.xml rename to maven/src/it/729-system-scope-resolved/pom.xml diff --git a/dependency-check-maven/src/it/729-system-scope-resolved/postbuild.groovy b/maven/src/it/729-system-scope-resolved/postbuild.groovy similarity index 100% rename from dependency-check-maven/src/it/729-system-scope-resolved/postbuild.groovy rename to maven/src/it/729-system-scope-resolved/postbuild.groovy diff --git a/dependency-check-maven/src/it/729-system-scope-skipped/invoker.properties b/maven/src/it/729-system-scope-skipped/invoker.properties similarity index 100% rename from dependency-check-maven/src/it/729-system-scope-skipped/invoker.properties rename to maven/src/it/729-system-scope-skipped/invoker.properties diff --git a/dependency-check-maven/src/it/729-system-scope-skipped/pom.xml b/maven/src/it/729-system-scope-skipped/pom.xml similarity index 100% rename from dependency-check-maven/src/it/729-system-scope-skipped/pom.xml rename to maven/src/it/729-system-scope-skipped/pom.xml diff --git a/dependency-check-maven/src/it/729-system-scope-skipped/postbuild.groovy b/maven/src/it/729-system-scope-skipped/postbuild.groovy similarity index 100% rename from dependency-check-maven/src/it/729-system-scope-skipped/postbuild.groovy rename to maven/src/it/729-system-scope-skipped/postbuild.groovy diff --git a/dependency-check-maven/src/it/730-multiple-suppression-files-configs/invoker.properties b/maven/src/it/730-multiple-suppression-files-configs/invoker.properties similarity index 100% rename from dependency-check-maven/src/it/730-multiple-suppression-files-configs/invoker.properties rename to maven/src/it/730-multiple-suppression-files-configs/invoker.properties diff --git a/dependency-check-maven/src/it/730-multiple-suppression-files-configs/pom.xml b/maven/src/it/730-multiple-suppression-files-configs/pom.xml similarity index 100% rename from dependency-check-maven/src/it/730-multiple-suppression-files-configs/pom.xml rename to maven/src/it/730-multiple-suppression-files-configs/pom.xml diff --git a/dependency-check-maven/src/it/730-multiple-suppression-files-configs/postbuild.groovy b/maven/src/it/730-multiple-suppression-files-configs/postbuild.groovy similarity index 100% rename from dependency-check-maven/src/it/730-multiple-suppression-files-configs/postbuild.groovy rename to maven/src/it/730-multiple-suppression-files-configs/postbuild.groovy diff --git a/dependency-check-maven/src/it/730-multiple-suppression-files-configs/test-suppression1.xml b/maven/src/it/730-multiple-suppression-files-configs/test-suppression1.xml similarity index 100% rename from dependency-check-maven/src/it/730-multiple-suppression-files-configs/test-suppression1.xml rename to maven/src/it/730-multiple-suppression-files-configs/test-suppression1.xml diff --git a/dependency-check-maven/src/it/730-multiple-suppression-files-configs/test-suppression2.xml b/maven/src/it/730-multiple-suppression-files-configs/test-suppression2.xml similarity index 100% rename from dependency-check-maven/src/it/730-multiple-suppression-files-configs/test-suppression2.xml rename to maven/src/it/730-multiple-suppression-files-configs/test-suppression2.xml diff --git a/dependency-check-maven/src/it/730-multiple-suppression-files/invoker.properties b/maven/src/it/730-multiple-suppression-files/invoker.properties similarity index 100% rename from dependency-check-maven/src/it/730-multiple-suppression-files/invoker.properties rename to maven/src/it/730-multiple-suppression-files/invoker.properties diff --git a/dependency-check-maven/src/it/730-multiple-suppression-files/pom.xml b/maven/src/it/730-multiple-suppression-files/pom.xml similarity index 100% rename from dependency-check-maven/src/it/730-multiple-suppression-files/pom.xml rename to maven/src/it/730-multiple-suppression-files/pom.xml diff --git a/dependency-check-maven/src/it/730-multiple-suppression-files/postbuild.groovy b/maven/src/it/730-multiple-suppression-files/postbuild.groovy similarity index 100% rename from dependency-check-maven/src/it/730-multiple-suppression-files/postbuild.groovy rename to maven/src/it/730-multiple-suppression-files/postbuild.groovy diff --git a/dependency-check-maven/src/it/730-multiple-suppression-files/test-suppression1.xml b/maven/src/it/730-multiple-suppression-files/test-suppression1.xml similarity index 100% rename from dependency-check-maven/src/it/730-multiple-suppression-files/test-suppression1.xml rename to maven/src/it/730-multiple-suppression-files/test-suppression1.xml diff --git a/dependency-check-maven/src/it/730-multiple-suppression-files/test-suppression2.xml b/maven/src/it/730-multiple-suppression-files/test-suppression2.xml similarity index 100% rename from dependency-check-maven/src/it/730-multiple-suppression-files/test-suppression2.xml rename to maven/src/it/730-multiple-suppression-files/test-suppression2.xml diff --git a/dependency-check-maven/src/it/815-broken-suppression-aggregate/broken-suppression.xml b/maven/src/it/815-broken-suppression-aggregate/broken-suppression.xml similarity index 100% rename from dependency-check-maven/src/it/815-broken-suppression-aggregate/broken-suppression.xml rename to maven/src/it/815-broken-suppression-aggregate/broken-suppression.xml diff --git a/dependency-check-maven/src/it/815-broken-suppression-aggregate/invoker.properties b/maven/src/it/815-broken-suppression-aggregate/invoker.properties similarity index 100% rename from dependency-check-maven/src/it/815-broken-suppression-aggregate/invoker.properties rename to maven/src/it/815-broken-suppression-aggregate/invoker.properties diff --git a/dependency-check-maven/src/it/815-broken-suppression-aggregate/pom.xml b/maven/src/it/815-broken-suppression-aggregate/pom.xml similarity index 100% rename from dependency-check-maven/src/it/815-broken-suppression-aggregate/pom.xml rename to maven/src/it/815-broken-suppression-aggregate/pom.xml diff --git a/dependency-check-maven/src/it/846-site-plugin/invoker.properties b/maven/src/it/846-site-plugin/invoker.properties similarity index 100% rename from dependency-check-maven/src/it/846-site-plugin/invoker.properties rename to maven/src/it/846-site-plugin/invoker.properties diff --git a/dependency-check-maven/src/it/846-site-plugin/pom.xml b/maven/src/it/846-site-plugin/pom.xml similarity index 100% rename from dependency-check-maven/src/it/846-site-plugin/pom.xml rename to maven/src/it/846-site-plugin/pom.xml diff --git a/dependency-check-maven/src/it/false-positives/invoker.properties b/maven/src/it/false-positives/invoker.properties similarity index 100% rename from dependency-check-maven/src/it/false-positives/invoker.properties rename to maven/src/it/false-positives/invoker.properties diff --git a/dependency-check-maven/src/it/false-positives/pom.xml b/maven/src/it/false-positives/pom.xml similarity index 100% rename from dependency-check-maven/src/it/false-positives/pom.xml rename to maven/src/it/false-positives/pom.xml diff --git a/dependency-check-maven/src/it/false-positives/postbuild.groovy b/maven/src/it/false-positives/postbuild.groovy similarity index 100% rename from dependency-check-maven/src/it/false-positives/postbuild.groovy rename to maven/src/it/false-positives/postbuild.groovy diff --git a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/AggregateMojo.java b/maven/src/main/java/org/owasp/dependencycheck/maven/AggregateMojo.java similarity index 100% rename from dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/AggregateMojo.java rename to maven/src/main/java/org/owasp/dependencycheck/maven/AggregateMojo.java diff --git a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/ArtifactScopeExcluded.java b/maven/src/main/java/org/owasp/dependencycheck/maven/ArtifactScopeExcluded.java similarity index 100% rename from dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/ArtifactScopeExcluded.java rename to maven/src/main/java/org/owasp/dependencycheck/maven/ArtifactScopeExcluded.java diff --git a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/ArtifactTypeExcluded.java b/maven/src/main/java/org/owasp/dependencycheck/maven/ArtifactTypeExcluded.java similarity index 100% rename from dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/ArtifactTypeExcluded.java rename to maven/src/main/java/org/owasp/dependencycheck/maven/ArtifactTypeExcluded.java diff --git a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.java b/maven/src/main/java/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.java similarity index 100% rename from dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.java rename to maven/src/main/java/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.java diff --git a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/CheckMojo.java b/maven/src/main/java/org/owasp/dependencycheck/maven/CheckMojo.java similarity index 100% rename from dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/CheckMojo.java rename to maven/src/main/java/org/owasp/dependencycheck/maven/CheckMojo.java diff --git a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/PurgeMojo.java b/maven/src/main/java/org/owasp/dependencycheck/maven/PurgeMojo.java similarity index 100% rename from dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/PurgeMojo.java rename to maven/src/main/java/org/owasp/dependencycheck/maven/PurgeMojo.java diff --git a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/UpdateMojo.java b/maven/src/main/java/org/owasp/dependencycheck/maven/UpdateMojo.java similarity index 100% rename from dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/UpdateMojo.java rename to maven/src/main/java/org/owasp/dependencycheck/maven/UpdateMojo.java diff --git a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/package-info.java b/maven/src/main/java/org/owasp/dependencycheck/maven/package-info.java similarity index 100% rename from dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/package-info.java rename to maven/src/main/java/org/owasp/dependencycheck/maven/package-info.java diff --git a/dependency-check-maven/src/main/resources/META-INF/licenses/maven/LICENSE.txt b/maven/src/main/resources/META-INF/licenses/maven/LICENSE.txt similarity index 100% rename from dependency-check-maven/src/main/resources/META-INF/licenses/maven/LICENSE.txt rename to maven/src/main/resources/META-INF/licenses/maven/LICENSE.txt diff --git a/dependency-check-maven/src/main/resources/mojo.properties b/maven/src/main/resources/mojo.properties similarity index 100% rename from dependency-check-maven/src/main/resources/mojo.properties rename to maven/src/main/resources/mojo.properties diff --git a/dependency-check-maven/src/site/markdown/configuration.md b/maven/src/site/markdown/configuration.md similarity index 100% rename from dependency-check-maven/src/site/markdown/configuration.md rename to maven/src/site/markdown/configuration.md diff --git a/dependency-check-maven/src/site/markdown/index.md.vm b/maven/src/site/markdown/index.md.vm similarity index 100% rename from dependency-check-maven/src/site/markdown/index.md.vm rename to maven/src/site/markdown/index.md.vm diff --git a/dependency-check-maven/src/site/resources/images/dc-maven.svg b/maven/src/site/resources/images/dc-maven.svg similarity index 100% rename from dependency-check-maven/src/site/resources/images/dc-maven.svg rename to maven/src/site/resources/images/dc-maven.svg diff --git a/dependency-check-maven/src/site/site.xml b/maven/src/site/site.xml similarity index 100% rename from dependency-check-maven/src/site/site.xml rename to maven/src/site/site.xml diff --git a/dependency-check-maven/src/test/java/org/owasp/dependencycheck/maven/ArtifactScopeExcludedTest.java b/maven/src/test/java/org/owasp/dependencycheck/maven/ArtifactScopeExcludedTest.java similarity index 100% rename from dependency-check-maven/src/test/java/org/owasp/dependencycheck/maven/ArtifactScopeExcludedTest.java rename to maven/src/test/java/org/owasp/dependencycheck/maven/ArtifactScopeExcludedTest.java diff --git a/dependency-check-maven/src/test/java/org/owasp/dependencycheck/maven/ArtifactTypeExcludedTest.java b/maven/src/test/java/org/owasp/dependencycheck/maven/ArtifactTypeExcludedTest.java similarity index 100% rename from dependency-check-maven/src/test/java/org/owasp/dependencycheck/maven/ArtifactTypeExcludedTest.java rename to maven/src/test/java/org/owasp/dependencycheck/maven/ArtifactTypeExcludedTest.java diff --git a/dependency-check-maven/src/test/java/org/owasp/dependencycheck/maven/BaseDependencyCheckMojoTest.java b/maven/src/test/java/org/owasp/dependencycheck/maven/BaseDependencyCheckMojoTest.java similarity index 100% rename from dependency-check-maven/src/test/java/org/owasp/dependencycheck/maven/BaseDependencyCheckMojoTest.java rename to maven/src/test/java/org/owasp/dependencycheck/maven/BaseDependencyCheckMojoTest.java diff --git a/dependency-check-maven/src/test/java/org/owasp/dependencycheck/maven/BaseTest.java b/maven/src/test/java/org/owasp/dependencycheck/maven/BaseTest.java similarity index 100% rename from dependency-check-maven/src/test/java/org/owasp/dependencycheck/maven/BaseTest.java rename to maven/src/test/java/org/owasp/dependencycheck/maven/BaseTest.java diff --git a/dependency-check-maven/src/test/resources/mojo.properties b/maven/src/test/resources/mojo.properties similarity index 100% rename from dependency-check-maven/src/test/resources/mojo.properties rename to maven/src/test/resources/mojo.properties diff --git a/dependency-check-maven/src/test/resources/sample.xml b/maven/src/test/resources/sample.xml similarity index 100% rename from dependency-check-maven/src/test/resources/sample.xml rename to maven/src/test/resources/sample.xml diff --git a/pom.xml b/pom.xml index abec1381a..773313283 100644 --- a/pom.xml +++ b/pom.xml @@ -24,12 +24,12 @@ Copyright (c) 2012 - Jeremy Long pom - dependency-check-core - dependency-check-cli - dependency-check-ant - dependency-check-maven - dependency-check-utils - dependency-check-plugin + utils + core + cli + ant + maven + archetype build-reporting Dependency-Check @@ -379,6 +379,26 @@ Copyright (c) 2012 - Jeremy Long + + + add-dynamic-properties-site + pre-site + + execute + + + + + + + @@ -630,7 +650,7 @@ Copyright (c) 2012 - Jeremy Long - + diff --git a/dependency-check-utils/pom.xml b/utils/pom.xml similarity index 100% rename from dependency-check-utils/pom.xml rename to utils/pom.xml diff --git a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/Checksum.java b/utils/src/main/java/org/owasp/dependencycheck/utils/Checksum.java similarity index 100% rename from dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/Checksum.java rename to utils/src/main/java/org/owasp/dependencycheck/utils/Checksum.java diff --git a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/DownloadFailedException.java b/utils/src/main/java/org/owasp/dependencycheck/utils/DownloadFailedException.java similarity index 100% rename from dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/DownloadFailedException.java rename to utils/src/main/java/org/owasp/dependencycheck/utils/DownloadFailedException.java diff --git a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/Downloader.java b/utils/src/main/java/org/owasp/dependencycheck/utils/Downloader.java similarity index 100% rename from dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/Downloader.java rename to utils/src/main/java/org/owasp/dependencycheck/utils/Downloader.java diff --git a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/ExpectedObjectInputStream.java b/utils/src/main/java/org/owasp/dependencycheck/utils/ExpectedObjectInputStream.java similarity index 100% rename from dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/ExpectedObjectInputStream.java rename to utils/src/main/java/org/owasp/dependencycheck/utils/ExpectedObjectInputStream.java diff --git a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/ExtractionException.java b/utils/src/main/java/org/owasp/dependencycheck/utils/ExtractionException.java similarity index 100% rename from dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/ExtractionException.java rename to utils/src/main/java/org/owasp/dependencycheck/utils/ExtractionException.java diff --git a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/FileUtils.java b/utils/src/main/java/org/owasp/dependencycheck/utils/FileUtils.java similarity index 100% rename from dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/FileUtils.java rename to utils/src/main/java/org/owasp/dependencycheck/utils/FileUtils.java diff --git a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/InvalidSettingException.java b/utils/src/main/java/org/owasp/dependencycheck/utils/InvalidSettingException.java similarity index 100% rename from dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/InvalidSettingException.java rename to utils/src/main/java/org/owasp/dependencycheck/utils/InvalidSettingException.java diff --git a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/SSLSocketFactoryEx.java b/utils/src/main/java/org/owasp/dependencycheck/utils/SSLSocketFactoryEx.java similarity index 100% rename from dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/SSLSocketFactoryEx.java rename to utils/src/main/java/org/owasp/dependencycheck/utils/SSLSocketFactoryEx.java diff --git a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/Settings.java b/utils/src/main/java/org/owasp/dependencycheck/utils/Settings.java similarity index 100% rename from dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/Settings.java rename to utils/src/main/java/org/owasp/dependencycheck/utils/Settings.java diff --git a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/URLConnectionFactory.java b/utils/src/main/java/org/owasp/dependencycheck/utils/URLConnectionFactory.java similarity index 100% rename from dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/URLConnectionFactory.java rename to utils/src/main/java/org/owasp/dependencycheck/utils/URLConnectionFactory.java diff --git a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/URLConnectionFailureException.java b/utils/src/main/java/org/owasp/dependencycheck/utils/URLConnectionFailureException.java similarity index 100% rename from dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/URLConnectionFailureException.java rename to utils/src/main/java/org/owasp/dependencycheck/utils/URLConnectionFailureException.java diff --git a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/XmlUtils.java b/utils/src/main/java/org/owasp/dependencycheck/utils/XmlUtils.java similarity index 100% rename from dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/XmlUtils.java rename to utils/src/main/java/org/owasp/dependencycheck/utils/XmlUtils.java diff --git a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/package-info.java b/utils/src/main/java/org/owasp/dependencycheck/utils/package-info.java similarity index 100% rename from dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/package-info.java rename to utils/src/main/java/org/owasp/dependencycheck/utils/package-info.java diff --git a/dependency-check-utils/src/site/markdown/index.md b/utils/src/site/markdown/index.md similarity index 100% rename from dependency-check-utils/src/site/markdown/index.md rename to utils/src/site/markdown/index.md diff --git a/dependency-check-utils/src/site/resources/images/dc-utils.svg b/utils/src/site/resources/images/dc-utils.svg similarity index 100% rename from dependency-check-utils/src/site/resources/images/dc-utils.svg rename to utils/src/site/resources/images/dc-utils.svg diff --git a/dependency-check-utils/src/site/site.xml b/utils/src/site/site.xml similarity index 100% rename from dependency-check-utils/src/site/site.xml rename to utils/src/site/site.xml diff --git a/dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/BaseTest.java b/utils/src/test/java/org/owasp/dependencycheck/utils/BaseTest.java similarity index 100% rename from dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/BaseTest.java rename to utils/src/test/java/org/owasp/dependencycheck/utils/BaseTest.java diff --git a/dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/ChecksumTest.java b/utils/src/test/java/org/owasp/dependencycheck/utils/ChecksumTest.java similarity index 100% rename from dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/ChecksumTest.java rename to utils/src/test/java/org/owasp/dependencycheck/utils/ChecksumTest.java diff --git a/dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/DownloaderIT.java b/utils/src/test/java/org/owasp/dependencycheck/utils/DownloaderIT.java similarity index 100% rename from dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/DownloaderIT.java rename to utils/src/test/java/org/owasp/dependencycheck/utils/DownloaderIT.java diff --git a/dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/DownloaderTest.java b/utils/src/test/java/org/owasp/dependencycheck/utils/DownloaderTest.java similarity index 100% rename from dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/DownloaderTest.java rename to utils/src/test/java/org/owasp/dependencycheck/utils/DownloaderTest.java diff --git a/dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/ExpectedObjectInputStreamTest.java b/utils/src/test/java/org/owasp/dependencycheck/utils/ExpectedObjectInputStreamTest.java similarity index 100% rename from dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/ExpectedObjectInputStreamTest.java rename to utils/src/test/java/org/owasp/dependencycheck/utils/ExpectedObjectInputStreamTest.java diff --git a/dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/FileUtilsTest.java b/utils/src/test/java/org/owasp/dependencycheck/utils/FileUtilsTest.java similarity index 100% rename from dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/FileUtilsTest.java rename to utils/src/test/java/org/owasp/dependencycheck/utils/FileUtilsTest.java diff --git a/dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/SettingsTest.java b/utils/src/test/java/org/owasp/dependencycheck/utils/SettingsTest.java similarity index 100% rename from dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/SettingsTest.java rename to utils/src/test/java/org/owasp/dependencycheck/utils/SettingsTest.java diff --git a/dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/SimplePojo.java b/utils/src/test/java/org/owasp/dependencycheck/utils/SimplePojo.java similarity index 100% rename from dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/SimplePojo.java rename to utils/src/test/java/org/owasp/dependencycheck/utils/SimplePojo.java diff --git a/dependency-check-utils/src/test/resources/checkSumTest.file b/utils/src/test/resources/checkSumTest.file similarity index 100% rename from dependency-check-utils/src/test/resources/checkSumTest.file rename to utils/src/test/resources/checkSumTest.file diff --git a/dependency-check-utils/src/test/resources/dependencycheck.properties b/utils/src/test/resources/dependencycheck.properties similarity index 100% rename from dependency-check-utils/src/test/resources/dependencycheck.properties rename to utils/src/test/resources/dependencycheck.properties diff --git a/dependency-check-utils/src/test/resources/logback-test.xml b/utils/src/test/resources/logback-test.xml similarity index 100% rename from dependency-check-utils/src/test/resources/logback-test.xml rename to utils/src/test/resources/logback-test.xml diff --git a/dependency-check-utils/src/test/resources/test.properties b/utils/src/test/resources/test.properties similarity index 100% rename from dependency-check-utils/src/test/resources/test.properties rename to utils/src/test/resources/test.properties