From a0d0346d8c97ddd62e2b358107ff3ac59256bdb9 Mon Sep 17 00:00:00 2001 From: Ruud Senden <8635138+rsenden@users.noreply.github.com> Date: Thu, 13 Jul 2023 11:54:49 +0200 Subject: [PATCH] refactor: Restructure Gradle projects --- build.gradle | 3 -- .../fcli => fcli-core/fcli-app}/build.gradle | 0 .../java/com/fortify/cli/app/FortifyCLI.java | 0 .../cli/app/FortifyCLIVersionProvider.java | 0 .../app/_main/cli/cmd/FCLIRootCommands.java | 0 .../com/fortify/cli/app/package-info.java | 0 .../app/runner/DefaultFortifyCLIRunner.java | 0 .../cli/app/runner/IFortifyCLIRunner.java | 0 .../util/FortifyCLIDefaultValueProvider.java | 0 .../util/FortifyCLIDynamicInitializer.java | 0 .../util/FortifyCLIStaticInitializer.java | 0 .../util/I18nParameterExceptionHandler.java | 0 .../fcli/fcli-app/jasypt/reflect-config.json | 0 .../fcli/fcli-app/logback/reflect-config.json | 0 .../fcli-app/static/native-image.properties | 0 .../fcli/fcli-app/static/reflect-config.json | 0 .../fcli-app}/src/main/resources/logback.xml | 0 .../java/com/fortify/cli/FortifyCLITest.java | 0 .../com/fortify/cli/GradlePropertiesTest.java | 0 .../fcli-common/.gitignore | 0 .../fcli-common/build.gradle | 0 .../cli/cmd/AbstractFortifyCLICommand.java | 0 .../common/cli/mixin/CommandHelperMixin.java | 0 .../common/cli/mixin/CommonOptionMixins.java | 0 .../cli/common/cli/mixin/ICommandAware.java | 0 .../cli/common/cli/util/EnvSuffix.java | 0 .../http/proxy/helper/ProxyDescriptor.java | 0 .../common/http/proxy/helper/ProxyHelper.java | 0 .../helper/TrustStoreConfigDescriptor.java | 0 .../helper/TrustStoreConfigHelper.java | 0 .../i18n/helper/LanguageDescriptor.java | 0 .../common/i18n/helper/LanguageHelper.java | 0 .../cli/common/json/IJsonNodeHolder.java | 0 .../fortify/cli/common/json/JsonHelper.java | 0 .../cli/common/json/JsonNodeHolder.java | 0 .../cli/common/output/OutputFormat.java | 0 .../cmd/AbstractGenerateConfigCommand.java | 0 .../output/cli/cmd/AbstractOutputCommand.java | 0 .../output/cli/cmd/IBaseRequestSupplier.java | 0 .../output/cli/cmd/IJsonNodeSupplier.java | 0 .../cli/mixin/AbstractOutputHelperMixin.java | 0 .../output/cli/mixin/IOutputHelper.java | 0 .../output/cli/mixin/OutputHelperMixins.java | 0 .../cli/mixin/OutputOptionsArgGroup.java | 0 .../OutputWriterWithQueryFactoryMixin.java | 0 .../cli/mixin/QueryOptionsArgGroup.java | 0 .../StandardOutputWriterFactoryMixin.java | 0 .../common/output/cli/mixin/package-info.java | 0 .../common/output/product/IProductHelper.java | 0 .../product/IProductHelperSupplier.java | 0 .../output/product/NoOpProductHelper.java | 0 .../common/output/query/IJsonNodeMatcher.java | 0 .../query/IQueryExpressionSupplier.java | 0 .../common/output/query/QueryExpression.java | 0 .../query/QueryExpressionTypeConverter.java | 0 .../AbstractJsonNodeTransformer.java | 0 .../IActionCommandResultSupplier.java | 0 .../output/transform/IInputTransformer.java | 0 .../transform/IJsonNodeTransformer.java | 0 .../output/transform/IRecordTransformer.java | 0 .../transform/PropertyPathFormatter.java | 0 .../fields/AddFieldsTransformer.java | 0 .../fields/RenameFieldsTransformer.java | 0 .../transform/flatten/FlattenTransformer.java | 0 .../identity/IdentityTransformer.java | 0 .../common/output/transform/package-info.java | 0 .../single/ToSingleObjectNodeTransformer.java | 0 .../writer/CommandSpecMessageResolver.java | 0 .../writer/IBasicOutputConfigSupplier.java | 0 .../output/writer/IMessageResolver.java | 0 .../writer/IOutputWriterFactorySupplier.java | 0 .../output/writer/ISingularSupplier.java | 0 .../output/writer/output/IOutputWriter.java | 0 .../writer/output/IOutputWriterFactory.java | 0 .../output/query/OutputWriterWithQuery.java | 0 .../standard/IOutputConfigSupplier.java | 0 .../output/standard/IOutputOptions.java | 0 .../output/standard/OutputFormatConfig.java | 0 .../standard/OutputFormatConfigConverter.java | 0 .../output/standard/StandardOutputConfig.java | 0 .../output/standard/StandardOutputWriter.java | 0 .../output/standard/VariableStoreConfig.java | 0 .../VariableStoreConfigConverter.java | 0 .../record/AbstractFormattedRecordWriter.java | 0 .../writer/record/AbstractRecordWriter.java | 0 .../output/writer/record/IRecordWriter.java | 0 .../writer/record/IRecordWriterFactory.java | 0 .../writer/record/RecordWriterConfig.java | 0 .../writer/record/csv/CsvRecordWriter.java | 0 .../record/csv/CsvRecordWriterFactory.java | 0 .../writer/record/csv/package-info.java | 0 .../writer/record/expr/ExprRecordWriter.java | 0 .../record/expr/ExprRecordWriterFactory.java | 0 .../writer/record/json/JsonRecordWriter.java | 0 .../record/json/JsonRecordWriterFactory.java | 0 .../writer/record/json/package-info.java | 0 .../JsonPropertiesRecordWriter.java | 0 .../JsonPropertiesRecordWriterFactory.java | 0 .../output/writer/record/package-info.java | 0 .../record/table/TableRecordWriter.java | 0 .../table/TableRecordWriterFactory.java | 0 .../writer/record/table/package-info.java | 0 .../writer/record/tree/TreeRecordWriter.java | 0 .../record/tree/TreeRecordWriterFactory.java | 0 .../writer/record/tree/package-info.java | 0 .../writer/record/xml/XmlRecordWriter.java | 0 .../record/xml/XmlRecordWriterFactory.java | 0 .../writer/record/xml/package-info.java | 0 .../writer/record/yaml/YamlRecordWriter.java | 0 .../record/yaml/YamlRecordWriterFactory.java | 0 .../writer/record/yaml/package-info.java | 0 .../cli/mixin/ProgressWriterFactoryMixin.java | 0 .../mixin/ProgressWriterTypeConverter.java | 0 .../helper/AbstractProgressWriterWrapper.java | 0 .../progress/helper/IProgressWriter.java | 0 .../progress/helper/IProgressWriterI18n.java | 0 .../progress/helper/ProgressWriterI18n.java | 0 .../progress/helper/ProgressWriterType.java | 0 ...ractConfigurableReportGenerateCommand.java | 0 .../cmd/AbstractReportGenerateCommand.java | 0 .../collector/IReportResultsCollector.java | 0 .../report/config/IReportSourceConfig.java | 0 .../config/IReportSourceSupplierConfig.java | 0 ...AbstractReportUnirestResultsGenerator.java | 0 .../generator/IReportResultsGenerator.java | 0 .../common/report/logger/IReportLogger.java | 0 .../common/report/logger/ReportLogger.java | 0 .../report/writer/AbstractReportWriter.java | 0 .../common/report/writer/IReportWriter.java | 0 .../common/report/writer/ReportDirWriter.java | 0 .../common/report/writer/ReportZipWriter.java | 0 .../rest/cli/cmd/AbstractRestCallCommand.java | 0 .../rest/cli/cmd/AbstractWaitForCommand.java | 0 ...tandardWaitHelperProgressMonitorMixin.java | 0 .../rest/cli/mixin/UrlConfigOptions.java | 0 .../cli/mixin/WaitHelperControlOptions.java | 0 .../rest/cli/mixin/WaitHelperWaitOptions.java | 0 .../common/rest/cli/mixin/package-info.java | 0 .../rest/paging/INextPageUrlProducer.java | 0 .../paging/INextPageUrlProducerSupplier.java | 0 .../LinkHeaderNextPageUrlProducerFactory.java | 0 .../cli/common/rest/paging/PagingHelper.java | 0 ...ServerSideQueryParamGeneratorSupplier.java | 0 .../IServerSideQueryParamValueGenerator.java | 0 .../mixin/AbstractServerSideQueryMixin.java | 0 .../rest/unirest/GenericUnirestFactory.java | 0 .../rest/unirest/IHttpRequestUpdater.java | 0 .../unirest/IUnirestInstanceSupplier.java | 0 .../common/rest/unirest/IfFailureHandler.java | 0 .../UnexpectedHttpResponseException.java | 0 .../rest/unirest/config/IUrlConfig.java | 0 .../unirest/config/IUrlConfigSupplier.java | 0 .../config/IUserCredentialsConfig.java | 0 .../config/UnirestBasicAuthConfigurer.java | 0 .../config/UnirestJsonHeaderConfigurer.java | 0 ...irestUnexpectedHttpResponseConfigurer.java | 0 .../config/UnirestUrlConfigConfigurer.java | 0 .../common/rest/unirest/config/UrlConfig.java | 0 .../rest/unirest/config/package-info.java | 0 .../cli/common/rest/unirest/package-info.java | 0 .../wait/IWaitHelperControlProperties.java | 0 .../rest/wait/IWaitHelperProgressMonitor.java | 0 .../rest/wait/IWaitHelperWaitDefinition.java | 0 .../IWaitHelperWaitDefinitionSupplier.java | 0 .../StandardWaitHelperProgressMonitor.java | 0 .../cli/common/rest/wait/WaitHelper.java | 0 .../common/rest/wait/WaitTimeoutAction.java | 0 .../wait/WaitUnknownOrFailureStateAction.java | 0 .../wait/WaitUnknownStateRequestedAction.java | 0 .../cli/cmd/AbstractSessionCommand.java | 0 .../cli/cmd/AbstractSessionListCommand.java | 0 .../cli/cmd/AbstractSessionLoginCommand.java | 0 .../cli/cmd/AbstractSessionLogoutCommand.java | 0 ...bstractSessionDescriptorSupplierMixin.java | 0 ...ctSessionUnirestInstanceSupplierMixin.java | 0 .../session/cli/mixin/SessionNameMixin.java | 0 .../cli/mixin/UserCredentialOptions.java | 0 .../helper/AbstractSessionDescriptor.java | 0 ...tSessionDescriptorWithSingleUrlConfig.java | 0 .../session/helper/AbstractSessionHelper.java | 0 .../session/helper/ISessionDescriptor.java | 0 .../helper/ISessionDescriptorSupplier.java | 0 .../common/session/helper/SessionSummary.java | 0 .../expression/AbstractSpelNodeVisitor.java | 0 .../common/spring/expression/SpelHelper.java | 0 .../spring/expression/SpelNodeHelper.java | 0 .../expression/StandardSpelFunctions.java | 0 .../AbstractSimpleSpelNodeValidator.java | 0 .../validator/AbstractSpelNodeValidator.java | 0 .../cli/common/spring/package-info.java | 0 .../com/fortify/cli/common/util/Counter.java | 0 .../cli/common/util/DateTimePeriodHelper.java | 0 .../fortify/cli/common/util/DisableTest.java | 0 .../cli/common/util/EncryptionHelper.java | 0 .../fortify/cli/common/util/EnvHelper.java | 0 .../util/FcliBuildPropertiesHelper.java | 0 .../cli/common/util/FcliDataHelper.java | 0 .../cli/common/util/IndexAwareSet.java | 0 .../fortify/cli/common/util/JavaHelper.java | 0 .../cli/common/util/PicocliSpecHelper.java | 0 .../fortify/cli/common/util/StringUtils.java | 0 .../fortify/cli/common/util/package-info.java | 0 .../variable/DefaultVariablePropertyName.java | 0 .../cli/common/variable/EncryptVariable.java | 0 .../common/variable/FcliVariableHelper.java | 0 .../src/main/java/picocli/AutoComplete.java | 0 .../src/main/java/picocli/CommandLine.java | 0 .../src/main/java/picocli/README.TXT | 0 .../common/i18n/FortifyCLIMessages.properties | 0 .../cli/common/rest/wait/WaitHelperTest.java | 0 fcli-core/fcli-config/build.gradle | 1 + .../_main/cli/cmd/ConfigClearCommand.java | 0 .../config/_main/cli/cmd/ConfigCommands.java | 0 .../config/_main/cli/cmd/package-info.java | 0 .../cli/cmd/LanguageClearCommand.java | 0 .../language/cli/cmd/LanguageCommands.java | 0 .../language/cli/cmd/LanguageGetCommand.java | 0 .../language/cli/cmd/LanguageListCommand.java | 0 .../language/cli/cmd/LanguageSetCommand.java | 0 .../config/proxy/cli/cmd/ProxyAddCommand.java | 0 .../proxy/cli/cmd/ProxyClearCommand.java | 0 .../config/proxy/cli/cmd/ProxyCommands.java | 0 .../proxy/cli/cmd/ProxyDeleteCommand.java | 0 .../proxy/cli/cmd/ProxyListCommand.java | 0 .../proxy/cli/cmd/ProxyUpdateCommand.java | 0 .../proxy/cli/mixin/AbstractProxyOptions.java | 0 .../proxy/cli/mixin/ProxyAddOptions.java | 0 .../proxy/cli/mixin/ProxyUpdateOptions.java | 0 .../proxy/helper/ProxyOutputHelper.java | 0 .../cli/cmd/TrustStoreClearCommand.java | 0 .../cli/cmd/TrustStoreCommands.java | 0 .../cli/cmd/TrustStoreGetCommand.java | 0 .../cli/cmd/TrustStoreSetCommand.java | 0 .../helper/TrustStoreOutputHelper.java | 0 .../cli/config/i18n/ConfigMessages.properties | 0 .../fcli-fod/build.gradle | 2 ++ .../AbstractFoDBaseRequestOutputCommand.java | 0 .../cli/AbstractFoDJsonNodeOutputCommand.java | 0 .../output/cli/AbstractFoDOutputCommand.java | 0 .../output/mixin/FoDOutputHelperMixins.java | 0 .../output/mixin/FoDProductHelperMixin.java | 0 .../fortify/cli/fod/_common/rest/FoDUrls.java | 0 .../_common/rest/helper/FoDErrorResponse.java | 0 .../rest/helper/FoDFileTransferBase.java | 0 .../helper/FoDFilterResultsTransformer.java | 0 .../rest/helper/FoDInputTransformer.java | 0 .../_common/rest/helper/FoDPagingHelper.java | 0 .../rest/helper/FoDUploadResponse.java | 0 .../rest/query/FoDFiltersParamGenerator.java | 0 .../query/cli/mixin/FoDFiltersParamMixin.java | 0 .../session/cli/cmd/FoDSessionCommands.java | 0 .../cli/cmd/FoDSessionListCommand.java | 0 .../cli/cmd/FoDSessionLoginCommand.java | 0 .../cli/cmd/FoDSessionLogoutCommand.java | 0 .../cli/mixin/FoDSessionLoginOptions.java | 0 .../session/helper/FoDSessionDescriptor.java | 0 .../session/helper/FoDSessionHelper.java | 0 .../session/helper/oauth/FoDOAuthHelper.java | 0 .../helper/oauth/FoDTokenCreateResponse.java | 0 .../helper/oauth/IFoDClientCredentials.java | 0 .../helper/oauth/IFoDUserCredentials.java | 0 .../cli/fod/_common/util/FoDConstants.java | 0 .../cli/fod/_common/util/FoDEnums.java | 0 .../cli/fod/_main/cli/cmd/FoDCommands.java | 0 .../cli/helper/FoDAttributeDescriptor.java | 0 .../attr/cli/helper/FoDAttributeHelper.java | 0 .../cli/helper/FoDPickListDescriptor.java | 0 .../cli/mixin/FoDAttributeUpdateOptions.java | 0 .../cli/fod/app/cli/cmd/FoDAppCommands.java | 0 .../app/cli/cmd/FoDAppCreateAppCommand.java | 0 .../FoDAppCreateMicroserviceAppCommand.java | 0 .../cli/cmd/FoDAppCreateMobileAppCommand.java | 0 .../cli/cmd/FoDAppCreateWebAppCommand.java | 0 .../fod/app/cli/cmd/FoDAppDeleteCommand.java | 0 .../cli/fod/app/cli/cmd/FoDAppGetCommand.java | 0 .../fod/app/cli/cmd/FoDAppListCommand.java | 0 .../fod/app/cli/cmd/FoDAppUpdateCommand.java | 0 .../app/cli/mixin/FoDAppResolverMixin.java | 0 .../fod/app/cli/mixin/FoDAppTypeOptions.java | 0 .../cli/mixin/FoDCriticalityTypeOptions.java | 0 .../cli/mixin/FoDSdlcStatusTypeOptions.java | 0 .../fod/app/helper/FoDAppCreateRequest.java | 0 .../cli/fod/app/helper/FoDAppDescriptor.java | 0 .../cli/fod/app/helper/FoDAppHelper.java | 0 .../fod/app/helper/FoDAppUpdateRequest.java | 0 .../fod/lookup/cli/cmd/FoDLookupCommands.java | 0 .../lookup/cli/cmd/FoDLookupListCommand.java | 0 .../cli/mixin/FoDLookupTypeOptions.java | 0 .../lookup/helper/FoDLookupDescriptor.java | 0 .../fod/lookup/helper/FoDLookupHelper.java | 0 .../cli/cmd/FoDAppMicroserviceCommands.java | 0 .../cmd/FoDAppMicroserviceCreateCommand.java | 0 .../cmd/FoDAppMicroserviceDeleteCommand.java | 0 .../cmd/FoDAppMicroserviceListCommand.java | 0 .../cmd/FoDAppMicroserviceUpdateCommand.java | 0 .../FoDAppAndMicroserviceNameDescriptor.java | 0 ...oDAppAndMicroserviceNameResolverMixin.java | 0 .../FoDAppMicroserviceResolverMixin.java | 0 .../FoDAppMicroserviceUpdateOptions.java | 0 .../helper/FoDAppMicroserviceDescriptor.java | 0 .../helper/FoDAppMicroserviceHelper.java | 0 .../FoDAppMicroserviceUpdateRequest.java | 0 .../release/cli/cmd/FoDAppRelCommands.java | 0 .../cli/cmd/FoDAppRelCreateCommand.java | 0 .../cli/cmd/FoDAppRelDeleteCommand.java | 0 .../release/cli/cmd/FoDAppRelGetCommand.java | 0 .../release/cli/cmd/FoDAppRelListCommand.java | 0 .../cli/cmd/FoDAppRelUpdateCommand.java | 0 .../cli/mixin/FoDAppAndRelNameDescriptor.java | 0 .../mixin/FoDAppAndRelNameResolverMixin.java | 0 ...oDAppMicroserviceAndRelNameDescriptor.java | 0 .../FoDAppMicroserviceRelResolverMixin.java | 0 .../cli/mixin/FoDAppRelResolverMixin.java | 0 .../release/cli/mixin/FoDDelimiterMixin.java | 0 .../FoDAppRelAssessmentTypeDescriptor.java | 0 .../helper/FoDAppRelCreateRequest.java | 0 .../release/helper/FoDAppRelDescriptor.java | 0 .../fod/release/helper/FoDAppRelHelper.java | 0 .../helper/FoDAppRelUpdateRequest.java | 0 .../fod/rest/cli/cmd/FoDRestCallCommand.java | 0 .../cli/fod/rest/cli/cmd/FoDRestCommands.java | 0 .../rest/cli/mixin/FoDTimePeriodOptions.java | 0 .../cli/cmd/AbstractFoDScanImportCommand.java | 0 .../cli/cmd/AbstractFoDScanListCommand.java | 0 .../scan/cli/cmd/FoDScanCancelCommand.java | 0 .../cli/fod/scan/cli/cmd/FoDScanCommands.java | 0 .../fod/scan/cli/cmd/FoDScanGetCommand.java | 0 .../fod/scan/cli/cmd/FoDScanListCommand.java | 0 .../scan/cli/cmd/FoDScanWaitForCommand.java | 0 .../cmd/dast/FoDDastScanImportCommand.java | 0 .../cli/cmd/dast/FoDDastScanListCommand.java | 0 .../cli/cmd/dast/FoDDastScanStartCommand.java | 0 .../mobile/FoDMobileScanImportCommand.java | 0 .../cmd/mobile/FoDMobileScanListCommand.java | 0 .../cmd/mobile/FoDMobileScanStartCommand.java | 0 .../cli/cmd/oss/FoDOssScanImportCommand.java | 0 .../cli/cmd/oss/FoDOssScanListCommand.java | 0 .../cmd/sast/FoDSastScanImportCommand.java | 0 .../cli/cmd/sast/FoDSastScanListCommand.java | 0 .../cli/cmd/sast/FoDSastScanSetupCommand.java | 0 .../cli/cmd/sast/FoDSastScanStartCommand.java | 0 .../mixin/FoDAnalysisStatusTypeOptions.java | 0 .../cli/mixin/FoDAssessmentTypeOptions.java | 0 .../FoDEntitlementFrequencyTypeOptions.java | 0 .../FoDEntitlementPreferenceTypeOptions.java | 0 .../FoDInProgressScanActionTypeOptions.java | 0 ...DRemediationScanPreferenceTypeOptions.java | 0 .../scan/cli/mixin/FoDSbomFormatOptions.java | 0 .../scan/cli/mixin/FoDScanResolverMixin.java | 0 .../scan/cli/mixin/FoDScanTypeOptions.java | 0 .../helper/FoDAssessmentTypeDescriptor.java | 0 .../cli/fod/scan/helper/FoDImportScan.java | 0 .../scan/helper/FoDImportScanResponse.java | 0 .../FoDImportScanSessionDescriptor.java | 0 .../fod/scan/helper/FoDScanDescriptor.java | 0 .../cli/fod/scan/helper/FoDScanHelper.java | 0 .../scan/helper/FoDScanNotFoundException.java | 0 .../cli/fod/scan/helper/FoDScanStatus.java | 0 .../cli/fod/scan/helper/FoDStartScan.java | 0 .../fod/scan/helper/FoDStartScanResponse.java | 0 .../helper/dast/FoDDastScanDescriptor.java | 0 .../scan/helper/dast/FoDDastScanHelper.java | 0 .../dast/FoDDastScanSetupDescriptor.java | 0 .../helper/dast/FoDSetupDastScanRequest.java | 0 .../helper/dast/FoDStartDastScanRequest.java | 0 .../helper/mobile/FoDMobileScanHelper.java | 0 .../mobile/FoDMobileScanSetupDescriptor.java | 0 .../mobile/FoDStartMobileScanRequest.java | 0 .../cli/fod/scan/helper/oss/FoDOssHelper.java | 0 .../helper/sast/FoDSastScanDescriptor.java | 0 .../scan/helper/sast/FoDSastScanHelper.java | 0 .../sast/FoDSastScanSetupDescriptor.java | 0 .../helper/sast/FoDSetupSastScanRequest.java | 0 .../helper/sast/FoDStartSastScanRequest.java | 0 .../cli/fod/user/cli/cmd/FoDUserCommands.java | 0 .../user/cli/cmd/FoDUserCreateCommand.java | 0 .../user/cli/cmd/FoDUserDeleteCommand.java | 0 .../fod/user/cli/cmd/FoDUserGetCommand.java | 0 .../fod/user/cli/cmd/FoDUserListCommand.java | 0 .../user/cli/cmd/FoDUserUpdateCommand.java | 0 .../user/cli/mixin/FoDUserResolverMixin.java | 0 .../user/helper/FoDUserAppAccessRequest.java | 0 .../fod/user/helper/FoDUserCreateRequest.java | 0 .../fod/user/helper/FoDUserDescriptor.java | 0 .../cli/fod/user/helper/FoDUserHelper.java | 0 .../fod/user/helper/FoDUserUpdateRequest.java | 0 .../cli/cmd/FoDUserGroupCommands.java | 0 .../cli/cmd/FoDUserGroupCreateCommand.java | 0 .../cli/cmd/FoDUserGroupDeleteCommand.java | 0 .../cli/cmd/FoDUserGroupGetCommand.java | 0 .../cli/cmd/FoDUserGroupListCommand.java | 0 .../cli/cmd/FoDUserGroupUpdateCommand.java | 0 .../cli/mixin/FoDUserGroupResolverMixin.java | 0 .../helper/FoDUserGroupAppAccessRequest.java | 0 .../helper/FoDUserGroupCreateRequest.java | 0 .../helper/FoDUserGroupDescriptor.java | 0 .../user_group/helper/FoDUserGroupHelper.java | 0 .../helper/FoDUserGroupMembersRequest.java | 0 .../helper/FoDUserGroupUpdateRequest.java | 0 .../cli/fod/i18n/FoDMessages.properties | 0 .../query/FoDFilterParamGeneratorTest.java | 0 .../cli/fod/rest/query/filterparam.csv | 0 .../fcli-sc-dast/.gitkeep | 0 .../fcli-sc-dast/build.gradle | 2 ++ ...bstractSCDastBaseRequestOutputCommand.java | 0 .../AbstractSCDastJsonNodeOutputCommand.java | 0 .../cli/cmd/AbstractSCDastOutputCommand.java | 0 .../cli/mixin/SCDastOutputHelperMixins.java | 0 .../cli/mixin/SCDastProductHelperMixin.java | 0 .../rest/helper/SCDastInputTransformer.java | 0 .../rest/helper/SCDastPagingHelper.java | 0 .../cli/mixin/SCDastQueryParamsMixin.java | 0 .../cli/cmd/SCDastSessionCommands.java | 0 .../cli/cmd/SCDastSessionListCommand.java | 0 .../cli/cmd/SCDastSessionLoginCommand.java | 0 .../cli/cmd/SCDastSessionLogoutCommand.java | 0 .../cli/mixin/SCDastSessionLoginOptions.java | 0 .../cli/mixin/SCDastSessionLogoutOptions.java | 0 .../cli/mixin/SCDastUrlConfigOptions.java | 0 .../SCDastUserCredentialAndExpiryOptions.java | 0 .../mixin/SCDastUserCredentialOptions.java | 0 .../helper/SCDastSessionDescriptor.java | 0 .../session/helper/SCDastSessionHelper.java | 0 .../sc_dast/_common/util/SCDastConstants.java | 0 .../sc_dast/_main/cli/cmd/SCDastCommands.java | 0 .../rest/cli/cmd/SCDastRestCallCommand.java | 0 .../rest/cli/cmd/SCDastRestCommands.java | 0 .../cmd/AbstractSCDastScanOutputCommand.java | 0 .../scan/cli/cmd/SCDastScanCommands.java | 0 .../cli/cmd/SCDastScanDownloadCommand.java | 0 .../scan/cli/cmd/SCDastScanGetCommand.java | 0 .../scan/cli/cmd/SCDastScanListCommand.java | 0 .../scan/cli/cmd/SCDastScanStartCommand.java | 0 .../cli/cmd/SCDastScanWaitForCommand.java | 0 .../AbstractSCDastScanActionCommand.java | 0 .../cmd/action/SCDastScanCompleteCommand.java | 0 .../cmd/action/SCDastScanDeleteCommand.java | 0 .../SCDastScanImportFindingsCommand.java | 0 .../cmd/action/SCDastScanPauseCommand.java | 0 .../cmd/action/SCDastScanPublishCommand.java | 0 .../cmd/action/SCDastScanResumeCommand.java | 0 .../cli/mixin/SCDastScanResolverMixin.java | 0 .../scan/helper/SCDastScanDescriptor.java | 0 .../sc_dast/scan/helper/SCDastScanHelper.java | 0 .../sc_dast/scan/helper/SCDastScanStatus.java | 0 .../cli/cmd/SCDastScanPolicyCommands.java | 0 .../cli/cmd/SCDastScanPolicyGetCommand.java | 0 .../cli/cmd/SCDastScanPolicyListCommand.java | 0 .../mixin/SCDastScanPolicyResolverMixin.java | 0 .../helper/SCDastScanPolicyDescriptor.java | 0 .../helper/SCDastScanPolicyHelper.java | 0 .../cli/cmd/SCDastScanSettingsCommands.java | 0 .../cli/cmd/SCDastScanSettingsGetCommand.java | 0 .../cmd/SCDastScanSettingsListCommand.java | 0 .../SCDastScanSettingsResolverMixin.java | 0 .../helper/SCDastScanSettingsDescriptor.java | 0 .../helper/SCDastScanSettingsHelper.java | 0 .../sensor/cli/cmd/SCDastSensorCommands.java | 0 .../cli/cmd/SCDastSensorDisableCommand.java | 0 .../cli/cmd/SCDastSensorEnableCommand.java | 0 .../cli/cmd/SCDastSensorGetCommand.java | 0 .../cli/cmd/SCDastSensorListCommand.java | 0 .../cli/mixin/SCDastSensorResolverMixin.java | 0 .../sensor/helper/SCDastSensorDescriptor.java | 0 .../sensor/helper/SCDastSensorHelper.java | 0 .../sc_dast/i18n/SCDastMessages.properties | 0 .../fcli-sc-sast/.gitkeep | 0 .../fcli-sc-sast/build.gradle | 2 ++ ...astControllerBaseRequestOutputCommand.java | 0 ...SCSastControllerJsonNodeOutputCommand.java | 0 ...AbstractSCSastControllerOutputCommand.java | 0 ...ractSCSastSSCBaseRequestOutputCommand.java | 0 ...bstractSCSastSSCJsonNodeOutputCommand.java | 0 .../cmd/AbstractSCSastSSCOutputCommand.java | 0 .../SCSastControllerProductHelperMixin.java | 0 .../cli/mixin/SCSastOutputHelperMixins.java | 0 .../mixin/SCSastSSCProductHelperMixin.java | 0 .../rest/helper/SCSastInputTransformer.java | 0 .../rest/helper/SCSastUnirestHelper.java | 0 .../cli/cmd/SCSastSessionCommands.java | 0 .../cli/cmd/SCSastSessionListCommand.java | 0 .../cli/cmd/SCSastSessionLoginCommand.java | 0 .../cli/cmd/SCSastSessionLogoutCommand.java | 0 ...actSCSastUnirestInstanceSupplierMixin.java | 0 .../cli/mixin/SCSastSessionLoginOptions.java | 0 .../cli/mixin/SCSastSessionLogoutOptions.java | 0 .../cli/mixin/SCSastUrlConfigOptions.java | 0 .../SCSastUserCredentialAndExpiryOptions.java | 0 .../mixin/SCSastUserCredentialOptions.java | 0 .../helper/SCSastSessionDescriptor.java | 0 .../session/helper/SCSastSessionHelper.java | 0 .../sc_sast/_main/cli/cmd/SCSastCommands.java | 0 .../cmd/SCSastControllerRestCallCommand.java | 0 .../cli/cmd/SCSastControllerRestCommands.java | 0 .../SCSastControllerScanCancelCommand.java | 0 .../cmd/SCSastControllerScanStartCommand.java | 0 .../SCSastControllerScanStatusCommand.java | 0 .../SCSastControllerScanWaitForCommand.java | 0 .../scan/cli/cmd/SCSastScanCommands.java | 0 .../cli/mixin/ISCSastScanStartOptions.java | 0 .../cli/mixin/SCSastScanJobResolverMixin.java | 0 .../cli/mixin/SCSastScanStartMbsOptions.java | 0 .../mixin/SCSastScanStartOptionsArgGroup.java | 0 .../mixin/SCSastScanStartPackageOptions.java | 0 .../scan/helper/SCSastControllerJobType.java | 0 .../SCSastControllerScanJobArtifactState.java | 0 .../SCSastControllerScanJobDescriptor.java | 0 .../helper/SCSastControllerScanJobHelper.java | 0 .../helper/SCSastControllerScanJobState.java | 0 .../sc_sast/i18n/SCSastMessages.properties | 0 .../modules => fcli-core}/fcli-ssc/.gitignore | 0 .../fcli-ssc/build.gradle | 2 ++ .../AbstractSSCBaseRequestOutputCommand.java | 0 .../cmd/AbstractSSCJsonNodeOutputCommand.java | 0 .../cli/cmd/AbstractSSCOutputCommand.java | 0 .../cli/mixin/AbstractSSCBulkEmbedMixin.java | 0 .../cli/mixin/SSCOutputHelperMixins.java | 0 .../cli/mixin/SSCProductHelperMixin.java | 0 .../fortify/cli/ssc/_common/rest/SSCUrls.java | 0 .../_common/rest/bulk/ISSCEntityEmbedder.java | 0 .../rest/bulk/ISSCEntityEmbedderSupplier.java | 0 .../_common/rest/bulk/SSCBulkEmbedder.java | 0 .../rest/bulk/SSCBulkRequestBuilder.java | 0 .../ssc/_common/rest/bulk/package-info.java | 0 .../rest/helper/SSCInputTransformer.java | 0 .../_common/rest/helper/SSCPagingHelper.java | 0 .../rest/query/SSCQParamGenerator.java | 0 .../rest/query/SSCQParamValueGenerators.java | 0 .../rest/query/cli/mixin/SSCQParamMixin.java | 0 .../rest/transfer/SSCFileTransferHelper.java | 0 .../session/cli/cmd/SSCSessionCommands.java | 0 .../cli/cmd/SSCSessionListCommand.java | 0 .../cli/cmd/SSCSessionLoginCommand.java | 0 .../cli/cmd/SSCSessionLogoutCommand.java | 0 .../cli/mixin/SSCSessionLoginOptions.java | 0 .../cli/mixin/SSCSessionLogoutOptions.java | 0 .../session/helper/ISSCCredentialsConfig.java | 0 .../helper/ISSCUserCredentialsConfig.java | 0 .../session/helper/SSCSessionDescriptor.java | 0 .../session/helper/SSCSessionHelper.java | 0 .../cli/ssc/_main/cli/cmd/SSCCommands.java | 0 .../cli/cmd/SSCActivityFeedCommands.java | 0 .../cli/cmd/SSCActivityFeedListCommand.java | 0 .../ssc/alert/cli/cmd/SSCAlertCommands.java | 0 .../alert/cli/cmd/SSCAlertListCommand.java | 0 .../cli/cmd/SSCAlertDefinitionCommands.java | 0 .../cli/cmd/SSCAlertDefinitionGetCommand.java | 0 .../cmd/SSCAlertDefinitionListCommand.java | 0 .../cli/ssc/app/cli/cmd/SSCAppCommands.java | 0 .../ssc/app/cli/cmd/SSCAppDeleteCommand.java | 0 .../cli/ssc/app/cli/cmd/SSCAppGetCommand.java | 0 .../ssc/app/cli/cmd/SSCAppListCommand.java | 0 .../ssc/app/cli/cmd/SSCAppUpdateCommand.java | 0 .../app/cli/mixin/SSCAppResolverMixin.java | 0 .../cli/ssc/app/helper/SSCAppDescriptor.java | 0 .../cli/ssc/app/helper/SSCAppHelper.java | 0 .../cli/cmd/SSCAppVersionCommands.java | 0 .../cli/cmd/SSCAppVersionCreateCommand.java | 0 .../cli/cmd/SSCAppVersionDeleteCommand.java | 0 .../cli/cmd/SSCAppVersionGetCommand.java | 0 .../cli/cmd/SSCAppVersionListCommand.java | 0 .../cli/cmd/SSCAppVersionUpdateCommand.java | 0 .../SSCAppAndVersionNameResolverMixin.java | 0 .../mixin/SSCAppVersionBulkEmbedMixin.java | 0 .../cli/mixin/SSCAppVersionResolverMixin.java | 0 .../cli/mixin/SSCDelimiterMixin.java | 0 .../SSCAppAndVersionNameDescriptor.java | 0 .../helper/SSCAppVersionDescriptor.java | 0 .../helper/SSCAppVersionEmbedderSupplier.java | 0 .../helper/SSCAppVersionHelper.java | 0 ...actSSCAppVersionArtifactOutputCommand.java | 0 ...actSSCAppVersionArtifactUploadCommand.java | 0 .../SSCAppVersionArtifactApproveCommand.java | 0 .../cmd/SSCAppVersionArtifactCommands.java | 0 .../SSCAppVersionArtifactDeleteCommand.java | 0 ...AppVersionArtifactDownloadByIdCommand.java | 0 ...ppVersionArtifactDownloadStateCommand.java | 0 .../cmd/SSCAppVersionArtifactGetCommand.java | 0 .../cmd/SSCAppVersionArtifactListCommand.java | 0 ...SSCAppVersionArtifactPurgeByIdCommand.java | 0 ...pVersionArtifactPurgeOlderThanCommand.java | 0 .../SSCAppVersionArtifactUploadCommand.java | 0 .../SSCAppVersionArtifactWaitForCommand.java | 0 .../DebrickedLoginOptions.java | 0 .../DebrickedUrlConfigOptions.java | 0 ...VersionArtifactImportDebrickedCommand.java | 0 .../SSCAppVersionArtifactDownloadOptions.java | 0 .../SSCAppVersionArtifactResolverMixin.java | 0 .../SSCAppVersionArtifactDescriptor.java | 0 .../helper/SSCAppVersionArtifactHelper.java | 0 .../helper/SSCAppVersionArtifactStatus.java | 0 .../cmd/SSCAppVersionAttributeCommands.java | 0 .../SSCAppVersionAttributeListCommand.java | 0 .../cmd/SSCAppVersionAttributeSetCommand.java | 0 .../SSCAppVersionAttributeUpdateMixin.java | 0 .../helper/SSCAppVersionAttributeHelper.java | 0 .../SSCAppVersionAttributeListHelper.java | 0 .../SSCAppVersionAttributeUpdateBuilder.java | 0 .../cmd/SSCAppVersionFilterSetCommands.java | 0 .../cmd/SSCAppVersionFilterSetGetCommand.java | 0 .../SSCAppVersionFilterSetListCommand.java | 0 .../SSCAppVersionFilterSetResolverMixin.java | 0 .../SSCAppVersionFilterSetDescriptor.java | 0 .../helper/SSCAppVersionFilterSetHelper.java | 0 .../SSCAppVersionAuthEntityAddCommand.java | 0 .../cmd/SSCAppVersionAuthEntityCommands.java | 0 .../SSCAppVersionAuthEntityDeleteCommand.java | 0 .../SSCAppVersionAuthEntityListCommand.java | 0 .../mixin/SSCAppVersionAuthEntityMixin.java | 0 ...SCAppVersionAuthEntitiesUpdateBuilder.java | 0 .../cli/cmd/SSCAppVersionVulnCommands.java | 0 .../cmd/SSCAppVersionVulnCountCommand.java | 0 .../cmd/SSCAttributeDefinitionCommands.java | 0 .../cmd/SSCAttributeDefinitionGetCommand.java | 0 .../SSCAttributeDefinitionListCommand.java | 0 .../SSCAttributeDefinitionResolverMixin.java | 0 .../SSCAttributeDefinitionCategory.java | 0 .../domain/SSCAttributeDefinitionType.java | 0 .../SSCAttributeDefinitionDescriptor.java | 0 .../helper/SSCAttributeDefinitionHelper.java | 0 ...SCAttributeOptionDefinitionDescriptor.java | 0 .../ssc/event/cli/cmd/SSCEventCommands.java | 0 .../event/cli/cmd/SSCEventListCommand.java | 0 .../cli/cmd/SSCIssueTemplateCommands.java | 0 .../cmd/SSCIssueTemplateCreateCommand.java | 0 .../cmd/SSCIssueTemplateDeleteCommand.java | 0 .../cmd/SSCIssueTemplateDownloadCommand.java | 0 .../cli/cmd/SSCIssueTemplateGetCommand.java | 0 .../cli/cmd/SSCIssueTemplateListCommand.java | 0 .../cmd/SSCIssueTemplateUpdateCommand.java | 0 .../mixin/SSCIssueTemplateResolverMixin.java | 0 .../helper/SSCIssueTemplateDescriptor.java | 0 .../helper/SSCIssueTemplateHelper.java | 0 .../ssc/job/cli/cmd/SSCJobCancelCommand.java | 0 .../cli/ssc/job/cli/cmd/SSCJobCommands.java | 0 .../cli/ssc/job/cli/cmd/SSCJobGetCommand.java | 0 .../ssc/job/cli/cmd/SSCJobListCommand.java | 0 .../ssc/job/cli/cmd/SSCJobUpdateCommand.java | 0 .../job/cli/mixin/SSCJobResolverMixin.java | 0 .../cli/ssc/job/helper/SSCJobDescriptor.java | 0 .../cli/ssc/job/helper/SSCJobHelper.java | 0 .../ssc/plugin/cli/cmd/SSCPluginCommands.java | 0 .../cli/cmd/SSCPluginDisableCommand.java | 0 .../cli/cmd/SSCPluginEnableCommand.java | 0 .../plugin/cli/cmd/SSCPluginGetCommand.java | 0 .../cli/cmd/SSCPluginInstallCommand.java | 0 .../plugin/cli/cmd/SSCPluginListCommand.java | 0 .../cli/cmd/SSCPluginUninstallCommand.java | 0 .../cli/mixin/SSCPluginResolverMixin.java | 0 .../plugin/helper/SSCPluginStateHelper.java | 0 .../cli/cmd/SSCReportTemplateCommands.java | 0 .../cmd/SSCReportTemplateCreateCommand.java | 0 .../cmd/SSCReportTemplateDeleteCommand.java | 0 .../cmd/SSCReportTemplateDownloadCommand.java | 0 ...SCReportTemplateGenerateConfigCommand.java | 0 .../cli/cmd/SSCReportTemplateGetCommand.java | 0 .../cli/cmd/SSCReportTemplateListCommand.java | 0 .../mixin/SSCReportTemplateResolverMixin.java | 0 .../domain/SSCReportParameter.java | 0 .../domain/SSCReportParameterOption.java | 0 .../domain/SSCReportParameterType.java | 0 .../domain/SSCReportRenderingEngineType.java | 0 .../domain/SSCReportTemplateDef.java | 0 .../report_template/domain/SSCReportType.java | 0 .../helper/SSCReportTemplateDescriptor.java | 0 .../helper/SSCReportTemplateHelper.java | 0 .../ssc/rest/cli/cmd/SSCRestCallCommand.java | 0 .../cli/ssc/rest/cli/cmd/SSCRestCommands.java | 0 .../cli/ssc/role/cli/cmd/SSCRoleCommands.java | 0 .../role/cli/cmd/SSCRoleCreateCommand.java | 0 .../role/cli/cmd/SSCRoleDeleteCommand.java | 0 .../ssc/role/cli/cmd/SSCRoleGetCommand.java | 0 .../ssc/role/cli/cmd/SSCRoleListCommand.java | 0 .../role/cli/mixin/SSCRoleResolverMixin.java | 0 .../ssc/role/helper/SSCRoleDescriptor.java | 0 .../cli/ssc/role/helper/SSCRoleHelper.java | 0 .../cli/cmd/SSCRolePermissionCommands.java | 0 .../cli/cmd/SSCRolePermissionGetCommand.java | 0 .../cli/cmd/SSCRolePermissionListCommand.java | 0 .../mixin/SSCRolePermissionResolverMixin.java | 0 .../helper/SSCRolePermissionDescriptor.java | 0 .../helper/SSCRolePermissionHelper.java | 0 .../cli/cmd/SSCSeedBundleCommands.java | 0 .../cli/cmd/SSCSeedBundleUploadCommand.java | 0 .../cli/cmd/AbstractSSCTokenCommand.java | 0 .../ssc/token/cli/cmd/SSCTokenCommands.java | 0 .../token/cli/cmd/SSCTokenCreateCommand.java | 0 .../token/cli/cmd/SSCTokenListCommand.java | 0 .../token/cli/cmd/SSCTokenRevokeCommand.java | 0 .../token/cli/cmd/SSCTokenUpdateCommand.java | 0 .../mixin/SSCTokenCommandUrlConfigMixin.java | 0 .../ssc/token/helper/SSCTokenConverter.java | 0 .../token/helper/SSCTokenCreateRequest.java | 0 .../token/helper/SSCTokenCreateResponse.java | 0 .../cli/ssc/token/helper/SSCTokenHelper.java | 0 .../token/helper/SSCTokenUpdateRequest.java | 0 .../cli/cmd/SSCTokenDefinitionCommands.java | 0 .../cmd/SSCTokenDefinitionListCommand.java | 0 .../user/cli/cmd/SSCAuthEntityCommands.java | 0 .../cli/cmd/SSCAuthEntityDeleteCommand.java | 0 .../user/cli/cmd/SSCAuthEntityGetCommand.java | 0 .../cli/cmd/SSCAuthEntityListCommand.java | 0 .../cli/mixin/SSCAuthEntityResolverMixin.java | 0 .../user/helper/SSCAuthEntitiesHelper.java | 0 .../helper/SSCAuthEntitySpecPredicate.java | 0 .../cli/ssc/i18n/SSCMessages.properties | 0 .../report_template/ReportTemplateConfig.yml | 0 .../rest/query/SSCQParamGeneratorTest.java | 0 .../com/fortify/cli/ssc/rest/query/qparam.csv | 0 fcli-core/fcli-state/build.gradle | 1 + .../_main/cli/cmd/StateClearCommand.java | 0 .../state/_main/cli/cmd/StateCommands.java | 0 .../cli/state/_main/cli/cmd/package-info.java | 0 .../cli/cmd/VariableClearCommand.java | 0 .../variable/cli/cmd/VariableCommands.java | 0 .../cli/cmd/VariableContentsCommand.java | 0 .../cli/cmd/VariableDeleteCommand.java | 0 .../variable/cli/cmd/VariableGetCommand.java | 0 .../variable/cli/cmd/VariableListCommand.java | 0 .../cli/mixin/VariableOutputHelperMixins.java | 0 .../cli/mixin/VariableResolverMixin.java | 0 .../cli/state/i18n/StateMessages.properties | 0 fcli-core/fcli-tool/build.gradle | 1 + .../cli/cmd/AbstractToolInstallCommand.java | 0 .../cli/cmd/AbstractToolListCommand.java | 0 .../cli/cmd/AbstractToolUninstallCommand.java | 0 .../helper/ToolDownloadDescriptor.java | 0 .../cli/tool/_common/helper/ToolHelper.java | 0 .../helper/ToolVersionCombinedDescriptor.java | 0 .../helper/ToolVersionDownloadDescriptor.java | 0 .../helper/ToolVersionInstallDescriptor.java | 0 .../cli/tool/_common/util/FileUtils.java | 0 .../cli/tool/_main/cli/cmd/ToolCommands.java | 0 .../cli/cmd/ToolFoDUploaderCommands.java | 0 .../cmd/ToolFoDUploaderInstallCommand.java | 0 .../cli/cmd/ToolFoDUploaderListCommand.java | 0 .../cmd/ToolFoDUploaderUninstallCommand.java | 0 .../cli/cmd/ToolSCClientCommands.java | 0 .../cli/cmd/ToolSCClientInstallCommand.java | 0 .../cli/cmd/ToolSCClientListCommand.java | 0 .../cli/cmd/ToolSCClientUninstallCommand.java | 0 .../cli/cmd/ToolVulnExporterCommands.java | 0 .../cmd/ToolVulnExporterInstallCommand.java | 0 .../cli/cmd/ToolVulnExporterListCommand.java | 0 .../cmd/ToolVulnExporterUninstallCommand.java | 0 .../tool/fod-uploader/extra-files/.gitignore | 0 .../fod-uploader/extra-files/bin/FoDUpload | 0 .../extra-files/bin/FoDUpload.bat | 0 .../cli/tool/fod-uploader/fod-uploader.yaml | 0 .../cli/tool/i18n/ToolMessages.properties | 0 .../fortify/cli/tool/sc-client/sc-client.yaml | 0 .../tool/vuln-exporter/extra-files/.gitignore | 0 .../bin/FortifyVulnerabilityExporter | 0 .../bin/FortifyVulnerabilityExporter.bat | 0 .../cli/tool/vuln-exporter/vuln-exporter.yaml | 0 .../fcli-util/.gitignore | 0 .../fcli-util/build.gradle | 2 ++ .../cli/util/_main/cli/cmd/UtilCommands.java | 0 .../cli/cmd/AllCommandsCommands.java | 0 .../cli/cmd/AllCommandsListCommand.java | 0 .../cli/cmd/AllCommandsUsageCommand.java | 0 .../AllCommandsCommandSelectorMixin.java | 0 .../mixin/AllCommandsOutputHelperMixins.java | 0 .../cli/cmd/AutoCompleteCommands.java | 0 .../cmd/AutoCompleteGenerationCommand.java | 0 .../crypto/cli/cmd/AbstractCryptoCommand.java | 0 .../util/crypto/cli/cmd/CryptoCommands.java | 0 .../crypto/cli/cmd/CryptoDecryptCommand.java | 0 .../crypto/cli/cmd/CryptoEncryptCommand.java | 0 .../msp_report/cli/cmd/MspReportCommands.java | 0 .../cli/cmd/MspReportGenerateCommand.java | 0 .../cmd/MspReportGenerateConfigCommand.java | 0 .../collector/MspReportAppCollector.java | 0 .../collector/MspReportAppScanCollector.java | 0 .../MspReportAppVersionCollector.java | 0 .../collector/MspReportArtifactCollector.java | 0 .../collector/MspReportResultsCollector.java | 0 .../config/IMspReportSourceConfig.java | 0 .../msp_report/config/MspReportConfig.java | 0 .../config/MspReportSSCSourceConfig.java | 0 .../config/MspReportSourcesConfig.java | 0 ...tractMspReportUnirestResultsGenerator.java | 0 .../generator/ssc/MspReportLicenseType.java | 0 .../ssc/MspReportProcessingStatus.java | 0 .../ssc/MspReportSSCAppDescriptor.java | 0 .../ssc/MspReportSSCAppSummaryDescriptor.java | 0 .../ssc/MspReportSSCAppVersionAttribute.java | 0 .../ssc/MspReportSSCAppVersionDescriptor.java | 0 .../ssc/MspReportSSCArtifactDescriptor.java | 0 .../MspReportSSCProcessedAppDescriptor.java | 0 ...eportSSCProcessedAppVersionDescriptor.java | 0 .../ssc/MspReportSSCResultsGenerator.java | 0 .../ssc/MspReportSSCScanDescriptor.java | 0 .../generator/ssc/MspReportSSCScanType.java | 0 .../writer/IMspReportAppVersionsWriter.java | 0 .../writer/IMspReportAppsWriter.java | 0 .../writer/IMspReportArtifactsWriter.java | 0 .../writer/IMspReportScansWriter.java | 0 .../writer/MspReportAppVersionsWriter.java | 0 .../writer/MspReportAppsWriter.java | 0 .../writer/MspReportArtifactsWriter.java | 0 .../writer/MspReportResultsWriters.java | 0 .../writer/MspReportScansWriter.java | 0 .../ncd_report/cli/cmd/NcdReportCommands.java | 0 .../cli/cmd/NcdReportGenerateCommand.java | 0 .../cmd/NcdReportGenerateConfigCommand.java | 0 ...ReportRepositoryBranchCommitCollector.java | 0 .../INcdReportRepositoryProcessor.java | 0 .../collector/NcdReportAuthorCollector.java | 0 .../NcdReportAuthorDeduplicator.java | 0 ...ReportRepositoryBranchCommitCollector.java | 0 .../NcdReportRepositoryCollector.java | 0 .../NcdReportRepositoryProcessor.java | 0 .../collector/NcdReportResultsCollector.java | 0 .../AbstractNcdReportRepoSelectorConfig.java | 0 .../config/INcdReportRepoSelectorConfig.java | 0 .../config/INcdReportSourceConfig.java | 0 .../NcdReportCombinedRepoSelectorConfig.java | 0 .../ncd_report/config/NcdReportConfig.java | 0 .../config/NcdReportContributorConfig.java | 0 .../NcdReportGitHubOrganizationConfig.java | 0 .../config/NcdReportGitHubSourceConfig.java | 0 .../config/NcdReportGitLabGroupConfig.java | 0 .../config/NcdReportGitLabSourceConfig.java | 0 .../config/NcdReportSourcesConfig.java | 0 .../INcdReportAuthorDescriptor.java | 0 .../INcdReportBranchDescriptor.java | 0 .../INcdReportCommitDescriptor.java | 0 .../INcdReportRepositoryDescriptor.java | 0 .../NcdReportBranchCommitDescriptor.java | 0 .../NcdReportProcessedAuthorDescriptor.java | 0 ...tractNcdReportUnirestResultsGenerator.java | 0 .../INcdReportBranchCommitGenerator.java | 0 .../generator/github/GitHubPagingHelper.java | 0 .../NcdReportGitHubAuthorDescriptor.java | 0 .../NcdReportGitHubBranchDescriptor.java | 0 .../NcdReportGitHubCommitDescriptor.java | 0 .../NcdReportGitHubRepositoryDescriptor.java | 0 .../NcdReportGitHubResultsGenerator.java | 0 .../generator/gitlab/GitLabPagingHelper.java | 0 .../NcdReportGitLabAuthorDescriptor.java | 0 .../NcdReportGitLabBranchDescriptor.java | 0 .../NcdReportGitLabCommitDescriptor.java | 0 .../NcdReportGitLabRepositoryDescriptor.java | 0 .../NcdReportGitLabResultsGenerator.java | 0 .../cli/util/ncd_report/package-info.java | 0 .../INcdReportAuthorsByRepositoryWriter.java | 0 .../writer/INcdReportAuthorsWriter.java | 0 .../INcdReportCommitsByBranchWriter.java | 0 .../INcdReportCommitsByRepositoryWriter.java | 0 .../writer/INcdReportRepositoriesWriter.java | 0 .../NcdReportAuthorsByRepositoryWriter.java | 0 .../writer/NcdReportAuthorsWriter.java | 0 .../NcdReportCommitsByBranchWriter.java | 0 .../NcdReportCommitsByRepositoryWriter.java | 0 .../writer/NcdReportRepositoriesWriter.java | 0 .../writer/NcdReportResultsWriters.java | 0 .../cli/cmd/SampleDataCommands.java | 0 .../cli/cmd/SampleDataGetCommand.java | 0 .../cli/cmd/SampleDataListCommand.java | 0 .../sample_data/helper/SampleDataHelper.java | 0 .../cli/util/i18n/UtilMessages.properties | 0 .../cli/util/msp_report/MspReportConfig.yml | 0 .../cli/util/ncd_report/NcdReportConfig.yml | 0 .../NcdReportAuthorDeduplicatorTest.java | 0 .../fcli-autocomplete/build.gradle | 0 .../fcli-bom/build.gradle | 0 .../app => fcli-other}/fcli-doc/build.gradle | 0 .../src/docs/asciidoc/static/dev-info.adoc | 0 .../src/docs/asciidoc/static/index.adoc | 0 .../docs/asciidoc/templates/html5/README.txt | 0 .../templates/html5/document.html.erb | 0 .../src/docs/asciidoc/versioned/index.adoc | 0 .../fcli-functional-test/build.gradle | 0 .../com/fortify/cli/ftest/TestRunner.groovy | 0 .../com/fortify/cli/ftest/_common/Input.java | 0 .../extension/FcliGlobalExtension.groovy | 0 .../extension/FcliSessionExtension.groovy | 0 .../ftest/_common/runner/FcliRunner.groovy | 0 .../ftest/_common/spec/BaseFcliSpec.groovy | 0 .../cli/ftest/_common/spec/Fcli.groovy | 0 .../cli/ftest/_common/spec/FcliSession.groovy | 0 .../ftest/_common/spec/FcliSessionType.groovy | 0 .../cli/ftest/_common/spec/Prefix.groovy | 0 .../cli/ftest/core/BasicInfoSpec.groovy | 0 .../ftest/core/ListOutputOptionsSpec.groovy | 0 .../fortify/cli/ftest/fod/FoDAppSpec.groovy | 0 .../cli/ftest/sc_dast/SCDastSensorSpec.groovy | 0 .../cli/ftest/sc_sast/SCSastScanSpec.groovy | 0 .../fortify/cli/ftest/ssc/SSCAppSpec.groovy | 0 ...amework.runtime.extension.IGlobalExtension | 0 .../fcli-gradle}/fcli-java.gradle | 0 .../fcli-gradle/fcli-module.gradle | 0 .../build.gradle | 0 .../GraalvmReflectAnnontationProcessor.java | 0 .../formkiq/graalvm/processors/Reflect.java | 0 gradle.properties | 36 +++++++++---------- 897 files changed, 30 insertions(+), 22 deletions(-) rename {buildRoot/app/fcli => fcli-core/fcli-app}/build.gradle (100%) rename {buildRoot/app/fcli => fcli-core/fcli-app}/src/main/java/com/fortify/cli/app/FortifyCLI.java (100%) rename {buildRoot/app/fcli => fcli-core/fcli-app}/src/main/java/com/fortify/cli/app/FortifyCLIVersionProvider.java (100%) rename {buildRoot/app/fcli => fcli-core/fcli-app}/src/main/java/com/fortify/cli/app/_main/cli/cmd/FCLIRootCommands.java (100%) rename {buildRoot/app/fcli => fcli-core/fcli-app}/src/main/java/com/fortify/cli/app/package-info.java (100%) rename {buildRoot/app/fcli => fcli-core/fcli-app}/src/main/java/com/fortify/cli/app/runner/DefaultFortifyCLIRunner.java (100%) rename {buildRoot/app/fcli => fcli-core/fcli-app}/src/main/java/com/fortify/cli/app/runner/IFortifyCLIRunner.java (100%) rename {buildRoot/app/fcli => fcli-core/fcli-app}/src/main/java/com/fortify/cli/app/runner/util/FortifyCLIDefaultValueProvider.java (100%) rename {buildRoot/app/fcli => fcli-core/fcli-app}/src/main/java/com/fortify/cli/app/runner/util/FortifyCLIDynamicInitializer.java (100%) rename {buildRoot/app/fcli => fcli-core/fcli-app}/src/main/java/com/fortify/cli/app/runner/util/FortifyCLIStaticInitializer.java (100%) rename {buildRoot/app/fcli => fcli-core/fcli-app}/src/main/java/com/fortify/cli/app/runner/util/I18nParameterExceptionHandler.java (100%) rename {buildRoot/app/fcli => fcli-core/fcli-app}/src/main/resources/META-INF/native-image/fcli/fcli-app/jasypt/reflect-config.json (100%) rename {buildRoot/app/fcli => fcli-core/fcli-app}/src/main/resources/META-INF/native-image/fcli/fcli-app/logback/reflect-config.json (100%) rename {buildRoot/app/fcli => fcli-core/fcli-app}/src/main/resources/META-INF/native-image/fcli/fcli-app/static/native-image.properties (100%) rename {buildRoot/app/fcli => fcli-core/fcli-app}/src/main/resources/META-INF/native-image/fcli/fcli-app/static/reflect-config.json (100%) rename {buildRoot/app/fcli => fcli-core/fcli-app}/src/main/resources/logback.xml (100%) rename {buildRoot/app/fcli => fcli-core/fcli-app}/src/test/java/com/fortify/cli/FortifyCLITest.java (100%) rename {buildRoot/app/fcli => fcli-core/fcli-app}/src/test/java/com/fortify/cli/GradlePropertiesTest.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/.gitignore (100%) rename {buildRoot/common => fcli-core}/fcli-common/build.gradle (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/cli/cmd/AbstractFortifyCLICommand.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/cli/mixin/CommandHelperMixin.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/cli/mixin/CommonOptionMixins.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/cli/mixin/ICommandAware.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/cli/util/EnvSuffix.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/http/proxy/helper/ProxyDescriptor.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/http/proxy/helper/ProxyHelper.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/http/ssl/truststore/helper/TrustStoreConfigDescriptor.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/http/ssl/truststore/helper/TrustStoreConfigHelper.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/i18n/helper/LanguageDescriptor.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/i18n/helper/LanguageHelper.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/json/IJsonNodeHolder.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/json/JsonHelper.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/json/JsonNodeHolder.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/OutputFormat.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/AbstractGenerateConfigCommand.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/AbstractOutputCommand.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/IBaseRequestSupplier.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/IJsonNodeSupplier.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/AbstractOutputHelperMixin.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/IOutputHelper.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/OutputHelperMixins.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/OutputOptionsArgGroup.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/OutputWriterWithQueryFactoryMixin.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/QueryOptionsArgGroup.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/StandardOutputWriterFactoryMixin.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/package-info.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/product/IProductHelper.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/product/IProductHelperSupplier.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/product/NoOpProductHelper.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/query/IJsonNodeMatcher.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/query/IQueryExpressionSupplier.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/query/QueryExpression.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/query/QueryExpressionTypeConverter.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/transform/AbstractJsonNodeTransformer.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/transform/IActionCommandResultSupplier.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/transform/IInputTransformer.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/transform/IJsonNodeTransformer.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/transform/IRecordTransformer.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/transform/PropertyPathFormatter.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/transform/fields/AddFieldsTransformer.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/transform/fields/RenameFieldsTransformer.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/transform/flatten/FlattenTransformer.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/transform/identity/IdentityTransformer.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/transform/package-info.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/transform/single/ToSingleObjectNodeTransformer.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/CommandSpecMessageResolver.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/IBasicOutputConfigSupplier.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/IMessageResolver.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/IOutputWriterFactorySupplier.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/ISingularSupplier.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/IOutputWriter.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/IOutputWriterFactory.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/query/OutputWriterWithQuery.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/IOutputConfigSupplier.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/IOutputOptions.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/OutputFormatConfig.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/OutputFormatConfigConverter.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/StandardOutputConfig.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/StandardOutputWriter.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/VariableStoreConfig.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/VariableStoreConfigConverter.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/AbstractFormattedRecordWriter.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/AbstractRecordWriter.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/IRecordWriter.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/IRecordWriterFactory.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/RecordWriterConfig.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/csv/CsvRecordWriter.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/csv/CsvRecordWriterFactory.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/csv/package-info.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/expr/ExprRecordWriter.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/expr/ExprRecordWriterFactory.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/json/JsonRecordWriter.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/json/JsonRecordWriterFactory.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/json/package-info.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/json_properties/JsonPropertiesRecordWriter.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/json_properties/JsonPropertiesRecordWriterFactory.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/package-info.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/table/TableRecordWriter.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/table/TableRecordWriterFactory.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/table/package-info.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/tree/TreeRecordWriter.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/tree/TreeRecordWriterFactory.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/tree/package-info.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/xml/XmlRecordWriter.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/xml/XmlRecordWriterFactory.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/xml/package-info.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/yaml/YamlRecordWriter.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/yaml/YamlRecordWriterFactory.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/yaml/package-info.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/progress/cli/mixin/ProgressWriterFactoryMixin.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/progress/cli/mixin/ProgressWriterTypeConverter.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/progress/helper/AbstractProgressWriterWrapper.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/progress/helper/IProgressWriter.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/progress/helper/IProgressWriterI18n.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/progress/helper/ProgressWriterI18n.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/progress/helper/ProgressWriterType.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/report/cli/cmd/AbstractConfigurableReportGenerateCommand.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/report/cli/cmd/AbstractReportGenerateCommand.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/report/collector/IReportResultsCollector.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/report/config/IReportSourceConfig.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/report/config/IReportSourceSupplierConfig.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/report/generator/AbstractReportUnirestResultsGenerator.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/report/generator/IReportResultsGenerator.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/report/logger/IReportLogger.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/report/logger/ReportLogger.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/report/writer/AbstractReportWriter.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/report/writer/IReportWriter.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/report/writer/ReportDirWriter.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/report/writer/ReportZipWriter.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/cmd/AbstractRestCallCommand.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/cmd/AbstractWaitForCommand.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/mixin/StandardWaitHelperProgressMonitorMixin.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/mixin/UrlConfigOptions.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/mixin/WaitHelperControlOptions.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/mixin/WaitHelperWaitOptions.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/mixin/package-info.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/paging/INextPageUrlProducer.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/paging/INextPageUrlProducerSupplier.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/paging/LinkHeaderNextPageUrlProducerFactory.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/paging/PagingHelper.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/query/IServerSideQueryParamGeneratorSupplier.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/query/IServerSideQueryParamValueGenerator.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/query/cli/mixin/AbstractServerSideQueryMixin.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/GenericUnirestFactory.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/IHttpRequestUpdater.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/IUnirestInstanceSupplier.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/IfFailureHandler.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/UnexpectedHttpResponseException.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/IUrlConfig.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/IUrlConfigSupplier.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/IUserCredentialsConfig.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/UnirestBasicAuthConfigurer.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/UnirestJsonHeaderConfigurer.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/UnirestUnexpectedHttpResponseConfigurer.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/UnirestUrlConfigConfigurer.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/UrlConfig.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/package-info.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/package-info.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/IWaitHelperControlProperties.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/IWaitHelperProgressMonitor.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/IWaitHelperWaitDefinition.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/IWaitHelperWaitDefinitionSupplier.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/StandardWaitHelperProgressMonitor.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/WaitHelper.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/WaitTimeoutAction.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/WaitUnknownOrFailureStateAction.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/WaitUnknownStateRequestedAction.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/session/cli/cmd/AbstractSessionCommand.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/session/cli/cmd/AbstractSessionListCommand.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/session/cli/cmd/AbstractSessionLoginCommand.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/session/cli/cmd/AbstractSessionLogoutCommand.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/session/cli/mixin/AbstractSessionDescriptorSupplierMixin.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/session/cli/mixin/AbstractSessionUnirestInstanceSupplierMixin.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/session/cli/mixin/SessionNameMixin.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/session/cli/mixin/UserCredentialOptions.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/session/helper/AbstractSessionDescriptor.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/session/helper/AbstractSessionDescriptorWithSingleUrlConfig.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/session/helper/AbstractSessionHelper.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/session/helper/ISessionDescriptor.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/session/helper/ISessionDescriptorSupplier.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/session/helper/SessionSummary.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/AbstractSpelNodeVisitor.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/SpelHelper.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/SpelNodeHelper.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/StandardSpelFunctions.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/validator/AbstractSimpleSpelNodeValidator.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/validator/AbstractSpelNodeValidator.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/spring/package-info.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/util/Counter.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/util/DateTimePeriodHelper.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/util/DisableTest.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/util/EncryptionHelper.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/util/EnvHelper.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/util/FcliBuildPropertiesHelper.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/util/FcliDataHelper.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/util/IndexAwareSet.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/util/JavaHelper.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/util/PicocliSpecHelper.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/util/StringUtils.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/util/package-info.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/variable/DefaultVariablePropertyName.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/variable/EncryptVariable.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/com/fortify/cli/common/variable/FcliVariableHelper.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/picocli/AutoComplete.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/picocli/CommandLine.java (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/java/picocli/README.TXT (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/main/resources/com/fortify/cli/common/i18n/FortifyCLIMessages.properties (100%) rename {buildRoot/common => fcli-core}/fcli-common/src/test/java/com/fortify/cli/common/rest/wait/WaitHelperTest.java (100%) create mode 100644 fcli-core/fcli-config/build.gradle rename {buildRoot/modules => fcli-core}/fcli-config/src/main/java/com/fortify/cli/config/_main/cli/cmd/ConfigClearCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-config/src/main/java/com/fortify/cli/config/_main/cli/cmd/ConfigCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-config/src/main/java/com/fortify/cli/config/_main/cli/cmd/package-info.java (100%) rename {buildRoot/modules => fcli-core}/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageClearCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageGetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageSetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyAddCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyClearCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyDeleteCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyUpdateCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/mixin/AbstractProxyOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/mixin/ProxyAddOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/mixin/ProxyUpdateOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-config/src/main/java/com/fortify/cli/config/proxy/helper/ProxyOutputHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreClearCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreGetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreSetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-config/src/main/java/com/fortify/cli/config/truststore/helper/TrustStoreOutputHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-config/src/main/resources/com/fortify/cli/config/i18n/ConfigMessages.properties (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/build.gradle (53%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/cli/AbstractFoDBaseRequestOutputCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/cli/AbstractFoDJsonNodeOutputCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/cli/AbstractFoDOutputCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/mixin/FoDOutputHelperMixins.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/mixin/FoDProductHelperMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/FoDUrls.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDErrorResponse.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDFileTransferBase.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDFilterResultsTransformer.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDInputTransformer.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDPagingHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDUploadResponse.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/query/FoDFiltersParamGenerator.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/query/cli/mixin/FoDFiltersParamMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionLoginCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionLogoutCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/mixin/FoDSessionLoginOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/FoDSessionDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/FoDSessionHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/oauth/FoDOAuthHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/oauth/FoDTokenCreateResponse.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/oauth/IFoDClientCredentials.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/oauth/IFoDUserCredentials.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_common/util/FoDConstants.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_common/util/FoDEnums.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/_main/cli/cmd/FoDCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/helper/FoDAttributeDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/helper/FoDAttributeHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/helper/FoDPickListDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/mixin/FoDAttributeUpdateOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCreateAppCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCreateMicroserviceAppCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCreateMobileAppCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCreateWebAppCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppDeleteCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppGetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppUpdateCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/mixin/FoDAppResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/mixin/FoDAppTypeOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/mixin/FoDCriticalityTypeOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/mixin/FoDSdlcStatusTypeOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppCreateRequest.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppUpdateRequest.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/cli/cmd/FoDLookupCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/cli/cmd/FoDLookupListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/cli/mixin/FoDLookupTypeOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/helper/FoDLookupDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/helper/FoDLookupHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceCreateCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceDeleteCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceUpdateCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/mixin/FoDAppAndMicroserviceNameDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/mixin/FoDAppAndMicroserviceNameResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/mixin/FoDAppMicroserviceResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/mixin/FoDAppMicroserviceUpdateOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/helper/FoDAppMicroserviceDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/helper/FoDAppMicroserviceHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/helper/FoDAppMicroserviceUpdateRequest.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelCreateCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelDeleteCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelGetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelUpdateCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDAppAndRelNameDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDAppAndRelNameResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDAppMicroserviceAndRelNameDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDAppMicroserviceRelResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDAppRelResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDDelimiterMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDAppRelAssessmentTypeDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDAppRelCreateRequest.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDAppRelDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDAppRelHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDAppRelUpdateRequest.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/rest/cli/cmd/FoDRestCallCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/rest/cli/cmd/FoDRestCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/rest/cli/mixin/FoDTimePeriodOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/AbstractFoDScanImportCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/AbstractFoDScanListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanCancelCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanGetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanWaitForCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/dast/FoDDastScanImportCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/dast/FoDDastScanListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/dast/FoDDastScanStartCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/mobile/FoDMobileScanImportCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/mobile/FoDMobileScanListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/mobile/FoDMobileScanStartCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/oss/FoDOssScanImportCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/oss/FoDOssScanListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/sast/FoDSastScanImportCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/sast/FoDSastScanListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/sast/FoDSastScanSetupCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/sast/FoDSastScanStartCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDAnalysisStatusTypeOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDAssessmentTypeOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDEntitlementFrequencyTypeOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDEntitlementPreferenceTypeOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDInProgressScanActionTypeOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDRemediationScanPreferenceTypeOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDSbomFormatOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDScanResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDScanTypeOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDAssessmentTypeDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDImportScan.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDImportScanResponse.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDImportScanSessionDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDScanDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDScanHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDScanNotFoundException.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDScanStatus.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDStartScan.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDStartScanResponse.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDDastScanDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDDastScanHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDDastScanSetupDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDSetupDastScanRequest.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDStartDastScanRequest.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/mobile/FoDMobileScanHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/mobile/FoDMobileScanSetupDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/mobile/FoDStartMobileScanRequest.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/oss/FoDOssHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/sast/FoDSastScanDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/sast/FoDSastScanHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/sast/FoDSastScanSetupDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/sast/FoDSetupSastScanRequest.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/sast/FoDStartSastScanRequest.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserCreateCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserDeleteCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserGetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserUpdateCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/mixin/FoDUserResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserAppAccessRequest.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserCreateRequest.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserUpdateRequest.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupCreateCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupDeleteCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupGetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupUpdateCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/mixin/FoDUserGroupResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupAppAccessRequest.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupCreateRequest.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupMembersRequest.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupUpdateRequest.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/main/resources/com/fortify/cli/fod/i18n/FoDMessages.properties (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/test/java/com/fortify/cli/fod/_common/rest/query/FoDFilterParamGeneratorTest.java (100%) rename {buildRoot/modules => fcli-core}/fcli-fod/src/test/resources/com/fortify/cli/fod/rest/query/filterparam.csv (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/.gitkeep (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/build.gradle (50%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/output/cli/cmd/AbstractSCDastBaseRequestOutputCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/output/cli/cmd/AbstractSCDastJsonNodeOutputCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/output/cli/cmd/AbstractSCDastOutputCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/output/cli/mixin/SCDastOutputHelperMixins.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/output/cli/mixin/SCDastProductHelperMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/rest/helper/SCDastInputTransformer.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/rest/helper/SCDastPagingHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/rest/query/cli/mixin/SCDastQueryParamsMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionLoginCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionLogoutCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/mixin/SCDastSessionLoginOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/mixin/SCDastSessionLogoutOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/mixin/SCDastUrlConfigOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/mixin/SCDastUserCredentialAndExpiryOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/mixin/SCDastUserCredentialOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/helper/SCDastSessionDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/helper/SCDastSessionHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/util/SCDastConstants.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_main/cli/cmd/SCDastCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/rest/cli/cmd/SCDastRestCallCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/rest/cli/cmd/SCDastRestCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/AbstractSCDastScanOutputCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanDownloadCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanGetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanStartCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanWaitForCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/AbstractSCDastScanActionCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanCompleteCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanDeleteCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanImportFindingsCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanPauseCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanPublishCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanResumeCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/mixin/SCDastScanResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/helper/SCDastScanDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/helper/SCDastScanHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/helper/SCDastScanStatus.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/cmd/SCDastScanPolicyCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/cmd/SCDastScanPolicyGetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/cmd/SCDastScanPolicyListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/mixin/SCDastScanPolicyResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/helper/SCDastScanPolicyDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/helper/SCDastScanPolicyHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/cmd/SCDastScanSettingsCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/cmd/SCDastScanSettingsGetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/cmd/SCDastScanSettingsListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/mixin/SCDastScanSettingsResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/helper/SCDastScanSettingsDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/helper/SCDastScanSettingsHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorDisableCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorEnableCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorGetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/mixin/SCDastSensorResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/helper/SCDastSensorDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/helper/SCDastSensorHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-dast/src/main/resources/com/fortify/cli/sc_dast/i18n/SCDastMessages.properties (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/.gitkeep (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/build.gradle (50%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastControllerBaseRequestOutputCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastControllerJsonNodeOutputCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastControllerOutputCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastSSCBaseRequestOutputCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastSSCJsonNodeOutputCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastSSCOutputCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/mixin/SCSastControllerProductHelperMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/mixin/SCSastOutputHelperMixins.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/mixin/SCSastSSCProductHelperMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/rest/helper/SCSastInputTransformer.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/rest/helper/SCSastUnirestHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionLoginCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionLogoutCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/AbstractSCSastUnirestInstanceSupplierMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/SCSastSessionLoginOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/SCSastSessionLogoutOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/SCSastUrlConfigOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/SCSastUserCredentialAndExpiryOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/SCSastUserCredentialOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/helper/SCSastSessionDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/helper/SCSastSessionHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_main/cli/cmd/SCSastCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/rest/cli/cmd/SCSastControllerRestCallCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/rest/cli/cmd/SCSastControllerRestCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastControllerScanCancelCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastControllerScanStartCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastControllerScanStatusCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastControllerScanWaitForCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastScanCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/mixin/ISCSastScanStartOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/mixin/SCSastScanJobResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/mixin/SCSastScanStartMbsOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/mixin/SCSastScanStartOptionsArgGroup.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/mixin/SCSastScanStartPackageOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/helper/SCSastControllerJobType.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/helper/SCSastControllerScanJobArtifactState.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/helper/SCSastControllerScanJobDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/helper/SCSastControllerScanJobHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/helper/SCSastControllerScanJobState.java (100%) rename {buildRoot/modules => fcli-core}/fcli-sc-sast/src/main/resources/com/fortify/cli/sc_sast/i18n/SCSastMessages.properties (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/.gitignore (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/build.gradle (53%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/cmd/AbstractSSCBaseRequestOutputCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/cmd/AbstractSSCJsonNodeOutputCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/cmd/AbstractSSCOutputCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/mixin/AbstractSSCBulkEmbedMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/mixin/SSCOutputHelperMixins.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/mixin/SSCProductHelperMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/SSCUrls.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/bulk/ISSCEntityEmbedder.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/bulk/ISSCEntityEmbedderSupplier.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/bulk/SSCBulkEmbedder.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/bulk/SSCBulkRequestBuilder.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/bulk/package-info.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/helper/SSCInputTransformer.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/helper/SSCPagingHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/query/SSCQParamGenerator.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/query/SSCQParamValueGenerators.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/query/cli/mixin/SSCQParamMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/transfer/SSCFileTransferHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionLoginCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionLogoutCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/mixin/SSCSessionLoginOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/mixin/SSCSessionLogoutOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/helper/ISSCCredentialsConfig.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/helper/ISSCUserCredentialsConfig.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/helper/SSCSessionDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/helper/SSCSessionHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/_main/cli/cmd/SSCCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/activity_feed/cli/cmd/SSCActivityFeedCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/activity_feed/cli/cmd/SSCActivityFeedListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert/cli/cmd/SSCAlertCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert/cli/cmd/SSCAlertListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert_definition/cli/cmd/SSCAlertDefinitionCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert_definition/cli/cmd/SSCAlertDefinitionGetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert_definition/cli/cmd/SSCAlertDefinitionListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppDeleteCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppGetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppUpdateCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/mixin/SSCAppResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/helper/SSCAppDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/helper/SSCAppHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionCreateCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionDeleteCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionGetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionUpdateCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/mixin/SSCAppAndVersionNameResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/mixin/SSCAppVersionBulkEmbedMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/mixin/SSCAppVersionResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/mixin/SSCDelimiterMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/helper/SSCAppAndVersionNameDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/helper/SSCAppVersionDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/helper/SSCAppVersionEmbedderSupplier.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/helper/SSCAppVersionHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/AbstractSSCAppVersionArtifactOutputCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/AbstractSSCAppVersionArtifactUploadCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactApproveCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactDeleteCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactDownloadByIdCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactDownloadStateCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactGetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactPurgeByIdCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactPurgeOlderThanCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactUploadCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactWaitForCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/import_debricked/DebrickedLoginOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/import_debricked/DebrickedUrlConfigOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/import_debricked/SSCAppVersionArtifactImportDebrickedCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/mixin/SSCAppVersionArtifactDownloadOptions.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/mixin/SSCAppVersionArtifactResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/helper/SSCAppVersionArtifactDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/helper/SSCAppVersionArtifactHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/helper/SSCAppVersionArtifactStatus.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/cmd/SSCAppVersionAttributeCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/cmd/SSCAppVersionAttributeListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/cmd/SSCAppVersionAttributeSetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/mixin/SSCAppVersionAttributeUpdateMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/helper/SSCAppVersionAttributeHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/helper/SSCAppVersionAttributeListHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/helper/SSCAppVersionAttributeUpdateBuilder.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/cmd/SSCAppVersionFilterSetCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/cmd/SSCAppVersionFilterSetGetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/cmd/SSCAppVersionFilterSetListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/mixin/SSCAppVersionFilterSetResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/helper/SSCAppVersionFilterSetDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/helper/SSCAppVersionFilterSetHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionAuthEntityAddCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionAuthEntityCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionAuthEntityDeleteCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionAuthEntityListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/mixin/SSCAppVersionAuthEntityMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/helper/SSCAppVersionAuthEntitiesUpdateBuilder.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_vuln/cli/cmd/SSCAppVersionVulnCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_vuln/cli/cmd/SSCAppVersionVulnCountCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/cmd/SSCAttributeDefinitionCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/cmd/SSCAttributeDefinitionGetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/cmd/SSCAttributeDefinitionListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/mixin/SSCAttributeDefinitionResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/domain/SSCAttributeDefinitionCategory.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/domain/SSCAttributeDefinitionType.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/helper/SSCAttributeDefinitionDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/helper/SSCAttributeDefinitionHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/helper/SSCAttributeOptionDefinitionDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/event/cli/cmd/SSCEventCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/event/cli/cmd/SSCEventListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateCreateCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateDeleteCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateDownloadCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateGetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateUpdateCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/mixin/SSCIssueTemplateResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/helper/SSCIssueTemplateDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/helper/SSCIssueTemplateHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobCancelCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobGetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobUpdateCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/mixin/SSCJobResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/helper/SSCJobDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/helper/SSCJobHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginDisableCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginEnableCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginGetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginInstallCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginUninstallCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/mixin/SSCPluginResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/helper/SSCPluginStateHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateCreateCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateDeleteCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateDownloadCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateGenerateConfigCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateGetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/mixin/SSCReportTemplateResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportParameter.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportParameterOption.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportParameterType.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportRenderingEngineType.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportTemplateDef.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportType.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/helper/SSCReportTemplateDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/helper/SSCReportTemplateHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/rest/cli/cmd/SSCRestCallCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/rest/cli/cmd/SSCRestCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleCreateCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleDeleteCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleGetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/mixin/SSCRoleResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/helper/SSCRoleDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/helper/SSCRoleHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/cmd/SSCRolePermissionCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/cmd/SSCRolePermissionGetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/cmd/SSCRolePermissionListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/mixin/SSCRolePermissionResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/helper/SSCRolePermissionDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/helper/SSCRolePermissionHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/seed_bundle/cli/cmd/SSCSeedBundleCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/seed_bundle/cli/cmd/SSCSeedBundleUploadCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/AbstractSSCTokenCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenCreateCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenRevokeCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenUpdateCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/mixin/SSCTokenCommandUrlConfigMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenConverter.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenCreateRequest.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenCreateResponse.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenUpdateRequest.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/token_definition/cli/cmd/SSCTokenDefinitionCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/token_definition/cli/cmd/SSCTokenDefinitionListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCAuthEntityCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCAuthEntityDeleteCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCAuthEntityGetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCAuthEntityListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/mixin/SSCAuthEntityResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/helper/SSCAuthEntitiesHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/helper/SSCAuthEntitySpecPredicate.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/resources/com/fortify/cli/ssc/i18n/SSCMessages.properties (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/main/resources/com/fortify/cli/ssc/report_template/ReportTemplateConfig.yml (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/test/java/com/fortify/cli/ssc/rest/query/SSCQParamGeneratorTest.java (100%) rename {buildRoot/modules => fcli-core}/fcli-ssc/src/test/resources/com/fortify/cli/ssc/rest/query/qparam.csv (100%) create mode 100644 fcli-core/fcli-state/build.gradle rename {buildRoot/modules => fcli-core}/fcli-state/src/main/java/com/fortify/cli/state/_main/cli/cmd/StateClearCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-state/src/main/java/com/fortify/cli/state/_main/cli/cmd/StateCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-state/src/main/java/com/fortify/cli/state/_main/cli/cmd/package-info.java (100%) rename {buildRoot/modules => fcli-core}/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableClearCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableContentsCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableDeleteCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableGetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/mixin/VariableOutputHelperMixins.java (100%) rename {buildRoot/modules => fcli-core}/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/mixin/VariableResolverMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-state/src/main/resources/com/fortify/cli/state/i18n/StateMessages.properties (100%) create mode 100644 fcli-core/fcli-tool/build.gradle rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/java/com/fortify/cli/tool/_common/cli/cmd/AbstractToolInstallCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/java/com/fortify/cli/tool/_common/cli/cmd/AbstractToolListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/java/com/fortify/cli/tool/_common/cli/cmd/AbstractToolUninstallCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolDownloadDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolVersionCombinedDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolVersionDownloadDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolVersionInstallDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/java/com/fortify/cli/tool/_common/util/FileUtils.java (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/java/com/fortify/cli/tool/_main/cli/cmd/ToolCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderInstallCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderUninstallCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientInstallCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientUninstallCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterInstallCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterUninstallCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/resources/com/fortify/cli/tool/fod-uploader/extra-files/.gitignore (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/resources/com/fortify/cli/tool/fod-uploader/extra-files/bin/FoDUpload (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/resources/com/fortify/cli/tool/fod-uploader/extra-files/bin/FoDUpload.bat (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/resources/com/fortify/cli/tool/fod-uploader/fod-uploader.yaml (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/resources/com/fortify/cli/tool/i18n/ToolMessages.properties (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/resources/com/fortify/cli/tool/sc-client/sc-client.yaml (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln-exporter/extra-files/.gitignore (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln-exporter/extra-files/bin/FortifyVulnerabilityExporter (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln-exporter/extra-files/bin/FortifyVulnerabilityExporter.bat (100%) rename {buildRoot/modules => fcli-core}/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln-exporter/vuln-exporter.yaml (100%) rename {buildRoot/modules => fcli-core}/fcli-util/.gitignore (100%) rename {buildRoot/modules => fcli-core}/fcli-util/build.gradle (70%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/_main/cli/cmd/UtilCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsUsageCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/mixin/AllCommandsCommandSelectorMixin.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/mixin/AllCommandsOutputHelperMixins.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/autocomplete/cli/cmd/AutoCompleteCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/autocomplete/cli/cmd/AutoCompleteGenerationCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/AbstractCryptoCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/CryptoCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/CryptoDecryptCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/CryptoEncryptCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/cli/cmd/MspReportCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/cli/cmd/MspReportGenerateCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/cli/cmd/MspReportGenerateConfigCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportAppCollector.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportAppScanCollector.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportAppVersionCollector.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportArtifactCollector.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportResultsCollector.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/IMspReportSourceConfig.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/MspReportConfig.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/MspReportSSCSourceConfig.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/MspReportSourcesConfig.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/AbstractMspReportUnirestResultsGenerator.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportLicenseType.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportProcessingStatus.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppSummaryDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppVersionAttribute.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppVersionDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCArtifactDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCProcessedAppDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCProcessedAppVersionDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCResultsGenerator.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCScanDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCScanType.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportAppVersionsWriter.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportAppsWriter.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportArtifactsWriter.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportScansWriter.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportAppVersionsWriter.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportAppsWriter.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportArtifactsWriter.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportResultsWriters.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportScansWriter.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/cli/cmd/NcdReportCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/cli/cmd/NcdReportGenerateCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/cli/cmd/NcdReportGenerateConfigCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/INcdReportRepositoryBranchCommitCollector.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/INcdReportRepositoryProcessor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportAuthorCollector.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportAuthorDeduplicator.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportRepositoryBranchCommitCollector.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportRepositoryCollector.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportRepositoryProcessor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportResultsCollector.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/AbstractNcdReportRepoSelectorConfig.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/INcdReportRepoSelectorConfig.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/INcdReportSourceConfig.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportCombinedRepoSelectorConfig.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportConfig.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportContributorConfig.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitHubOrganizationConfig.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitHubSourceConfig.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitLabGroupConfig.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitLabSourceConfig.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportSourcesConfig.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportAuthorDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportBranchDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportCommitDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportRepositoryDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/NcdReportBranchCommitDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/NcdReportProcessedAuthorDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/AbstractNcdReportUnirestResultsGenerator.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/INcdReportBranchCommitGenerator.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/GitHubPagingHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubAuthorDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubBranchDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubCommitDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubRepositoryDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubResultsGenerator.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/GitLabPagingHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabAuthorDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabBranchDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabCommitDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabRepositoryDescriptor.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabResultsGenerator.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/package-info.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportAuthorsByRepositoryWriter.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportAuthorsWriter.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportCommitsByBranchWriter.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportCommitsByRepositoryWriter.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportRepositoriesWriter.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportAuthorsByRepositoryWriter.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportAuthorsWriter.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportCommitsByBranchWriter.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportCommitsByRepositoryWriter.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportRepositoriesWriter.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportResultsWriters.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/sample_data/cli/cmd/SampleDataCommands.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/sample_data/cli/cmd/SampleDataGetCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/sample_data/cli/cmd/SampleDataListCommand.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/java/com/fortify/cli/util/sample_data/helper/SampleDataHelper.java (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/resources/com/fortify/cli/util/i18n/UtilMessages.properties (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/resources/com/fortify/cli/util/msp_report/MspReportConfig.yml (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/main/resources/com/fortify/cli/util/ncd_report/NcdReportConfig.yml (100%) rename {buildRoot/modules => fcli-core}/fcli-util/src/test/java/com/fortify/cli/util/ncd_report/collector/NcdReportAuthorDeduplicatorTest.java (100%) rename {buildRoot/app => fcli-other}/fcli-autocomplete/build.gradle (100%) rename {buildRoot/common => fcli-other}/fcli-bom/build.gradle (100%) rename {buildRoot/app => fcli-other}/fcli-doc/build.gradle (100%) rename {buildRoot/app => fcli-other}/fcli-doc/src/docs/asciidoc/static/dev-info.adoc (100%) rename {buildRoot/app => fcli-other}/fcli-doc/src/docs/asciidoc/static/index.adoc (100%) rename {buildRoot/app => fcli-other}/fcli-doc/src/docs/asciidoc/templates/html5/README.txt (100%) rename {buildRoot/app => fcli-other}/fcli-doc/src/docs/asciidoc/templates/html5/document.html.erb (100%) rename {buildRoot/app => fcli-other}/fcli-doc/src/docs/asciidoc/versioned/index.adoc (100%) rename {buildRoot/app => fcli-other}/fcli-functional-test/build.gradle (100%) rename {buildRoot/app => fcli-other}/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/TestRunner.groovy (100%) rename {buildRoot/app => fcli-other}/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/Input.java (100%) rename {buildRoot/app => fcli-other}/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/extension/FcliGlobalExtension.groovy (100%) rename {buildRoot/app => fcli-other}/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/extension/FcliSessionExtension.groovy (100%) rename {buildRoot/app => fcli-other}/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/runner/FcliRunner.groovy (100%) rename {buildRoot/app => fcli-other}/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/spec/BaseFcliSpec.groovy (100%) rename {buildRoot/app => fcli-other}/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/spec/Fcli.groovy (100%) rename {buildRoot/app => fcli-other}/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/spec/FcliSession.groovy (100%) rename {buildRoot/app => fcli-other}/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/spec/FcliSessionType.groovy (100%) rename {buildRoot/app => fcli-other}/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/spec/Prefix.groovy (100%) rename {buildRoot/app => fcli-other}/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/core/BasicInfoSpec.groovy (100%) rename {buildRoot/app => fcli-other}/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/core/ListOutputOptionsSpec.groovy (100%) rename {buildRoot/app => fcli-other}/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/fod/FoDAppSpec.groovy (100%) rename {buildRoot/app => fcli-other}/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/sc_dast/SCDastSensorSpec.groovy (100%) rename {buildRoot/app => fcli-other}/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/sc_sast/SCSastScanSpec.groovy (100%) rename {buildRoot/app => fcli-other}/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/ssc/SSCAppSpec.groovy (100%) rename {buildRoot/app => fcli-other}/fcli-functional-test/src/ftest/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtension (100%) rename {buildRoot/_gradle => fcli-other/fcli-gradle}/fcli-java.gradle (100%) rename buildRoot/_gradle/module.gradle => fcli-other/fcli-gradle/fcli-module.gradle (100%) rename {buildRoot => fcli-other}/patches/graalvm-annotations-processor-patch/build.gradle (100%) rename {buildRoot => fcli-other}/patches/graalvm-annotations-processor-patch/src/main/java/com/formkiq/graalvm/processors/GraalvmReflectAnnontationProcessor.java (100%) rename {buildRoot => fcli-other}/patches/graalvm-annotations-processor-patch/src/main/java/com/formkiq/graalvm/processors/Reflect.java (100%) diff --git a/build.gradle b/build.gradle index 862d9b313f..02e7740743 100644 --- a/build.gradle +++ b/build.gradle @@ -45,9 +45,6 @@ allprojects { } } -configure(allprojects.findAll {it.path.startsWith "$fcliModulePathPrefix"}) { - apply from: "${sharedGradleScriptsDir}/module.gradle" -} task clean(type: Delete) { delete "build" } diff --git a/buildRoot/app/fcli/build.gradle b/fcli-core/fcli-app/build.gradle similarity index 100% rename from buildRoot/app/fcli/build.gradle rename to fcli-core/fcli-app/build.gradle diff --git a/buildRoot/app/fcli/src/main/java/com/fortify/cli/app/FortifyCLI.java b/fcli-core/fcli-app/src/main/java/com/fortify/cli/app/FortifyCLI.java similarity index 100% rename from buildRoot/app/fcli/src/main/java/com/fortify/cli/app/FortifyCLI.java rename to fcli-core/fcli-app/src/main/java/com/fortify/cli/app/FortifyCLI.java diff --git a/buildRoot/app/fcli/src/main/java/com/fortify/cli/app/FortifyCLIVersionProvider.java b/fcli-core/fcli-app/src/main/java/com/fortify/cli/app/FortifyCLIVersionProvider.java similarity index 100% rename from buildRoot/app/fcli/src/main/java/com/fortify/cli/app/FortifyCLIVersionProvider.java rename to fcli-core/fcli-app/src/main/java/com/fortify/cli/app/FortifyCLIVersionProvider.java diff --git a/buildRoot/app/fcli/src/main/java/com/fortify/cli/app/_main/cli/cmd/FCLIRootCommands.java b/fcli-core/fcli-app/src/main/java/com/fortify/cli/app/_main/cli/cmd/FCLIRootCommands.java similarity index 100% rename from buildRoot/app/fcli/src/main/java/com/fortify/cli/app/_main/cli/cmd/FCLIRootCommands.java rename to fcli-core/fcli-app/src/main/java/com/fortify/cli/app/_main/cli/cmd/FCLIRootCommands.java diff --git a/buildRoot/app/fcli/src/main/java/com/fortify/cli/app/package-info.java b/fcli-core/fcli-app/src/main/java/com/fortify/cli/app/package-info.java similarity index 100% rename from buildRoot/app/fcli/src/main/java/com/fortify/cli/app/package-info.java rename to fcli-core/fcli-app/src/main/java/com/fortify/cli/app/package-info.java diff --git a/buildRoot/app/fcli/src/main/java/com/fortify/cli/app/runner/DefaultFortifyCLIRunner.java b/fcli-core/fcli-app/src/main/java/com/fortify/cli/app/runner/DefaultFortifyCLIRunner.java similarity index 100% rename from buildRoot/app/fcli/src/main/java/com/fortify/cli/app/runner/DefaultFortifyCLIRunner.java rename to fcli-core/fcli-app/src/main/java/com/fortify/cli/app/runner/DefaultFortifyCLIRunner.java diff --git a/buildRoot/app/fcli/src/main/java/com/fortify/cli/app/runner/IFortifyCLIRunner.java b/fcli-core/fcli-app/src/main/java/com/fortify/cli/app/runner/IFortifyCLIRunner.java similarity index 100% rename from buildRoot/app/fcli/src/main/java/com/fortify/cli/app/runner/IFortifyCLIRunner.java rename to fcli-core/fcli-app/src/main/java/com/fortify/cli/app/runner/IFortifyCLIRunner.java diff --git a/buildRoot/app/fcli/src/main/java/com/fortify/cli/app/runner/util/FortifyCLIDefaultValueProvider.java b/fcli-core/fcli-app/src/main/java/com/fortify/cli/app/runner/util/FortifyCLIDefaultValueProvider.java similarity index 100% rename from buildRoot/app/fcli/src/main/java/com/fortify/cli/app/runner/util/FortifyCLIDefaultValueProvider.java rename to fcli-core/fcli-app/src/main/java/com/fortify/cli/app/runner/util/FortifyCLIDefaultValueProvider.java diff --git a/buildRoot/app/fcli/src/main/java/com/fortify/cli/app/runner/util/FortifyCLIDynamicInitializer.java b/fcli-core/fcli-app/src/main/java/com/fortify/cli/app/runner/util/FortifyCLIDynamicInitializer.java similarity index 100% rename from buildRoot/app/fcli/src/main/java/com/fortify/cli/app/runner/util/FortifyCLIDynamicInitializer.java rename to fcli-core/fcli-app/src/main/java/com/fortify/cli/app/runner/util/FortifyCLIDynamicInitializer.java diff --git a/buildRoot/app/fcli/src/main/java/com/fortify/cli/app/runner/util/FortifyCLIStaticInitializer.java b/fcli-core/fcli-app/src/main/java/com/fortify/cli/app/runner/util/FortifyCLIStaticInitializer.java similarity index 100% rename from buildRoot/app/fcli/src/main/java/com/fortify/cli/app/runner/util/FortifyCLIStaticInitializer.java rename to fcli-core/fcli-app/src/main/java/com/fortify/cli/app/runner/util/FortifyCLIStaticInitializer.java diff --git a/buildRoot/app/fcli/src/main/java/com/fortify/cli/app/runner/util/I18nParameterExceptionHandler.java b/fcli-core/fcli-app/src/main/java/com/fortify/cli/app/runner/util/I18nParameterExceptionHandler.java similarity index 100% rename from buildRoot/app/fcli/src/main/java/com/fortify/cli/app/runner/util/I18nParameterExceptionHandler.java rename to fcli-core/fcli-app/src/main/java/com/fortify/cli/app/runner/util/I18nParameterExceptionHandler.java diff --git a/buildRoot/app/fcli/src/main/resources/META-INF/native-image/fcli/fcli-app/jasypt/reflect-config.json b/fcli-core/fcli-app/src/main/resources/META-INF/native-image/fcli/fcli-app/jasypt/reflect-config.json similarity index 100% rename from buildRoot/app/fcli/src/main/resources/META-INF/native-image/fcli/fcli-app/jasypt/reflect-config.json rename to fcli-core/fcli-app/src/main/resources/META-INF/native-image/fcli/fcli-app/jasypt/reflect-config.json diff --git a/buildRoot/app/fcli/src/main/resources/META-INF/native-image/fcli/fcli-app/logback/reflect-config.json b/fcli-core/fcli-app/src/main/resources/META-INF/native-image/fcli/fcli-app/logback/reflect-config.json similarity index 100% rename from buildRoot/app/fcli/src/main/resources/META-INF/native-image/fcli/fcli-app/logback/reflect-config.json rename to fcli-core/fcli-app/src/main/resources/META-INF/native-image/fcli/fcli-app/logback/reflect-config.json diff --git a/buildRoot/app/fcli/src/main/resources/META-INF/native-image/fcli/fcli-app/static/native-image.properties b/fcli-core/fcli-app/src/main/resources/META-INF/native-image/fcli/fcli-app/static/native-image.properties similarity index 100% rename from buildRoot/app/fcli/src/main/resources/META-INF/native-image/fcli/fcli-app/static/native-image.properties rename to fcli-core/fcli-app/src/main/resources/META-INF/native-image/fcli/fcli-app/static/native-image.properties diff --git a/buildRoot/app/fcli/src/main/resources/META-INF/native-image/fcli/fcli-app/static/reflect-config.json b/fcli-core/fcli-app/src/main/resources/META-INF/native-image/fcli/fcli-app/static/reflect-config.json similarity index 100% rename from buildRoot/app/fcli/src/main/resources/META-INF/native-image/fcli/fcli-app/static/reflect-config.json rename to fcli-core/fcli-app/src/main/resources/META-INF/native-image/fcli/fcli-app/static/reflect-config.json diff --git a/buildRoot/app/fcli/src/main/resources/logback.xml b/fcli-core/fcli-app/src/main/resources/logback.xml similarity index 100% rename from buildRoot/app/fcli/src/main/resources/logback.xml rename to fcli-core/fcli-app/src/main/resources/logback.xml diff --git a/buildRoot/app/fcli/src/test/java/com/fortify/cli/FortifyCLITest.java b/fcli-core/fcli-app/src/test/java/com/fortify/cli/FortifyCLITest.java similarity index 100% rename from buildRoot/app/fcli/src/test/java/com/fortify/cli/FortifyCLITest.java rename to fcli-core/fcli-app/src/test/java/com/fortify/cli/FortifyCLITest.java diff --git a/buildRoot/app/fcli/src/test/java/com/fortify/cli/GradlePropertiesTest.java b/fcli-core/fcli-app/src/test/java/com/fortify/cli/GradlePropertiesTest.java similarity index 100% rename from buildRoot/app/fcli/src/test/java/com/fortify/cli/GradlePropertiesTest.java rename to fcli-core/fcli-app/src/test/java/com/fortify/cli/GradlePropertiesTest.java diff --git a/buildRoot/common/fcli-common/.gitignore b/fcli-core/fcli-common/.gitignore similarity index 100% rename from buildRoot/common/fcli-common/.gitignore rename to fcli-core/fcli-common/.gitignore diff --git a/buildRoot/common/fcli-common/build.gradle b/fcli-core/fcli-common/build.gradle similarity index 100% rename from buildRoot/common/fcli-common/build.gradle rename to fcli-core/fcli-common/build.gradle diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/cli/cmd/AbstractFortifyCLICommand.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/cmd/AbstractFortifyCLICommand.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/cli/cmd/AbstractFortifyCLICommand.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/cmd/AbstractFortifyCLICommand.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/cli/mixin/CommandHelperMixin.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/mixin/CommandHelperMixin.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/cli/mixin/CommandHelperMixin.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/mixin/CommandHelperMixin.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/cli/mixin/CommonOptionMixins.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/mixin/CommonOptionMixins.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/cli/mixin/CommonOptionMixins.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/mixin/CommonOptionMixins.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/cli/mixin/ICommandAware.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/mixin/ICommandAware.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/cli/mixin/ICommandAware.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/mixin/ICommandAware.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/cli/util/EnvSuffix.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/util/EnvSuffix.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/cli/util/EnvSuffix.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/util/EnvSuffix.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/http/proxy/helper/ProxyDescriptor.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/http/proxy/helper/ProxyDescriptor.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/http/proxy/helper/ProxyDescriptor.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/http/proxy/helper/ProxyDescriptor.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/http/proxy/helper/ProxyHelper.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/http/proxy/helper/ProxyHelper.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/http/proxy/helper/ProxyHelper.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/http/proxy/helper/ProxyHelper.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/http/ssl/truststore/helper/TrustStoreConfigDescriptor.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/http/ssl/truststore/helper/TrustStoreConfigDescriptor.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/http/ssl/truststore/helper/TrustStoreConfigDescriptor.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/http/ssl/truststore/helper/TrustStoreConfigDescriptor.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/http/ssl/truststore/helper/TrustStoreConfigHelper.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/http/ssl/truststore/helper/TrustStoreConfigHelper.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/http/ssl/truststore/helper/TrustStoreConfigHelper.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/http/ssl/truststore/helper/TrustStoreConfigHelper.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/i18n/helper/LanguageDescriptor.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/i18n/helper/LanguageDescriptor.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/i18n/helper/LanguageDescriptor.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/i18n/helper/LanguageDescriptor.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/i18n/helper/LanguageHelper.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/i18n/helper/LanguageHelper.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/i18n/helper/LanguageHelper.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/i18n/helper/LanguageHelper.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/json/IJsonNodeHolder.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/json/IJsonNodeHolder.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/json/IJsonNodeHolder.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/json/IJsonNodeHolder.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/json/JsonHelper.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/json/JsonHelper.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/json/JsonHelper.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/json/JsonHelper.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/json/JsonNodeHolder.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/json/JsonNodeHolder.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/json/JsonNodeHolder.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/json/JsonNodeHolder.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/OutputFormat.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/OutputFormat.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/OutputFormat.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/OutputFormat.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/AbstractGenerateConfigCommand.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/AbstractGenerateConfigCommand.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/AbstractGenerateConfigCommand.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/AbstractGenerateConfigCommand.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/AbstractOutputCommand.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/AbstractOutputCommand.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/AbstractOutputCommand.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/AbstractOutputCommand.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/IBaseRequestSupplier.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/IBaseRequestSupplier.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/IBaseRequestSupplier.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/IBaseRequestSupplier.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/IJsonNodeSupplier.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/IJsonNodeSupplier.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/IJsonNodeSupplier.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/IJsonNodeSupplier.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/AbstractOutputHelperMixin.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/AbstractOutputHelperMixin.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/AbstractOutputHelperMixin.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/AbstractOutputHelperMixin.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/IOutputHelper.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/IOutputHelper.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/IOutputHelper.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/IOutputHelper.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/OutputHelperMixins.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/OutputHelperMixins.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/OutputHelperMixins.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/OutputHelperMixins.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/OutputOptionsArgGroup.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/OutputOptionsArgGroup.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/OutputOptionsArgGroup.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/OutputOptionsArgGroup.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/OutputWriterWithQueryFactoryMixin.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/OutputWriterWithQueryFactoryMixin.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/OutputWriterWithQueryFactoryMixin.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/OutputWriterWithQueryFactoryMixin.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/QueryOptionsArgGroup.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/QueryOptionsArgGroup.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/QueryOptionsArgGroup.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/QueryOptionsArgGroup.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/StandardOutputWriterFactoryMixin.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/StandardOutputWriterFactoryMixin.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/StandardOutputWriterFactoryMixin.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/StandardOutputWriterFactoryMixin.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/package-info.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/package-info.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/package-info.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/package-info.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/product/IProductHelper.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/product/IProductHelper.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/product/IProductHelper.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/product/IProductHelper.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/product/IProductHelperSupplier.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/product/IProductHelperSupplier.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/product/IProductHelperSupplier.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/product/IProductHelperSupplier.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/product/NoOpProductHelper.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/product/NoOpProductHelper.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/product/NoOpProductHelper.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/product/NoOpProductHelper.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/query/IJsonNodeMatcher.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/query/IJsonNodeMatcher.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/query/IJsonNodeMatcher.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/query/IJsonNodeMatcher.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/query/IQueryExpressionSupplier.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/query/IQueryExpressionSupplier.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/query/IQueryExpressionSupplier.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/query/IQueryExpressionSupplier.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/query/QueryExpression.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/query/QueryExpression.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/query/QueryExpression.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/query/QueryExpression.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/query/QueryExpressionTypeConverter.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/query/QueryExpressionTypeConverter.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/query/QueryExpressionTypeConverter.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/query/QueryExpressionTypeConverter.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/transform/AbstractJsonNodeTransformer.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/transform/AbstractJsonNodeTransformer.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/transform/AbstractJsonNodeTransformer.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/transform/AbstractJsonNodeTransformer.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/transform/IActionCommandResultSupplier.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/transform/IActionCommandResultSupplier.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/transform/IActionCommandResultSupplier.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/transform/IActionCommandResultSupplier.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/transform/IInputTransformer.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/transform/IInputTransformer.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/transform/IInputTransformer.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/transform/IInputTransformer.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/transform/IJsonNodeTransformer.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/transform/IJsonNodeTransformer.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/transform/IJsonNodeTransformer.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/transform/IJsonNodeTransformer.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/transform/IRecordTransformer.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/transform/IRecordTransformer.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/transform/IRecordTransformer.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/transform/IRecordTransformer.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/transform/PropertyPathFormatter.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/transform/PropertyPathFormatter.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/transform/PropertyPathFormatter.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/transform/PropertyPathFormatter.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/transform/fields/AddFieldsTransformer.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/transform/fields/AddFieldsTransformer.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/transform/fields/AddFieldsTransformer.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/transform/fields/AddFieldsTransformer.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/transform/fields/RenameFieldsTransformer.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/transform/fields/RenameFieldsTransformer.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/transform/fields/RenameFieldsTransformer.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/transform/fields/RenameFieldsTransformer.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/transform/flatten/FlattenTransformer.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/transform/flatten/FlattenTransformer.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/transform/flatten/FlattenTransformer.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/transform/flatten/FlattenTransformer.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/transform/identity/IdentityTransformer.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/transform/identity/IdentityTransformer.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/transform/identity/IdentityTransformer.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/transform/identity/IdentityTransformer.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/transform/package-info.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/transform/package-info.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/transform/package-info.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/transform/package-info.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/transform/single/ToSingleObjectNodeTransformer.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/transform/single/ToSingleObjectNodeTransformer.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/transform/single/ToSingleObjectNodeTransformer.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/transform/single/ToSingleObjectNodeTransformer.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/CommandSpecMessageResolver.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/CommandSpecMessageResolver.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/CommandSpecMessageResolver.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/CommandSpecMessageResolver.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/IBasicOutputConfigSupplier.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/IBasicOutputConfigSupplier.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/IBasicOutputConfigSupplier.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/IBasicOutputConfigSupplier.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/IMessageResolver.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/IMessageResolver.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/IMessageResolver.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/IMessageResolver.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/IOutputWriterFactorySupplier.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/IOutputWriterFactorySupplier.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/IOutputWriterFactorySupplier.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/IOutputWriterFactorySupplier.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/ISingularSupplier.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/ISingularSupplier.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/ISingularSupplier.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/ISingularSupplier.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/IOutputWriter.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/IOutputWriter.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/IOutputWriter.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/IOutputWriter.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/IOutputWriterFactory.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/IOutputWriterFactory.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/IOutputWriterFactory.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/IOutputWriterFactory.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/query/OutputWriterWithQuery.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/query/OutputWriterWithQuery.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/query/OutputWriterWithQuery.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/query/OutputWriterWithQuery.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/IOutputConfigSupplier.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/IOutputConfigSupplier.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/IOutputConfigSupplier.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/IOutputConfigSupplier.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/IOutputOptions.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/IOutputOptions.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/IOutputOptions.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/IOutputOptions.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/OutputFormatConfig.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/OutputFormatConfig.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/OutputFormatConfig.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/OutputFormatConfig.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/OutputFormatConfigConverter.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/OutputFormatConfigConverter.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/OutputFormatConfigConverter.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/OutputFormatConfigConverter.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/StandardOutputConfig.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/StandardOutputConfig.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/StandardOutputConfig.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/StandardOutputConfig.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/StandardOutputWriter.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/StandardOutputWriter.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/StandardOutputWriter.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/StandardOutputWriter.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/VariableStoreConfig.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/VariableStoreConfig.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/VariableStoreConfig.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/VariableStoreConfig.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/VariableStoreConfigConverter.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/VariableStoreConfigConverter.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/VariableStoreConfigConverter.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/output/standard/VariableStoreConfigConverter.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/AbstractFormattedRecordWriter.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/AbstractFormattedRecordWriter.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/AbstractFormattedRecordWriter.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/AbstractFormattedRecordWriter.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/AbstractRecordWriter.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/AbstractRecordWriter.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/AbstractRecordWriter.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/AbstractRecordWriter.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/IRecordWriter.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/IRecordWriter.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/IRecordWriter.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/IRecordWriter.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/IRecordWriterFactory.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/IRecordWriterFactory.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/IRecordWriterFactory.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/IRecordWriterFactory.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/RecordWriterConfig.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/RecordWriterConfig.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/RecordWriterConfig.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/RecordWriterConfig.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/csv/CsvRecordWriter.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/csv/CsvRecordWriter.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/csv/CsvRecordWriter.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/csv/CsvRecordWriter.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/csv/CsvRecordWriterFactory.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/csv/CsvRecordWriterFactory.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/csv/CsvRecordWriterFactory.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/csv/CsvRecordWriterFactory.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/csv/package-info.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/csv/package-info.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/csv/package-info.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/csv/package-info.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/expr/ExprRecordWriter.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/expr/ExprRecordWriter.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/expr/ExprRecordWriter.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/expr/ExprRecordWriter.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/expr/ExprRecordWriterFactory.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/expr/ExprRecordWriterFactory.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/expr/ExprRecordWriterFactory.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/expr/ExprRecordWriterFactory.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/json/JsonRecordWriter.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/json/JsonRecordWriter.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/json/JsonRecordWriter.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/json/JsonRecordWriter.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/json/JsonRecordWriterFactory.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/json/JsonRecordWriterFactory.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/json/JsonRecordWriterFactory.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/json/JsonRecordWriterFactory.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/json/package-info.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/json/package-info.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/json/package-info.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/json/package-info.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/json_properties/JsonPropertiesRecordWriter.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/json_properties/JsonPropertiesRecordWriter.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/json_properties/JsonPropertiesRecordWriter.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/json_properties/JsonPropertiesRecordWriter.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/json_properties/JsonPropertiesRecordWriterFactory.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/json_properties/JsonPropertiesRecordWriterFactory.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/json_properties/JsonPropertiesRecordWriterFactory.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/json_properties/JsonPropertiesRecordWriterFactory.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/package-info.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/package-info.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/package-info.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/package-info.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/table/TableRecordWriter.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/table/TableRecordWriter.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/table/TableRecordWriter.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/table/TableRecordWriter.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/table/TableRecordWriterFactory.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/table/TableRecordWriterFactory.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/table/TableRecordWriterFactory.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/table/TableRecordWriterFactory.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/table/package-info.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/table/package-info.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/table/package-info.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/table/package-info.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/tree/TreeRecordWriter.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/tree/TreeRecordWriter.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/tree/TreeRecordWriter.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/tree/TreeRecordWriter.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/tree/TreeRecordWriterFactory.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/tree/TreeRecordWriterFactory.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/tree/TreeRecordWriterFactory.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/tree/TreeRecordWriterFactory.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/tree/package-info.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/tree/package-info.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/tree/package-info.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/tree/package-info.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/xml/XmlRecordWriter.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/xml/XmlRecordWriter.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/xml/XmlRecordWriter.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/xml/XmlRecordWriter.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/xml/XmlRecordWriterFactory.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/xml/XmlRecordWriterFactory.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/xml/XmlRecordWriterFactory.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/xml/XmlRecordWriterFactory.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/xml/package-info.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/xml/package-info.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/xml/package-info.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/xml/package-info.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/yaml/YamlRecordWriter.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/yaml/YamlRecordWriter.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/yaml/YamlRecordWriter.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/yaml/YamlRecordWriter.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/yaml/YamlRecordWriterFactory.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/yaml/YamlRecordWriterFactory.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/yaml/YamlRecordWriterFactory.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/yaml/YamlRecordWriterFactory.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/yaml/package-info.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/yaml/package-info.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/yaml/package-info.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/writer/record/yaml/package-info.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/progress/cli/mixin/ProgressWriterFactoryMixin.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/progress/cli/mixin/ProgressWriterFactoryMixin.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/progress/cli/mixin/ProgressWriterFactoryMixin.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/progress/cli/mixin/ProgressWriterFactoryMixin.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/progress/cli/mixin/ProgressWriterTypeConverter.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/progress/cli/mixin/ProgressWriterTypeConverter.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/progress/cli/mixin/ProgressWriterTypeConverter.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/progress/cli/mixin/ProgressWriterTypeConverter.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/progress/helper/AbstractProgressWriterWrapper.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/progress/helper/AbstractProgressWriterWrapper.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/progress/helper/AbstractProgressWriterWrapper.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/progress/helper/AbstractProgressWriterWrapper.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/progress/helper/IProgressWriter.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/progress/helper/IProgressWriter.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/progress/helper/IProgressWriter.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/progress/helper/IProgressWriter.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/progress/helper/IProgressWriterI18n.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/progress/helper/IProgressWriterI18n.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/progress/helper/IProgressWriterI18n.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/progress/helper/IProgressWriterI18n.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/progress/helper/ProgressWriterI18n.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/progress/helper/ProgressWriterI18n.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/progress/helper/ProgressWriterI18n.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/progress/helper/ProgressWriterI18n.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/progress/helper/ProgressWriterType.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/progress/helper/ProgressWriterType.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/progress/helper/ProgressWriterType.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/progress/helper/ProgressWriterType.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/report/cli/cmd/AbstractConfigurableReportGenerateCommand.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/report/cli/cmd/AbstractConfigurableReportGenerateCommand.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/report/cli/cmd/AbstractConfigurableReportGenerateCommand.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/report/cli/cmd/AbstractConfigurableReportGenerateCommand.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/report/cli/cmd/AbstractReportGenerateCommand.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/report/cli/cmd/AbstractReportGenerateCommand.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/report/cli/cmd/AbstractReportGenerateCommand.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/report/cli/cmd/AbstractReportGenerateCommand.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/report/collector/IReportResultsCollector.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/report/collector/IReportResultsCollector.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/report/collector/IReportResultsCollector.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/report/collector/IReportResultsCollector.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/report/config/IReportSourceConfig.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/report/config/IReportSourceConfig.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/report/config/IReportSourceConfig.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/report/config/IReportSourceConfig.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/report/config/IReportSourceSupplierConfig.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/report/config/IReportSourceSupplierConfig.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/report/config/IReportSourceSupplierConfig.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/report/config/IReportSourceSupplierConfig.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/report/generator/AbstractReportUnirestResultsGenerator.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/report/generator/AbstractReportUnirestResultsGenerator.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/report/generator/AbstractReportUnirestResultsGenerator.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/report/generator/AbstractReportUnirestResultsGenerator.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/report/generator/IReportResultsGenerator.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/report/generator/IReportResultsGenerator.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/report/generator/IReportResultsGenerator.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/report/generator/IReportResultsGenerator.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/report/logger/IReportLogger.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/report/logger/IReportLogger.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/report/logger/IReportLogger.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/report/logger/IReportLogger.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/report/logger/ReportLogger.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/report/logger/ReportLogger.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/report/logger/ReportLogger.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/report/logger/ReportLogger.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/report/writer/AbstractReportWriter.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/report/writer/AbstractReportWriter.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/report/writer/AbstractReportWriter.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/report/writer/AbstractReportWriter.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/report/writer/IReportWriter.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/report/writer/IReportWriter.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/report/writer/IReportWriter.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/report/writer/IReportWriter.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/report/writer/ReportDirWriter.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/report/writer/ReportDirWriter.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/report/writer/ReportDirWriter.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/report/writer/ReportDirWriter.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/report/writer/ReportZipWriter.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/report/writer/ReportZipWriter.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/report/writer/ReportZipWriter.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/report/writer/ReportZipWriter.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/cmd/AbstractRestCallCommand.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/cmd/AbstractRestCallCommand.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/cmd/AbstractRestCallCommand.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/cmd/AbstractRestCallCommand.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/cmd/AbstractWaitForCommand.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/cmd/AbstractWaitForCommand.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/cmd/AbstractWaitForCommand.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/cmd/AbstractWaitForCommand.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/mixin/StandardWaitHelperProgressMonitorMixin.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/mixin/StandardWaitHelperProgressMonitorMixin.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/mixin/StandardWaitHelperProgressMonitorMixin.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/mixin/StandardWaitHelperProgressMonitorMixin.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/mixin/UrlConfigOptions.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/mixin/UrlConfigOptions.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/mixin/UrlConfigOptions.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/mixin/UrlConfigOptions.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/mixin/WaitHelperControlOptions.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/mixin/WaitHelperControlOptions.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/mixin/WaitHelperControlOptions.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/mixin/WaitHelperControlOptions.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/mixin/WaitHelperWaitOptions.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/mixin/WaitHelperWaitOptions.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/mixin/WaitHelperWaitOptions.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/mixin/WaitHelperWaitOptions.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/mixin/package-info.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/mixin/package-info.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/mixin/package-info.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/mixin/package-info.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/paging/INextPageUrlProducer.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/paging/INextPageUrlProducer.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/paging/INextPageUrlProducer.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/paging/INextPageUrlProducer.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/paging/INextPageUrlProducerSupplier.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/paging/INextPageUrlProducerSupplier.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/paging/INextPageUrlProducerSupplier.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/paging/INextPageUrlProducerSupplier.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/paging/LinkHeaderNextPageUrlProducerFactory.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/paging/LinkHeaderNextPageUrlProducerFactory.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/paging/LinkHeaderNextPageUrlProducerFactory.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/paging/LinkHeaderNextPageUrlProducerFactory.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/paging/PagingHelper.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/paging/PagingHelper.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/paging/PagingHelper.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/paging/PagingHelper.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/query/IServerSideQueryParamGeneratorSupplier.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/query/IServerSideQueryParamGeneratorSupplier.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/query/IServerSideQueryParamGeneratorSupplier.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/query/IServerSideQueryParamGeneratorSupplier.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/query/IServerSideQueryParamValueGenerator.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/query/IServerSideQueryParamValueGenerator.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/query/IServerSideQueryParamValueGenerator.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/query/IServerSideQueryParamValueGenerator.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/query/cli/mixin/AbstractServerSideQueryMixin.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/query/cli/mixin/AbstractServerSideQueryMixin.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/query/cli/mixin/AbstractServerSideQueryMixin.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/query/cli/mixin/AbstractServerSideQueryMixin.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/GenericUnirestFactory.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/GenericUnirestFactory.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/GenericUnirestFactory.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/GenericUnirestFactory.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/IHttpRequestUpdater.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/IHttpRequestUpdater.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/IHttpRequestUpdater.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/IHttpRequestUpdater.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/IUnirestInstanceSupplier.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/IUnirestInstanceSupplier.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/IUnirestInstanceSupplier.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/IUnirestInstanceSupplier.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/IfFailureHandler.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/IfFailureHandler.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/IfFailureHandler.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/IfFailureHandler.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/UnexpectedHttpResponseException.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/UnexpectedHttpResponseException.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/UnexpectedHttpResponseException.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/UnexpectedHttpResponseException.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/IUrlConfig.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/IUrlConfig.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/IUrlConfig.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/IUrlConfig.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/IUrlConfigSupplier.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/IUrlConfigSupplier.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/IUrlConfigSupplier.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/IUrlConfigSupplier.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/IUserCredentialsConfig.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/IUserCredentialsConfig.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/IUserCredentialsConfig.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/IUserCredentialsConfig.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/UnirestBasicAuthConfigurer.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/UnirestBasicAuthConfigurer.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/UnirestBasicAuthConfigurer.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/UnirestBasicAuthConfigurer.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/UnirestJsonHeaderConfigurer.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/UnirestJsonHeaderConfigurer.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/UnirestJsonHeaderConfigurer.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/UnirestJsonHeaderConfigurer.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/UnirestUnexpectedHttpResponseConfigurer.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/UnirestUnexpectedHttpResponseConfigurer.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/UnirestUnexpectedHttpResponseConfigurer.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/UnirestUnexpectedHttpResponseConfigurer.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/UnirestUrlConfigConfigurer.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/UnirestUrlConfigConfigurer.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/UnirestUrlConfigConfigurer.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/UnirestUrlConfigConfigurer.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/UrlConfig.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/UrlConfig.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/UrlConfig.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/UrlConfig.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/package-info.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/package-info.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/package-info.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/config/package-info.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/package-info.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/package-info.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/package-info.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/unirest/package-info.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/IWaitHelperControlProperties.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/IWaitHelperControlProperties.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/IWaitHelperControlProperties.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/IWaitHelperControlProperties.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/IWaitHelperProgressMonitor.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/IWaitHelperProgressMonitor.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/IWaitHelperProgressMonitor.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/IWaitHelperProgressMonitor.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/IWaitHelperWaitDefinition.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/IWaitHelperWaitDefinition.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/IWaitHelperWaitDefinition.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/IWaitHelperWaitDefinition.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/IWaitHelperWaitDefinitionSupplier.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/IWaitHelperWaitDefinitionSupplier.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/IWaitHelperWaitDefinitionSupplier.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/IWaitHelperWaitDefinitionSupplier.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/StandardWaitHelperProgressMonitor.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/StandardWaitHelperProgressMonitor.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/StandardWaitHelperProgressMonitor.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/StandardWaitHelperProgressMonitor.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/WaitHelper.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/WaitHelper.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/WaitHelper.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/WaitHelper.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/WaitTimeoutAction.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/WaitTimeoutAction.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/WaitTimeoutAction.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/WaitTimeoutAction.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/WaitUnknownOrFailureStateAction.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/WaitUnknownOrFailureStateAction.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/WaitUnknownOrFailureStateAction.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/WaitUnknownOrFailureStateAction.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/WaitUnknownStateRequestedAction.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/WaitUnknownStateRequestedAction.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/WaitUnknownStateRequestedAction.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/wait/WaitUnknownStateRequestedAction.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/cli/cmd/AbstractSessionCommand.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/cli/cmd/AbstractSessionCommand.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/cli/cmd/AbstractSessionCommand.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/cli/cmd/AbstractSessionCommand.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/cli/cmd/AbstractSessionListCommand.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/cli/cmd/AbstractSessionListCommand.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/cli/cmd/AbstractSessionListCommand.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/cli/cmd/AbstractSessionListCommand.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/cli/cmd/AbstractSessionLoginCommand.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/cli/cmd/AbstractSessionLoginCommand.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/cli/cmd/AbstractSessionLoginCommand.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/cli/cmd/AbstractSessionLoginCommand.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/cli/cmd/AbstractSessionLogoutCommand.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/cli/cmd/AbstractSessionLogoutCommand.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/cli/cmd/AbstractSessionLogoutCommand.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/cli/cmd/AbstractSessionLogoutCommand.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/cli/mixin/AbstractSessionDescriptorSupplierMixin.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/cli/mixin/AbstractSessionDescriptorSupplierMixin.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/cli/mixin/AbstractSessionDescriptorSupplierMixin.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/cli/mixin/AbstractSessionDescriptorSupplierMixin.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/cli/mixin/AbstractSessionUnirestInstanceSupplierMixin.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/cli/mixin/AbstractSessionUnirestInstanceSupplierMixin.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/cli/mixin/AbstractSessionUnirestInstanceSupplierMixin.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/cli/mixin/AbstractSessionUnirestInstanceSupplierMixin.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/cli/mixin/SessionNameMixin.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/cli/mixin/SessionNameMixin.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/cli/mixin/SessionNameMixin.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/cli/mixin/SessionNameMixin.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/cli/mixin/UserCredentialOptions.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/cli/mixin/UserCredentialOptions.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/cli/mixin/UserCredentialOptions.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/cli/mixin/UserCredentialOptions.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/helper/AbstractSessionDescriptor.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/helper/AbstractSessionDescriptor.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/helper/AbstractSessionDescriptor.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/helper/AbstractSessionDescriptor.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/helper/AbstractSessionDescriptorWithSingleUrlConfig.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/helper/AbstractSessionDescriptorWithSingleUrlConfig.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/helper/AbstractSessionDescriptorWithSingleUrlConfig.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/helper/AbstractSessionDescriptorWithSingleUrlConfig.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/helper/AbstractSessionHelper.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/helper/AbstractSessionHelper.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/helper/AbstractSessionHelper.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/helper/AbstractSessionHelper.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/helper/ISessionDescriptor.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/helper/ISessionDescriptor.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/helper/ISessionDescriptor.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/helper/ISessionDescriptor.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/helper/ISessionDescriptorSupplier.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/helper/ISessionDescriptorSupplier.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/helper/ISessionDescriptorSupplier.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/helper/ISessionDescriptorSupplier.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/helper/SessionSummary.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/helper/SessionSummary.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/session/helper/SessionSummary.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/session/helper/SessionSummary.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/AbstractSpelNodeVisitor.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/AbstractSpelNodeVisitor.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/AbstractSpelNodeVisitor.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/AbstractSpelNodeVisitor.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/SpelHelper.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/SpelHelper.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/SpelHelper.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/SpelHelper.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/SpelNodeHelper.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/SpelNodeHelper.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/SpelNodeHelper.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/SpelNodeHelper.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/StandardSpelFunctions.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/StandardSpelFunctions.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/StandardSpelFunctions.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/StandardSpelFunctions.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/validator/AbstractSimpleSpelNodeValidator.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/validator/AbstractSimpleSpelNodeValidator.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/validator/AbstractSimpleSpelNodeValidator.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/validator/AbstractSimpleSpelNodeValidator.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/validator/AbstractSpelNodeValidator.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/validator/AbstractSpelNodeValidator.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/validator/AbstractSpelNodeValidator.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/spring/expression/validator/AbstractSpelNodeValidator.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/spring/package-info.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/spring/package-info.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/spring/package-info.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/spring/package-info.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/util/Counter.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/util/Counter.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/util/Counter.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/util/Counter.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/util/DateTimePeriodHelper.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/util/DateTimePeriodHelper.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/util/DateTimePeriodHelper.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/util/DateTimePeriodHelper.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/util/DisableTest.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/util/DisableTest.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/util/DisableTest.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/util/DisableTest.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/util/EncryptionHelper.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/util/EncryptionHelper.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/util/EncryptionHelper.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/util/EncryptionHelper.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/util/EnvHelper.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/util/EnvHelper.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/util/EnvHelper.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/util/EnvHelper.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/util/FcliBuildPropertiesHelper.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/util/FcliBuildPropertiesHelper.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/util/FcliBuildPropertiesHelper.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/util/FcliBuildPropertiesHelper.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/util/FcliDataHelper.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/util/FcliDataHelper.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/util/FcliDataHelper.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/util/FcliDataHelper.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/util/IndexAwareSet.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/util/IndexAwareSet.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/util/IndexAwareSet.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/util/IndexAwareSet.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/util/JavaHelper.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/util/JavaHelper.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/util/JavaHelper.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/util/JavaHelper.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/util/PicocliSpecHelper.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/util/PicocliSpecHelper.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/util/PicocliSpecHelper.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/util/PicocliSpecHelper.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/util/StringUtils.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/util/StringUtils.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/util/StringUtils.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/util/StringUtils.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/util/package-info.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/util/package-info.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/util/package-info.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/util/package-info.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/variable/DefaultVariablePropertyName.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/variable/DefaultVariablePropertyName.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/variable/DefaultVariablePropertyName.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/variable/DefaultVariablePropertyName.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/variable/EncryptVariable.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/variable/EncryptVariable.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/variable/EncryptVariable.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/variable/EncryptVariable.java diff --git a/buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/variable/FcliVariableHelper.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/variable/FcliVariableHelper.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/com/fortify/cli/common/variable/FcliVariableHelper.java rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/variable/FcliVariableHelper.java diff --git a/buildRoot/common/fcli-common/src/main/java/picocli/AutoComplete.java b/fcli-core/fcli-common/src/main/java/picocli/AutoComplete.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/picocli/AutoComplete.java rename to fcli-core/fcli-common/src/main/java/picocli/AutoComplete.java diff --git a/buildRoot/common/fcli-common/src/main/java/picocli/CommandLine.java b/fcli-core/fcli-common/src/main/java/picocli/CommandLine.java similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/picocli/CommandLine.java rename to fcli-core/fcli-common/src/main/java/picocli/CommandLine.java diff --git a/buildRoot/common/fcli-common/src/main/java/picocli/README.TXT b/fcli-core/fcli-common/src/main/java/picocli/README.TXT similarity index 100% rename from buildRoot/common/fcli-common/src/main/java/picocli/README.TXT rename to fcli-core/fcli-common/src/main/java/picocli/README.TXT diff --git a/buildRoot/common/fcli-common/src/main/resources/com/fortify/cli/common/i18n/FortifyCLIMessages.properties b/fcli-core/fcli-common/src/main/resources/com/fortify/cli/common/i18n/FortifyCLIMessages.properties similarity index 100% rename from buildRoot/common/fcli-common/src/main/resources/com/fortify/cli/common/i18n/FortifyCLIMessages.properties rename to fcli-core/fcli-common/src/main/resources/com/fortify/cli/common/i18n/FortifyCLIMessages.properties diff --git a/buildRoot/common/fcli-common/src/test/java/com/fortify/cli/common/rest/wait/WaitHelperTest.java b/fcli-core/fcli-common/src/test/java/com/fortify/cli/common/rest/wait/WaitHelperTest.java similarity index 100% rename from buildRoot/common/fcli-common/src/test/java/com/fortify/cli/common/rest/wait/WaitHelperTest.java rename to fcli-core/fcli-common/src/test/java/com/fortify/cli/common/rest/wait/WaitHelperTest.java diff --git a/fcli-core/fcli-config/build.gradle b/fcli-core/fcli-config/build.gradle new file mode 100644 index 0000000000..8e063597b9 --- /dev/null +++ b/fcli-core/fcli-config/build.gradle @@ -0,0 +1 @@ +apply from: "${sharedGradleScriptsDir}/fcli-module.gradle" \ No newline at end of file diff --git a/buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/_main/cli/cmd/ConfigClearCommand.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/_main/cli/cmd/ConfigClearCommand.java similarity index 100% rename from buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/_main/cli/cmd/ConfigClearCommand.java rename to fcli-core/fcli-config/src/main/java/com/fortify/cli/config/_main/cli/cmd/ConfigClearCommand.java diff --git a/buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/_main/cli/cmd/ConfigCommands.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/_main/cli/cmd/ConfigCommands.java similarity index 100% rename from buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/_main/cli/cmd/ConfigCommands.java rename to fcli-core/fcli-config/src/main/java/com/fortify/cli/config/_main/cli/cmd/ConfigCommands.java diff --git a/buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/_main/cli/cmd/package-info.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/_main/cli/cmd/package-info.java similarity index 100% rename from buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/_main/cli/cmd/package-info.java rename to fcli-core/fcli-config/src/main/java/com/fortify/cli/config/_main/cli/cmd/package-info.java diff --git a/buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageClearCommand.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageClearCommand.java similarity index 100% rename from buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageClearCommand.java rename to fcli-core/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageClearCommand.java diff --git a/buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageCommands.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageCommands.java similarity index 100% rename from buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageCommands.java rename to fcli-core/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageCommands.java diff --git a/buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageGetCommand.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageGetCommand.java similarity index 100% rename from buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageGetCommand.java rename to fcli-core/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageGetCommand.java diff --git a/buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageListCommand.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageListCommand.java similarity index 100% rename from buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageListCommand.java rename to fcli-core/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageListCommand.java diff --git a/buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageSetCommand.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageSetCommand.java similarity index 100% rename from buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageSetCommand.java rename to fcli-core/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageSetCommand.java diff --git a/buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyAddCommand.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyAddCommand.java similarity index 100% rename from buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyAddCommand.java rename to fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyAddCommand.java diff --git a/buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyClearCommand.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyClearCommand.java similarity index 100% rename from buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyClearCommand.java rename to fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyClearCommand.java diff --git a/buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyCommands.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyCommands.java similarity index 100% rename from buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyCommands.java rename to fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyCommands.java diff --git a/buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyDeleteCommand.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyDeleteCommand.java similarity index 100% rename from buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyDeleteCommand.java rename to fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyDeleteCommand.java diff --git a/buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyListCommand.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyListCommand.java similarity index 100% rename from buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyListCommand.java rename to fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyListCommand.java diff --git a/buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyUpdateCommand.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyUpdateCommand.java similarity index 100% rename from buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyUpdateCommand.java rename to fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyUpdateCommand.java diff --git a/buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/mixin/AbstractProxyOptions.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/mixin/AbstractProxyOptions.java similarity index 100% rename from buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/mixin/AbstractProxyOptions.java rename to fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/mixin/AbstractProxyOptions.java diff --git a/buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/mixin/ProxyAddOptions.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/mixin/ProxyAddOptions.java similarity index 100% rename from buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/mixin/ProxyAddOptions.java rename to fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/mixin/ProxyAddOptions.java diff --git a/buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/mixin/ProxyUpdateOptions.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/mixin/ProxyUpdateOptions.java similarity index 100% rename from buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/mixin/ProxyUpdateOptions.java rename to fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/mixin/ProxyUpdateOptions.java diff --git a/buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/proxy/helper/ProxyOutputHelper.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/helper/ProxyOutputHelper.java similarity index 100% rename from buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/proxy/helper/ProxyOutputHelper.java rename to fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/helper/ProxyOutputHelper.java diff --git a/buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreClearCommand.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreClearCommand.java similarity index 100% rename from buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreClearCommand.java rename to fcli-core/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreClearCommand.java diff --git a/buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreCommands.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreCommands.java similarity index 100% rename from buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreCommands.java rename to fcli-core/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreCommands.java diff --git a/buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreGetCommand.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreGetCommand.java similarity index 100% rename from buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreGetCommand.java rename to fcli-core/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreGetCommand.java diff --git a/buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreSetCommand.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreSetCommand.java similarity index 100% rename from buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreSetCommand.java rename to fcli-core/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreSetCommand.java diff --git a/buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/truststore/helper/TrustStoreOutputHelper.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/truststore/helper/TrustStoreOutputHelper.java similarity index 100% rename from buildRoot/modules/fcli-config/src/main/java/com/fortify/cli/config/truststore/helper/TrustStoreOutputHelper.java rename to fcli-core/fcli-config/src/main/java/com/fortify/cli/config/truststore/helper/TrustStoreOutputHelper.java diff --git a/buildRoot/modules/fcli-config/src/main/resources/com/fortify/cli/config/i18n/ConfigMessages.properties b/fcli-core/fcli-config/src/main/resources/com/fortify/cli/config/i18n/ConfigMessages.properties similarity index 100% rename from buildRoot/modules/fcli-config/src/main/resources/com/fortify/cli/config/i18n/ConfigMessages.properties rename to fcli-core/fcli-config/src/main/resources/com/fortify/cli/config/i18n/ConfigMessages.properties diff --git a/buildRoot/modules/fcli-fod/build.gradle b/fcli-core/fcli-fod/build.gradle similarity index 53% rename from buildRoot/modules/fcli-fod/build.gradle rename to fcli-core/fcli-fod/build.gradle index a82f432a0c..a7929d6731 100644 --- a/buildRoot/modules/fcli-fod/build.gradle +++ b/fcli-core/fcli-fod/build.gradle @@ -1,3 +1,5 @@ +apply from: "${sharedGradleScriptsDir}/fcli-module.gradle" + dependencies { implementation 'javax.validation:validation-api' } \ No newline at end of file diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/cli/AbstractFoDBaseRequestOutputCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/cli/AbstractFoDBaseRequestOutputCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/cli/AbstractFoDBaseRequestOutputCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/cli/AbstractFoDBaseRequestOutputCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/cli/AbstractFoDJsonNodeOutputCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/cli/AbstractFoDJsonNodeOutputCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/cli/AbstractFoDJsonNodeOutputCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/cli/AbstractFoDJsonNodeOutputCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/cli/AbstractFoDOutputCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/cli/AbstractFoDOutputCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/cli/AbstractFoDOutputCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/cli/AbstractFoDOutputCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/mixin/FoDOutputHelperMixins.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/mixin/FoDOutputHelperMixins.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/mixin/FoDOutputHelperMixins.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/mixin/FoDOutputHelperMixins.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/mixin/FoDProductHelperMixin.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/mixin/FoDProductHelperMixin.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/mixin/FoDProductHelperMixin.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/mixin/FoDProductHelperMixin.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/FoDUrls.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/FoDUrls.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/FoDUrls.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/FoDUrls.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDErrorResponse.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDErrorResponse.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDErrorResponse.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDErrorResponse.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDFileTransferBase.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDFileTransferBase.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDFileTransferBase.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDFileTransferBase.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDFilterResultsTransformer.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDFilterResultsTransformer.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDFilterResultsTransformer.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDFilterResultsTransformer.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDInputTransformer.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDInputTransformer.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDInputTransformer.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDInputTransformer.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDPagingHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDPagingHelper.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDPagingHelper.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDPagingHelper.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDUploadResponse.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDUploadResponse.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDUploadResponse.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/helper/FoDUploadResponse.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/query/FoDFiltersParamGenerator.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/query/FoDFiltersParamGenerator.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/query/FoDFiltersParamGenerator.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/query/FoDFiltersParamGenerator.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/query/cli/mixin/FoDFiltersParamMixin.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/query/cli/mixin/FoDFiltersParamMixin.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/query/cli/mixin/FoDFiltersParamMixin.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/rest/query/cli/mixin/FoDFiltersParamMixin.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionCommands.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionCommands.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionCommands.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionListCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionListCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionListCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionListCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionLoginCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionLoginCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionLoginCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionLoginCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionLogoutCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionLogoutCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionLogoutCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionLogoutCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/mixin/FoDSessionLoginOptions.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/mixin/FoDSessionLoginOptions.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/mixin/FoDSessionLoginOptions.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/mixin/FoDSessionLoginOptions.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/FoDSessionDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/FoDSessionDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/FoDSessionDescriptor.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/FoDSessionDescriptor.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/FoDSessionHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/FoDSessionHelper.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/FoDSessionHelper.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/FoDSessionHelper.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/oauth/FoDOAuthHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/oauth/FoDOAuthHelper.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/oauth/FoDOAuthHelper.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/oauth/FoDOAuthHelper.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/oauth/FoDTokenCreateResponse.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/oauth/FoDTokenCreateResponse.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/oauth/FoDTokenCreateResponse.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/oauth/FoDTokenCreateResponse.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/oauth/IFoDClientCredentials.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/oauth/IFoDClientCredentials.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/oauth/IFoDClientCredentials.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/oauth/IFoDClientCredentials.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/oauth/IFoDUserCredentials.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/oauth/IFoDUserCredentials.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/oauth/IFoDUserCredentials.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/helper/oauth/IFoDUserCredentials.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/util/FoDConstants.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/util/FoDConstants.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/util/FoDConstants.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/util/FoDConstants.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/util/FoDEnums.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/util/FoDEnums.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_common/util/FoDEnums.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/util/FoDEnums.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_main/cli/cmd/FoDCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_main/cli/cmd/FoDCommands.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/_main/cli/cmd/FoDCommands.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_main/cli/cmd/FoDCommands.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/helper/FoDAttributeDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/helper/FoDAttributeDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/helper/FoDAttributeDescriptor.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/helper/FoDAttributeDescriptor.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/helper/FoDAttributeHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/helper/FoDAttributeHelper.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/helper/FoDAttributeHelper.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/helper/FoDAttributeHelper.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/helper/FoDPickListDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/helper/FoDPickListDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/helper/FoDPickListDescriptor.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/helper/FoDPickListDescriptor.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/mixin/FoDAttributeUpdateOptions.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/mixin/FoDAttributeUpdateOptions.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/mixin/FoDAttributeUpdateOptions.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/mixin/FoDAttributeUpdateOptions.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCommands.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCommands.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCommands.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCreateAppCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCreateAppCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCreateAppCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCreateAppCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCreateMicroserviceAppCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCreateMicroserviceAppCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCreateMicroserviceAppCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCreateMicroserviceAppCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCreateMobileAppCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCreateMobileAppCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCreateMobileAppCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCreateMobileAppCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCreateWebAppCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCreateWebAppCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCreateWebAppCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCreateWebAppCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppDeleteCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppDeleteCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppDeleteCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppDeleteCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppGetCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppGetCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppGetCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppGetCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppListCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppListCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppListCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppListCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppUpdateCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppUpdateCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppUpdateCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppUpdateCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/mixin/FoDAppResolverMixin.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/mixin/FoDAppResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/mixin/FoDAppResolverMixin.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/mixin/FoDAppResolverMixin.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/mixin/FoDAppTypeOptions.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/mixin/FoDAppTypeOptions.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/mixin/FoDAppTypeOptions.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/mixin/FoDAppTypeOptions.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/mixin/FoDCriticalityTypeOptions.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/mixin/FoDCriticalityTypeOptions.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/mixin/FoDCriticalityTypeOptions.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/mixin/FoDCriticalityTypeOptions.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/mixin/FoDSdlcStatusTypeOptions.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/mixin/FoDSdlcStatusTypeOptions.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/mixin/FoDSdlcStatusTypeOptions.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/mixin/FoDSdlcStatusTypeOptions.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppCreateRequest.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppCreateRequest.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppCreateRequest.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppCreateRequest.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppDescriptor.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppDescriptor.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppHelper.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppHelper.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppHelper.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppUpdateRequest.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppUpdateRequest.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppUpdateRequest.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppUpdateRequest.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/cli/cmd/FoDLookupCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/cli/cmd/FoDLookupCommands.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/cli/cmd/FoDLookupCommands.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/cli/cmd/FoDLookupCommands.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/cli/cmd/FoDLookupListCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/cli/cmd/FoDLookupListCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/cli/cmd/FoDLookupListCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/cli/cmd/FoDLookupListCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/cli/mixin/FoDLookupTypeOptions.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/cli/mixin/FoDLookupTypeOptions.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/cli/mixin/FoDLookupTypeOptions.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/cli/mixin/FoDLookupTypeOptions.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/helper/FoDLookupDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/helper/FoDLookupDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/helper/FoDLookupDescriptor.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/helper/FoDLookupDescriptor.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/helper/FoDLookupHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/helper/FoDLookupHelper.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/helper/FoDLookupHelper.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/helper/FoDLookupHelper.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceCommands.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceCommands.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceCommands.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceCreateCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceCreateCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceCreateCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceCreateCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceDeleteCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceDeleteCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceDeleteCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceDeleteCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceListCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceListCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceListCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceListCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceUpdateCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceUpdateCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceUpdateCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceUpdateCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/mixin/FoDAppAndMicroserviceNameDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/mixin/FoDAppAndMicroserviceNameDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/mixin/FoDAppAndMicroserviceNameDescriptor.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/mixin/FoDAppAndMicroserviceNameDescriptor.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/mixin/FoDAppAndMicroserviceNameResolverMixin.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/mixin/FoDAppAndMicroserviceNameResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/mixin/FoDAppAndMicroserviceNameResolverMixin.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/mixin/FoDAppAndMicroserviceNameResolverMixin.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/mixin/FoDAppMicroserviceResolverMixin.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/mixin/FoDAppMicroserviceResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/mixin/FoDAppMicroserviceResolverMixin.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/mixin/FoDAppMicroserviceResolverMixin.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/mixin/FoDAppMicroserviceUpdateOptions.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/mixin/FoDAppMicroserviceUpdateOptions.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/mixin/FoDAppMicroserviceUpdateOptions.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/mixin/FoDAppMicroserviceUpdateOptions.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/helper/FoDAppMicroserviceDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/helper/FoDAppMicroserviceDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/helper/FoDAppMicroserviceDescriptor.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/helper/FoDAppMicroserviceDescriptor.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/helper/FoDAppMicroserviceHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/helper/FoDAppMicroserviceHelper.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/helper/FoDAppMicroserviceHelper.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/helper/FoDAppMicroserviceHelper.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/helper/FoDAppMicroserviceUpdateRequest.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/helper/FoDAppMicroserviceUpdateRequest.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/helper/FoDAppMicroserviceUpdateRequest.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/helper/FoDAppMicroserviceUpdateRequest.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelCommands.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelCommands.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelCommands.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelCreateCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelCreateCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelCreateCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelCreateCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelDeleteCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelDeleteCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelDeleteCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelDeleteCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelGetCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelGetCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelGetCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelGetCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelListCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelListCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelListCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelListCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelUpdateCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelUpdateCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelUpdateCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelUpdateCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDAppAndRelNameDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDAppAndRelNameDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDAppAndRelNameDescriptor.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDAppAndRelNameDescriptor.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDAppAndRelNameResolverMixin.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDAppAndRelNameResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDAppAndRelNameResolverMixin.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDAppAndRelNameResolverMixin.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDAppMicroserviceAndRelNameDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDAppMicroserviceAndRelNameDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDAppMicroserviceAndRelNameDescriptor.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDAppMicroserviceAndRelNameDescriptor.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDAppMicroserviceRelResolverMixin.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDAppMicroserviceRelResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDAppMicroserviceRelResolverMixin.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDAppMicroserviceRelResolverMixin.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDAppRelResolverMixin.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDAppRelResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDAppRelResolverMixin.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDAppRelResolverMixin.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDDelimiterMixin.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDDelimiterMixin.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDDelimiterMixin.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/mixin/FoDDelimiterMixin.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDAppRelAssessmentTypeDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDAppRelAssessmentTypeDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDAppRelAssessmentTypeDescriptor.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDAppRelAssessmentTypeDescriptor.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDAppRelCreateRequest.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDAppRelCreateRequest.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDAppRelCreateRequest.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDAppRelCreateRequest.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDAppRelDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDAppRelDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDAppRelDescriptor.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDAppRelDescriptor.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDAppRelHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDAppRelHelper.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDAppRelHelper.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDAppRelHelper.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDAppRelUpdateRequest.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDAppRelUpdateRequest.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDAppRelUpdateRequest.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/helper/FoDAppRelUpdateRequest.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/rest/cli/cmd/FoDRestCallCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/rest/cli/cmd/FoDRestCallCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/rest/cli/cmd/FoDRestCallCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/rest/cli/cmd/FoDRestCallCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/rest/cli/cmd/FoDRestCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/rest/cli/cmd/FoDRestCommands.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/rest/cli/cmd/FoDRestCommands.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/rest/cli/cmd/FoDRestCommands.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/rest/cli/mixin/FoDTimePeriodOptions.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/rest/cli/mixin/FoDTimePeriodOptions.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/rest/cli/mixin/FoDTimePeriodOptions.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/rest/cli/mixin/FoDTimePeriodOptions.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/AbstractFoDScanImportCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/AbstractFoDScanImportCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/AbstractFoDScanImportCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/AbstractFoDScanImportCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/AbstractFoDScanListCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/AbstractFoDScanListCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/AbstractFoDScanListCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/AbstractFoDScanListCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanCancelCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanCancelCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanCancelCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanCancelCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanCommands.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanCommands.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanCommands.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanGetCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanGetCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanGetCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanGetCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanListCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanListCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanListCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanListCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanWaitForCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanWaitForCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanWaitForCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanWaitForCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/dast/FoDDastScanImportCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/dast/FoDDastScanImportCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/dast/FoDDastScanImportCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/dast/FoDDastScanImportCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/dast/FoDDastScanListCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/dast/FoDDastScanListCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/dast/FoDDastScanListCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/dast/FoDDastScanListCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/dast/FoDDastScanStartCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/dast/FoDDastScanStartCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/dast/FoDDastScanStartCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/dast/FoDDastScanStartCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/mobile/FoDMobileScanImportCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/mobile/FoDMobileScanImportCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/mobile/FoDMobileScanImportCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/mobile/FoDMobileScanImportCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/mobile/FoDMobileScanListCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/mobile/FoDMobileScanListCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/mobile/FoDMobileScanListCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/mobile/FoDMobileScanListCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/mobile/FoDMobileScanStartCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/mobile/FoDMobileScanStartCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/mobile/FoDMobileScanStartCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/mobile/FoDMobileScanStartCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/oss/FoDOssScanImportCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/oss/FoDOssScanImportCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/oss/FoDOssScanImportCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/oss/FoDOssScanImportCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/oss/FoDOssScanListCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/oss/FoDOssScanListCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/oss/FoDOssScanListCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/oss/FoDOssScanListCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/sast/FoDSastScanImportCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/sast/FoDSastScanImportCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/sast/FoDSastScanImportCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/sast/FoDSastScanImportCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/sast/FoDSastScanListCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/sast/FoDSastScanListCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/sast/FoDSastScanListCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/sast/FoDSastScanListCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/sast/FoDSastScanSetupCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/sast/FoDSastScanSetupCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/sast/FoDSastScanSetupCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/sast/FoDSastScanSetupCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/sast/FoDSastScanStartCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/sast/FoDSastScanStartCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/sast/FoDSastScanStartCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/sast/FoDSastScanStartCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDAnalysisStatusTypeOptions.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDAnalysisStatusTypeOptions.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDAnalysisStatusTypeOptions.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDAnalysisStatusTypeOptions.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDAssessmentTypeOptions.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDAssessmentTypeOptions.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDAssessmentTypeOptions.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDAssessmentTypeOptions.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDEntitlementFrequencyTypeOptions.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDEntitlementFrequencyTypeOptions.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDEntitlementFrequencyTypeOptions.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDEntitlementFrequencyTypeOptions.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDEntitlementPreferenceTypeOptions.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDEntitlementPreferenceTypeOptions.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDEntitlementPreferenceTypeOptions.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDEntitlementPreferenceTypeOptions.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDInProgressScanActionTypeOptions.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDInProgressScanActionTypeOptions.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDInProgressScanActionTypeOptions.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDInProgressScanActionTypeOptions.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDRemediationScanPreferenceTypeOptions.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDRemediationScanPreferenceTypeOptions.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDRemediationScanPreferenceTypeOptions.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDRemediationScanPreferenceTypeOptions.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDSbomFormatOptions.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDSbomFormatOptions.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDSbomFormatOptions.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDSbomFormatOptions.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDScanResolverMixin.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDScanResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDScanResolverMixin.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDScanResolverMixin.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDScanTypeOptions.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDScanTypeOptions.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDScanTypeOptions.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/mixin/FoDScanTypeOptions.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDAssessmentTypeDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDAssessmentTypeDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDAssessmentTypeDescriptor.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDAssessmentTypeDescriptor.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDImportScan.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDImportScan.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDImportScan.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDImportScan.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDImportScanResponse.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDImportScanResponse.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDImportScanResponse.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDImportScanResponse.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDImportScanSessionDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDImportScanSessionDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDImportScanSessionDescriptor.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDImportScanSessionDescriptor.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDScanDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDScanDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDScanDescriptor.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDScanDescriptor.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDScanHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDScanHelper.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDScanHelper.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDScanHelper.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDScanNotFoundException.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDScanNotFoundException.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDScanNotFoundException.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDScanNotFoundException.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDScanStatus.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDScanStatus.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDScanStatus.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDScanStatus.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDStartScan.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDStartScan.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDStartScan.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDStartScan.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDStartScanResponse.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDStartScanResponse.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDStartScanResponse.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/FoDStartScanResponse.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDDastScanDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDDastScanDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDDastScanDescriptor.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDDastScanDescriptor.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDDastScanHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDDastScanHelper.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDDastScanHelper.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDDastScanHelper.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDDastScanSetupDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDDastScanSetupDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDDastScanSetupDescriptor.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDDastScanSetupDescriptor.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDSetupDastScanRequest.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDSetupDastScanRequest.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDSetupDastScanRequest.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDSetupDastScanRequest.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDStartDastScanRequest.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDStartDastScanRequest.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDStartDastScanRequest.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDStartDastScanRequest.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/mobile/FoDMobileScanHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/mobile/FoDMobileScanHelper.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/mobile/FoDMobileScanHelper.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/mobile/FoDMobileScanHelper.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/mobile/FoDMobileScanSetupDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/mobile/FoDMobileScanSetupDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/mobile/FoDMobileScanSetupDescriptor.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/mobile/FoDMobileScanSetupDescriptor.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/mobile/FoDStartMobileScanRequest.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/mobile/FoDStartMobileScanRequest.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/mobile/FoDStartMobileScanRequest.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/mobile/FoDStartMobileScanRequest.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/oss/FoDOssHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/oss/FoDOssHelper.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/oss/FoDOssHelper.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/oss/FoDOssHelper.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/sast/FoDSastScanDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/sast/FoDSastScanDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/sast/FoDSastScanDescriptor.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/sast/FoDSastScanDescriptor.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/sast/FoDSastScanHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/sast/FoDSastScanHelper.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/sast/FoDSastScanHelper.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/sast/FoDSastScanHelper.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/sast/FoDSastScanSetupDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/sast/FoDSastScanSetupDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/sast/FoDSastScanSetupDescriptor.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/sast/FoDSastScanSetupDescriptor.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/sast/FoDSetupSastScanRequest.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/sast/FoDSetupSastScanRequest.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/sast/FoDSetupSastScanRequest.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/sast/FoDSetupSastScanRequest.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/sast/FoDStartSastScanRequest.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/sast/FoDStartSastScanRequest.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/sast/FoDStartSastScanRequest.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/sast/FoDStartSastScanRequest.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserCommands.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserCommands.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserCommands.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserCreateCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserCreateCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserCreateCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserCreateCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserDeleteCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserDeleteCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserDeleteCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserDeleteCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserGetCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserGetCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserGetCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserGetCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserListCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserListCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserListCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserListCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserUpdateCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserUpdateCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserUpdateCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserUpdateCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/mixin/FoDUserResolverMixin.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/mixin/FoDUserResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/mixin/FoDUserResolverMixin.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/mixin/FoDUserResolverMixin.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserAppAccessRequest.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserAppAccessRequest.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserAppAccessRequest.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserAppAccessRequest.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserCreateRequest.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserCreateRequest.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserCreateRequest.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserCreateRequest.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserDescriptor.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserDescriptor.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserHelper.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserHelper.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserHelper.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserUpdateRequest.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserUpdateRequest.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserUpdateRequest.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserUpdateRequest.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupCommands.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupCommands.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupCommands.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupCreateCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupCreateCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupCreateCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupCreateCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupDeleteCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupDeleteCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupDeleteCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupDeleteCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupGetCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupGetCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupGetCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupGetCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupListCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupListCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupListCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupListCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupUpdateCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupUpdateCommand.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupUpdateCommand.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupUpdateCommand.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/mixin/FoDUserGroupResolverMixin.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/mixin/FoDUserGroupResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/mixin/FoDUserGroupResolverMixin.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/mixin/FoDUserGroupResolverMixin.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupAppAccessRequest.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupAppAccessRequest.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupAppAccessRequest.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupAppAccessRequest.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupCreateRequest.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupCreateRequest.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupCreateRequest.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupCreateRequest.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupDescriptor.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupDescriptor.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupHelper.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupHelper.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupHelper.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupMembersRequest.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupMembersRequest.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupMembersRequest.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupMembersRequest.java diff --git a/buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupUpdateRequest.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupUpdateRequest.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupUpdateRequest.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/helper/FoDUserGroupUpdateRequest.java diff --git a/buildRoot/modules/fcli-fod/src/main/resources/com/fortify/cli/fod/i18n/FoDMessages.properties b/fcli-core/fcli-fod/src/main/resources/com/fortify/cli/fod/i18n/FoDMessages.properties similarity index 100% rename from buildRoot/modules/fcli-fod/src/main/resources/com/fortify/cli/fod/i18n/FoDMessages.properties rename to fcli-core/fcli-fod/src/main/resources/com/fortify/cli/fod/i18n/FoDMessages.properties diff --git a/buildRoot/modules/fcli-fod/src/test/java/com/fortify/cli/fod/_common/rest/query/FoDFilterParamGeneratorTest.java b/fcli-core/fcli-fod/src/test/java/com/fortify/cli/fod/_common/rest/query/FoDFilterParamGeneratorTest.java similarity index 100% rename from buildRoot/modules/fcli-fod/src/test/java/com/fortify/cli/fod/_common/rest/query/FoDFilterParamGeneratorTest.java rename to fcli-core/fcli-fod/src/test/java/com/fortify/cli/fod/_common/rest/query/FoDFilterParamGeneratorTest.java diff --git a/buildRoot/modules/fcli-fod/src/test/resources/com/fortify/cli/fod/rest/query/filterparam.csv b/fcli-core/fcli-fod/src/test/resources/com/fortify/cli/fod/rest/query/filterparam.csv similarity index 100% rename from buildRoot/modules/fcli-fod/src/test/resources/com/fortify/cli/fod/rest/query/filterparam.csv rename to fcli-core/fcli-fod/src/test/resources/com/fortify/cli/fod/rest/query/filterparam.csv diff --git a/buildRoot/modules/fcli-sc-dast/.gitkeep b/fcli-core/fcli-sc-dast/.gitkeep similarity index 100% rename from buildRoot/modules/fcli-sc-dast/.gitkeep rename to fcli-core/fcli-sc-dast/.gitkeep diff --git a/buildRoot/modules/fcli-sc-dast/build.gradle b/fcli-core/fcli-sc-dast/build.gradle similarity index 50% rename from buildRoot/modules/fcli-sc-dast/build.gradle rename to fcli-core/fcli-sc-dast/build.gradle index 3557a92684..27341f11b8 100644 --- a/buildRoot/modules/fcli-sc-dast/build.gradle +++ b/fcli-core/fcli-sc-dast/build.gradle @@ -1,3 +1,5 @@ +apply from: "${sharedGradleScriptsDir}/fcli-module.gradle" + dependencies { implementation project("${fcliSSCRef}") } \ No newline at end of file diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/output/cli/cmd/AbstractSCDastBaseRequestOutputCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/output/cli/cmd/AbstractSCDastBaseRequestOutputCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/output/cli/cmd/AbstractSCDastBaseRequestOutputCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/output/cli/cmd/AbstractSCDastBaseRequestOutputCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/output/cli/cmd/AbstractSCDastJsonNodeOutputCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/output/cli/cmd/AbstractSCDastJsonNodeOutputCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/output/cli/cmd/AbstractSCDastJsonNodeOutputCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/output/cli/cmd/AbstractSCDastJsonNodeOutputCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/output/cli/cmd/AbstractSCDastOutputCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/output/cli/cmd/AbstractSCDastOutputCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/output/cli/cmd/AbstractSCDastOutputCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/output/cli/cmd/AbstractSCDastOutputCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/output/cli/mixin/SCDastOutputHelperMixins.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/output/cli/mixin/SCDastOutputHelperMixins.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/output/cli/mixin/SCDastOutputHelperMixins.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/output/cli/mixin/SCDastOutputHelperMixins.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/output/cli/mixin/SCDastProductHelperMixin.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/output/cli/mixin/SCDastProductHelperMixin.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/output/cli/mixin/SCDastProductHelperMixin.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/output/cli/mixin/SCDastProductHelperMixin.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/rest/helper/SCDastInputTransformer.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/rest/helper/SCDastInputTransformer.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/rest/helper/SCDastInputTransformer.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/rest/helper/SCDastInputTransformer.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/rest/helper/SCDastPagingHelper.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/rest/helper/SCDastPagingHelper.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/rest/helper/SCDastPagingHelper.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/rest/helper/SCDastPagingHelper.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/rest/query/cli/mixin/SCDastQueryParamsMixin.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/rest/query/cli/mixin/SCDastQueryParamsMixin.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/rest/query/cli/mixin/SCDastQueryParamsMixin.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/rest/query/cli/mixin/SCDastQueryParamsMixin.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionCommands.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionCommands.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionCommands.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionCommands.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionListCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionListCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionListCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionListCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionLoginCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionLoginCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionLoginCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionLoginCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionLogoutCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionLogoutCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionLogoutCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionLogoutCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/mixin/SCDastSessionLoginOptions.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/mixin/SCDastSessionLoginOptions.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/mixin/SCDastSessionLoginOptions.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/mixin/SCDastSessionLoginOptions.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/mixin/SCDastSessionLogoutOptions.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/mixin/SCDastSessionLogoutOptions.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/mixin/SCDastSessionLogoutOptions.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/mixin/SCDastSessionLogoutOptions.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/mixin/SCDastUrlConfigOptions.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/mixin/SCDastUrlConfigOptions.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/mixin/SCDastUrlConfigOptions.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/mixin/SCDastUrlConfigOptions.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/mixin/SCDastUserCredentialAndExpiryOptions.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/mixin/SCDastUserCredentialAndExpiryOptions.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/mixin/SCDastUserCredentialAndExpiryOptions.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/mixin/SCDastUserCredentialAndExpiryOptions.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/mixin/SCDastUserCredentialOptions.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/mixin/SCDastUserCredentialOptions.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/mixin/SCDastUserCredentialOptions.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/mixin/SCDastUserCredentialOptions.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/helper/SCDastSessionDescriptor.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/helper/SCDastSessionDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/helper/SCDastSessionDescriptor.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/helper/SCDastSessionDescriptor.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/helper/SCDastSessionHelper.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/helper/SCDastSessionHelper.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/helper/SCDastSessionHelper.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/helper/SCDastSessionHelper.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/util/SCDastConstants.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/util/SCDastConstants.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/util/SCDastConstants.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/util/SCDastConstants.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_main/cli/cmd/SCDastCommands.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_main/cli/cmd/SCDastCommands.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_main/cli/cmd/SCDastCommands.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_main/cli/cmd/SCDastCommands.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/rest/cli/cmd/SCDastRestCallCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/rest/cli/cmd/SCDastRestCallCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/rest/cli/cmd/SCDastRestCallCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/rest/cli/cmd/SCDastRestCallCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/rest/cli/cmd/SCDastRestCommands.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/rest/cli/cmd/SCDastRestCommands.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/rest/cli/cmd/SCDastRestCommands.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/rest/cli/cmd/SCDastRestCommands.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/AbstractSCDastScanOutputCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/AbstractSCDastScanOutputCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/AbstractSCDastScanOutputCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/AbstractSCDastScanOutputCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanCommands.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanCommands.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanCommands.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanCommands.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanDownloadCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanDownloadCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanDownloadCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanDownloadCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanGetCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanGetCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanGetCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanGetCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanListCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanListCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanListCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanListCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanStartCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanStartCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanStartCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanStartCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanWaitForCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanWaitForCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanWaitForCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanWaitForCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/AbstractSCDastScanActionCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/AbstractSCDastScanActionCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/AbstractSCDastScanActionCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/AbstractSCDastScanActionCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanCompleteCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanCompleteCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanCompleteCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanCompleteCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanDeleteCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanDeleteCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanDeleteCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanDeleteCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanImportFindingsCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanImportFindingsCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanImportFindingsCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanImportFindingsCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanPauseCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanPauseCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanPauseCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanPauseCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanPublishCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanPublishCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanPublishCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanPublishCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanResumeCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanResumeCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanResumeCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/action/SCDastScanResumeCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/mixin/SCDastScanResolverMixin.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/mixin/SCDastScanResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/mixin/SCDastScanResolverMixin.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/mixin/SCDastScanResolverMixin.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/helper/SCDastScanDescriptor.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/helper/SCDastScanDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/helper/SCDastScanDescriptor.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/helper/SCDastScanDescriptor.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/helper/SCDastScanHelper.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/helper/SCDastScanHelper.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/helper/SCDastScanHelper.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/helper/SCDastScanHelper.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/helper/SCDastScanStatus.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/helper/SCDastScanStatus.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/helper/SCDastScanStatus.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/helper/SCDastScanStatus.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/cmd/SCDastScanPolicyCommands.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/cmd/SCDastScanPolicyCommands.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/cmd/SCDastScanPolicyCommands.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/cmd/SCDastScanPolicyCommands.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/cmd/SCDastScanPolicyGetCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/cmd/SCDastScanPolicyGetCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/cmd/SCDastScanPolicyGetCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/cmd/SCDastScanPolicyGetCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/cmd/SCDastScanPolicyListCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/cmd/SCDastScanPolicyListCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/cmd/SCDastScanPolicyListCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/cmd/SCDastScanPolicyListCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/mixin/SCDastScanPolicyResolverMixin.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/mixin/SCDastScanPolicyResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/mixin/SCDastScanPolicyResolverMixin.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/mixin/SCDastScanPolicyResolverMixin.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/helper/SCDastScanPolicyDescriptor.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/helper/SCDastScanPolicyDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/helper/SCDastScanPolicyDescriptor.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/helper/SCDastScanPolicyDescriptor.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/helper/SCDastScanPolicyHelper.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/helper/SCDastScanPolicyHelper.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/helper/SCDastScanPolicyHelper.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/helper/SCDastScanPolicyHelper.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/cmd/SCDastScanSettingsCommands.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/cmd/SCDastScanSettingsCommands.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/cmd/SCDastScanSettingsCommands.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/cmd/SCDastScanSettingsCommands.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/cmd/SCDastScanSettingsGetCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/cmd/SCDastScanSettingsGetCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/cmd/SCDastScanSettingsGetCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/cmd/SCDastScanSettingsGetCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/cmd/SCDastScanSettingsListCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/cmd/SCDastScanSettingsListCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/cmd/SCDastScanSettingsListCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/cmd/SCDastScanSettingsListCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/mixin/SCDastScanSettingsResolverMixin.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/mixin/SCDastScanSettingsResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/mixin/SCDastScanSettingsResolverMixin.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/mixin/SCDastScanSettingsResolverMixin.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/helper/SCDastScanSettingsDescriptor.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/helper/SCDastScanSettingsDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/helper/SCDastScanSettingsDescriptor.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/helper/SCDastScanSettingsDescriptor.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/helper/SCDastScanSettingsHelper.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/helper/SCDastScanSettingsHelper.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/helper/SCDastScanSettingsHelper.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/helper/SCDastScanSettingsHelper.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorCommands.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorCommands.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorCommands.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorCommands.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorDisableCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorDisableCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorDisableCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorDisableCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorEnableCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorEnableCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorEnableCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorEnableCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorGetCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorGetCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorGetCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorGetCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorListCommand.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorListCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorListCommand.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorListCommand.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/mixin/SCDastSensorResolverMixin.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/mixin/SCDastSensorResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/mixin/SCDastSensorResolverMixin.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/mixin/SCDastSensorResolverMixin.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/helper/SCDastSensorDescriptor.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/helper/SCDastSensorDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/helper/SCDastSensorDescriptor.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/helper/SCDastSensorDescriptor.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/helper/SCDastSensorHelper.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/helper/SCDastSensorHelper.java similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/helper/SCDastSensorHelper.java rename to fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/helper/SCDastSensorHelper.java diff --git a/buildRoot/modules/fcli-sc-dast/src/main/resources/com/fortify/cli/sc_dast/i18n/SCDastMessages.properties b/fcli-core/fcli-sc-dast/src/main/resources/com/fortify/cli/sc_dast/i18n/SCDastMessages.properties similarity index 100% rename from buildRoot/modules/fcli-sc-dast/src/main/resources/com/fortify/cli/sc_dast/i18n/SCDastMessages.properties rename to fcli-core/fcli-sc-dast/src/main/resources/com/fortify/cli/sc_dast/i18n/SCDastMessages.properties diff --git a/buildRoot/modules/fcli-sc-sast/.gitkeep b/fcli-core/fcli-sc-sast/.gitkeep similarity index 100% rename from buildRoot/modules/fcli-sc-sast/.gitkeep rename to fcli-core/fcli-sc-sast/.gitkeep diff --git a/buildRoot/modules/fcli-sc-sast/build.gradle b/fcli-core/fcli-sc-sast/build.gradle similarity index 50% rename from buildRoot/modules/fcli-sc-sast/build.gradle rename to fcli-core/fcli-sc-sast/build.gradle index 3557a92684..27341f11b8 100644 --- a/buildRoot/modules/fcli-sc-sast/build.gradle +++ b/fcli-core/fcli-sc-sast/build.gradle @@ -1,3 +1,5 @@ +apply from: "${sharedGradleScriptsDir}/fcli-module.gradle" + dependencies { implementation project("${fcliSSCRef}") } \ No newline at end of file diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastControllerBaseRequestOutputCommand.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastControllerBaseRequestOutputCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastControllerBaseRequestOutputCommand.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastControllerBaseRequestOutputCommand.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastControllerJsonNodeOutputCommand.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastControllerJsonNodeOutputCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastControllerJsonNodeOutputCommand.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastControllerJsonNodeOutputCommand.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastControllerOutputCommand.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastControllerOutputCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastControllerOutputCommand.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastControllerOutputCommand.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastSSCBaseRequestOutputCommand.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastSSCBaseRequestOutputCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastSSCBaseRequestOutputCommand.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastSSCBaseRequestOutputCommand.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastSSCJsonNodeOutputCommand.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastSSCJsonNodeOutputCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastSSCJsonNodeOutputCommand.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastSSCJsonNodeOutputCommand.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastSSCOutputCommand.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastSSCOutputCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastSSCOutputCommand.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/cmd/AbstractSCSastSSCOutputCommand.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/mixin/SCSastControllerProductHelperMixin.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/mixin/SCSastControllerProductHelperMixin.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/mixin/SCSastControllerProductHelperMixin.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/mixin/SCSastControllerProductHelperMixin.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/mixin/SCSastOutputHelperMixins.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/mixin/SCSastOutputHelperMixins.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/mixin/SCSastOutputHelperMixins.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/mixin/SCSastOutputHelperMixins.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/mixin/SCSastSSCProductHelperMixin.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/mixin/SCSastSSCProductHelperMixin.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/mixin/SCSastSSCProductHelperMixin.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/output/cli/mixin/SCSastSSCProductHelperMixin.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/rest/helper/SCSastInputTransformer.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/rest/helper/SCSastInputTransformer.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/rest/helper/SCSastInputTransformer.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/rest/helper/SCSastInputTransformer.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/rest/helper/SCSastUnirestHelper.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/rest/helper/SCSastUnirestHelper.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/rest/helper/SCSastUnirestHelper.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/rest/helper/SCSastUnirestHelper.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionCommands.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionCommands.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionCommands.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionCommands.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionListCommand.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionListCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionListCommand.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionListCommand.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionLoginCommand.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionLoginCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionLoginCommand.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionLoginCommand.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionLogoutCommand.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionLogoutCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionLogoutCommand.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionLogoutCommand.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/AbstractSCSastUnirestInstanceSupplierMixin.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/AbstractSCSastUnirestInstanceSupplierMixin.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/AbstractSCSastUnirestInstanceSupplierMixin.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/AbstractSCSastUnirestInstanceSupplierMixin.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/SCSastSessionLoginOptions.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/SCSastSessionLoginOptions.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/SCSastSessionLoginOptions.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/SCSastSessionLoginOptions.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/SCSastSessionLogoutOptions.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/SCSastSessionLogoutOptions.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/SCSastSessionLogoutOptions.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/SCSastSessionLogoutOptions.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/SCSastUrlConfigOptions.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/SCSastUrlConfigOptions.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/SCSastUrlConfigOptions.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/SCSastUrlConfigOptions.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/SCSastUserCredentialAndExpiryOptions.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/SCSastUserCredentialAndExpiryOptions.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/SCSastUserCredentialAndExpiryOptions.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/SCSastUserCredentialAndExpiryOptions.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/SCSastUserCredentialOptions.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/SCSastUserCredentialOptions.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/SCSastUserCredentialOptions.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/mixin/SCSastUserCredentialOptions.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/helper/SCSastSessionDescriptor.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/helper/SCSastSessionDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/helper/SCSastSessionDescriptor.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/helper/SCSastSessionDescriptor.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/helper/SCSastSessionHelper.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/helper/SCSastSessionHelper.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/helper/SCSastSessionHelper.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/helper/SCSastSessionHelper.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_main/cli/cmd/SCSastCommands.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_main/cli/cmd/SCSastCommands.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_main/cli/cmd/SCSastCommands.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_main/cli/cmd/SCSastCommands.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/rest/cli/cmd/SCSastControllerRestCallCommand.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/rest/cli/cmd/SCSastControllerRestCallCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/rest/cli/cmd/SCSastControllerRestCallCommand.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/rest/cli/cmd/SCSastControllerRestCallCommand.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/rest/cli/cmd/SCSastControllerRestCommands.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/rest/cli/cmd/SCSastControllerRestCommands.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/rest/cli/cmd/SCSastControllerRestCommands.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/rest/cli/cmd/SCSastControllerRestCommands.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastControllerScanCancelCommand.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastControllerScanCancelCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastControllerScanCancelCommand.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastControllerScanCancelCommand.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastControllerScanStartCommand.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastControllerScanStartCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastControllerScanStartCommand.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastControllerScanStartCommand.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastControllerScanStatusCommand.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastControllerScanStatusCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastControllerScanStatusCommand.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastControllerScanStatusCommand.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastControllerScanWaitForCommand.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastControllerScanWaitForCommand.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastControllerScanWaitForCommand.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastControllerScanWaitForCommand.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastScanCommands.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastScanCommands.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastScanCommands.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastScanCommands.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/mixin/ISCSastScanStartOptions.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/mixin/ISCSastScanStartOptions.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/mixin/ISCSastScanStartOptions.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/mixin/ISCSastScanStartOptions.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/mixin/SCSastScanJobResolverMixin.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/mixin/SCSastScanJobResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/mixin/SCSastScanJobResolverMixin.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/mixin/SCSastScanJobResolverMixin.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/mixin/SCSastScanStartMbsOptions.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/mixin/SCSastScanStartMbsOptions.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/mixin/SCSastScanStartMbsOptions.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/mixin/SCSastScanStartMbsOptions.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/mixin/SCSastScanStartOptionsArgGroup.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/mixin/SCSastScanStartOptionsArgGroup.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/mixin/SCSastScanStartOptionsArgGroup.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/mixin/SCSastScanStartOptionsArgGroup.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/mixin/SCSastScanStartPackageOptions.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/mixin/SCSastScanStartPackageOptions.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/mixin/SCSastScanStartPackageOptions.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/mixin/SCSastScanStartPackageOptions.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/helper/SCSastControllerJobType.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/helper/SCSastControllerJobType.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/helper/SCSastControllerJobType.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/helper/SCSastControllerJobType.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/helper/SCSastControllerScanJobArtifactState.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/helper/SCSastControllerScanJobArtifactState.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/helper/SCSastControllerScanJobArtifactState.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/helper/SCSastControllerScanJobArtifactState.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/helper/SCSastControllerScanJobDescriptor.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/helper/SCSastControllerScanJobDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/helper/SCSastControllerScanJobDescriptor.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/helper/SCSastControllerScanJobDescriptor.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/helper/SCSastControllerScanJobHelper.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/helper/SCSastControllerScanJobHelper.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/helper/SCSastControllerScanJobHelper.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/helper/SCSastControllerScanJobHelper.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/helper/SCSastControllerScanJobState.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/helper/SCSastControllerScanJobState.java similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/helper/SCSastControllerScanJobState.java rename to fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/helper/SCSastControllerScanJobState.java diff --git a/buildRoot/modules/fcli-sc-sast/src/main/resources/com/fortify/cli/sc_sast/i18n/SCSastMessages.properties b/fcli-core/fcli-sc-sast/src/main/resources/com/fortify/cli/sc_sast/i18n/SCSastMessages.properties similarity index 100% rename from buildRoot/modules/fcli-sc-sast/src/main/resources/com/fortify/cli/sc_sast/i18n/SCSastMessages.properties rename to fcli-core/fcli-sc-sast/src/main/resources/com/fortify/cli/sc_sast/i18n/SCSastMessages.properties diff --git a/buildRoot/modules/fcli-ssc/.gitignore b/fcli-core/fcli-ssc/.gitignore similarity index 100% rename from buildRoot/modules/fcli-ssc/.gitignore rename to fcli-core/fcli-ssc/.gitignore diff --git a/buildRoot/modules/fcli-ssc/build.gradle b/fcli-core/fcli-ssc/build.gradle similarity index 53% rename from buildRoot/modules/fcli-ssc/build.gradle rename to fcli-core/fcli-ssc/build.gradle index a82f432a0c..a7929d6731 100644 --- a/buildRoot/modules/fcli-ssc/build.gradle +++ b/fcli-core/fcli-ssc/build.gradle @@ -1,3 +1,5 @@ +apply from: "${sharedGradleScriptsDir}/fcli-module.gradle" + dependencies { implementation 'javax.validation:validation-api' } \ No newline at end of file diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/cmd/AbstractSSCBaseRequestOutputCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/cmd/AbstractSSCBaseRequestOutputCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/cmd/AbstractSSCBaseRequestOutputCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/cmd/AbstractSSCBaseRequestOutputCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/cmd/AbstractSSCJsonNodeOutputCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/cmd/AbstractSSCJsonNodeOutputCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/cmd/AbstractSSCJsonNodeOutputCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/cmd/AbstractSSCJsonNodeOutputCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/cmd/AbstractSSCOutputCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/cmd/AbstractSSCOutputCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/cmd/AbstractSSCOutputCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/cmd/AbstractSSCOutputCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/mixin/AbstractSSCBulkEmbedMixin.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/mixin/AbstractSSCBulkEmbedMixin.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/mixin/AbstractSSCBulkEmbedMixin.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/mixin/AbstractSSCBulkEmbedMixin.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/mixin/SSCOutputHelperMixins.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/mixin/SSCOutputHelperMixins.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/mixin/SSCOutputHelperMixins.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/mixin/SSCOutputHelperMixins.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/mixin/SSCProductHelperMixin.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/mixin/SSCProductHelperMixin.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/mixin/SSCProductHelperMixin.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/output/cli/mixin/SSCProductHelperMixin.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/SSCUrls.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/SSCUrls.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/SSCUrls.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/SSCUrls.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/bulk/ISSCEntityEmbedder.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/bulk/ISSCEntityEmbedder.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/bulk/ISSCEntityEmbedder.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/bulk/ISSCEntityEmbedder.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/bulk/ISSCEntityEmbedderSupplier.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/bulk/ISSCEntityEmbedderSupplier.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/bulk/ISSCEntityEmbedderSupplier.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/bulk/ISSCEntityEmbedderSupplier.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/bulk/SSCBulkEmbedder.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/bulk/SSCBulkEmbedder.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/bulk/SSCBulkEmbedder.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/bulk/SSCBulkEmbedder.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/bulk/SSCBulkRequestBuilder.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/bulk/SSCBulkRequestBuilder.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/bulk/SSCBulkRequestBuilder.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/bulk/SSCBulkRequestBuilder.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/bulk/package-info.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/bulk/package-info.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/bulk/package-info.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/bulk/package-info.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/helper/SSCInputTransformer.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/helper/SSCInputTransformer.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/helper/SSCInputTransformer.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/helper/SSCInputTransformer.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/helper/SSCPagingHelper.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/helper/SSCPagingHelper.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/helper/SSCPagingHelper.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/helper/SSCPagingHelper.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/query/SSCQParamGenerator.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/query/SSCQParamGenerator.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/query/SSCQParamGenerator.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/query/SSCQParamGenerator.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/query/SSCQParamValueGenerators.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/query/SSCQParamValueGenerators.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/query/SSCQParamValueGenerators.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/query/SSCQParamValueGenerators.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/query/cli/mixin/SSCQParamMixin.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/query/cli/mixin/SSCQParamMixin.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/query/cli/mixin/SSCQParamMixin.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/query/cli/mixin/SSCQParamMixin.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/transfer/SSCFileTransferHelper.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/transfer/SSCFileTransferHelper.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/transfer/SSCFileTransferHelper.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/rest/transfer/SSCFileTransferHelper.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionCommands.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionCommands.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionCommands.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionListCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionListCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionListCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionListCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionLoginCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionLoginCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionLoginCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionLoginCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionLogoutCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionLogoutCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionLogoutCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionLogoutCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/mixin/SSCSessionLoginOptions.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/mixin/SSCSessionLoginOptions.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/mixin/SSCSessionLoginOptions.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/mixin/SSCSessionLoginOptions.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/mixin/SSCSessionLogoutOptions.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/mixin/SSCSessionLogoutOptions.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/mixin/SSCSessionLogoutOptions.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/mixin/SSCSessionLogoutOptions.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/helper/ISSCCredentialsConfig.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/helper/ISSCCredentialsConfig.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/helper/ISSCCredentialsConfig.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/helper/ISSCCredentialsConfig.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/helper/ISSCUserCredentialsConfig.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/helper/ISSCUserCredentialsConfig.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/helper/ISSCUserCredentialsConfig.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/helper/ISSCUserCredentialsConfig.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/helper/SSCSessionDescriptor.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/helper/SSCSessionDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/helper/SSCSessionDescriptor.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/helper/SSCSessionDescriptor.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/helper/SSCSessionHelper.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/helper/SSCSessionHelper.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/helper/SSCSessionHelper.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/helper/SSCSessionHelper.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_main/cli/cmd/SSCCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_main/cli/cmd/SSCCommands.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/_main/cli/cmd/SSCCommands.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_main/cli/cmd/SSCCommands.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/activity_feed/cli/cmd/SSCActivityFeedCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/activity_feed/cli/cmd/SSCActivityFeedCommands.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/activity_feed/cli/cmd/SSCActivityFeedCommands.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/activity_feed/cli/cmd/SSCActivityFeedCommands.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/activity_feed/cli/cmd/SSCActivityFeedListCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/activity_feed/cli/cmd/SSCActivityFeedListCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/activity_feed/cli/cmd/SSCActivityFeedListCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/activity_feed/cli/cmd/SSCActivityFeedListCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert/cli/cmd/SSCAlertCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert/cli/cmd/SSCAlertCommands.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert/cli/cmd/SSCAlertCommands.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert/cli/cmd/SSCAlertCommands.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert/cli/cmd/SSCAlertListCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert/cli/cmd/SSCAlertListCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert/cli/cmd/SSCAlertListCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert/cli/cmd/SSCAlertListCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert_definition/cli/cmd/SSCAlertDefinitionCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert_definition/cli/cmd/SSCAlertDefinitionCommands.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert_definition/cli/cmd/SSCAlertDefinitionCommands.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert_definition/cli/cmd/SSCAlertDefinitionCommands.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert_definition/cli/cmd/SSCAlertDefinitionGetCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert_definition/cli/cmd/SSCAlertDefinitionGetCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert_definition/cli/cmd/SSCAlertDefinitionGetCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert_definition/cli/cmd/SSCAlertDefinitionGetCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert_definition/cli/cmd/SSCAlertDefinitionListCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert_definition/cli/cmd/SSCAlertDefinitionListCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert_definition/cli/cmd/SSCAlertDefinitionListCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert_definition/cli/cmd/SSCAlertDefinitionListCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppCommands.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppCommands.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppCommands.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppDeleteCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppDeleteCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppDeleteCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppDeleteCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppGetCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppGetCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppGetCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppGetCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppListCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppListCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppListCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppListCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppUpdateCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppUpdateCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppUpdateCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppUpdateCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/mixin/SSCAppResolverMixin.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/mixin/SSCAppResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/mixin/SSCAppResolverMixin.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/mixin/SSCAppResolverMixin.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/helper/SSCAppDescriptor.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/helper/SSCAppDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/helper/SSCAppDescriptor.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/helper/SSCAppDescriptor.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/helper/SSCAppHelper.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/helper/SSCAppHelper.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/helper/SSCAppHelper.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/helper/SSCAppHelper.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionCommands.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionCommands.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionCommands.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionCreateCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionCreateCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionCreateCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionCreateCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionDeleteCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionDeleteCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionDeleteCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionDeleteCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionGetCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionGetCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionGetCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionGetCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionListCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionListCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionListCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionListCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionUpdateCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionUpdateCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionUpdateCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionUpdateCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/mixin/SSCAppAndVersionNameResolverMixin.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/mixin/SSCAppAndVersionNameResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/mixin/SSCAppAndVersionNameResolverMixin.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/mixin/SSCAppAndVersionNameResolverMixin.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/mixin/SSCAppVersionBulkEmbedMixin.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/mixin/SSCAppVersionBulkEmbedMixin.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/mixin/SSCAppVersionBulkEmbedMixin.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/mixin/SSCAppVersionBulkEmbedMixin.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/mixin/SSCAppVersionResolverMixin.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/mixin/SSCAppVersionResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/mixin/SSCAppVersionResolverMixin.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/mixin/SSCAppVersionResolverMixin.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/mixin/SSCDelimiterMixin.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/mixin/SSCDelimiterMixin.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/mixin/SSCDelimiterMixin.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/mixin/SSCDelimiterMixin.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/helper/SSCAppAndVersionNameDescriptor.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/helper/SSCAppAndVersionNameDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/helper/SSCAppAndVersionNameDescriptor.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/helper/SSCAppAndVersionNameDescriptor.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/helper/SSCAppVersionDescriptor.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/helper/SSCAppVersionDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/helper/SSCAppVersionDescriptor.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/helper/SSCAppVersionDescriptor.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/helper/SSCAppVersionEmbedderSupplier.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/helper/SSCAppVersionEmbedderSupplier.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/helper/SSCAppVersionEmbedderSupplier.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/helper/SSCAppVersionEmbedderSupplier.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/helper/SSCAppVersionHelper.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/helper/SSCAppVersionHelper.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/helper/SSCAppVersionHelper.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/helper/SSCAppVersionHelper.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/AbstractSSCAppVersionArtifactOutputCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/AbstractSSCAppVersionArtifactOutputCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/AbstractSSCAppVersionArtifactOutputCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/AbstractSSCAppVersionArtifactOutputCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/AbstractSSCAppVersionArtifactUploadCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/AbstractSSCAppVersionArtifactUploadCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/AbstractSSCAppVersionArtifactUploadCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/AbstractSSCAppVersionArtifactUploadCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactApproveCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactApproveCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactApproveCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactApproveCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactCommands.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactCommands.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactCommands.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactDeleteCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactDeleteCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactDeleteCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactDeleteCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactDownloadByIdCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactDownloadByIdCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactDownloadByIdCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactDownloadByIdCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactDownloadStateCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactDownloadStateCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactDownloadStateCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactDownloadStateCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactGetCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactGetCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactGetCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactGetCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactListCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactListCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactListCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactListCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactPurgeByIdCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactPurgeByIdCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactPurgeByIdCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactPurgeByIdCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactPurgeOlderThanCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactPurgeOlderThanCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactPurgeOlderThanCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactPurgeOlderThanCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactUploadCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactUploadCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactUploadCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactUploadCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactWaitForCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactWaitForCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactWaitForCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/SSCAppVersionArtifactWaitForCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/import_debricked/DebrickedLoginOptions.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/import_debricked/DebrickedLoginOptions.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/import_debricked/DebrickedLoginOptions.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/import_debricked/DebrickedLoginOptions.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/import_debricked/DebrickedUrlConfigOptions.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/import_debricked/DebrickedUrlConfigOptions.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/import_debricked/DebrickedUrlConfigOptions.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/import_debricked/DebrickedUrlConfigOptions.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/import_debricked/SSCAppVersionArtifactImportDebrickedCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/import_debricked/SSCAppVersionArtifactImportDebrickedCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/import_debricked/SSCAppVersionArtifactImportDebrickedCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/cmd/import_debricked/SSCAppVersionArtifactImportDebrickedCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/mixin/SSCAppVersionArtifactDownloadOptions.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/mixin/SSCAppVersionArtifactDownloadOptions.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/mixin/SSCAppVersionArtifactDownloadOptions.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/mixin/SSCAppVersionArtifactDownloadOptions.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/mixin/SSCAppVersionArtifactResolverMixin.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/mixin/SSCAppVersionArtifactResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/mixin/SSCAppVersionArtifactResolverMixin.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/cli/mixin/SSCAppVersionArtifactResolverMixin.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/helper/SSCAppVersionArtifactDescriptor.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/helper/SSCAppVersionArtifactDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/helper/SSCAppVersionArtifactDescriptor.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/helper/SSCAppVersionArtifactDescriptor.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/helper/SSCAppVersionArtifactHelper.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/helper/SSCAppVersionArtifactHelper.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/helper/SSCAppVersionArtifactHelper.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/helper/SSCAppVersionArtifactHelper.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/helper/SSCAppVersionArtifactStatus.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/helper/SSCAppVersionArtifactStatus.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/helper/SSCAppVersionArtifactStatus.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_artifact/helper/SSCAppVersionArtifactStatus.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/cmd/SSCAppVersionAttributeCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/cmd/SSCAppVersionAttributeCommands.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/cmd/SSCAppVersionAttributeCommands.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/cmd/SSCAppVersionAttributeCommands.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/cmd/SSCAppVersionAttributeListCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/cmd/SSCAppVersionAttributeListCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/cmd/SSCAppVersionAttributeListCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/cmd/SSCAppVersionAttributeListCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/cmd/SSCAppVersionAttributeSetCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/cmd/SSCAppVersionAttributeSetCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/cmd/SSCAppVersionAttributeSetCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/cmd/SSCAppVersionAttributeSetCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/mixin/SSCAppVersionAttributeUpdateMixin.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/mixin/SSCAppVersionAttributeUpdateMixin.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/mixin/SSCAppVersionAttributeUpdateMixin.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/mixin/SSCAppVersionAttributeUpdateMixin.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/helper/SSCAppVersionAttributeHelper.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/helper/SSCAppVersionAttributeHelper.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/helper/SSCAppVersionAttributeHelper.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/helper/SSCAppVersionAttributeHelper.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/helper/SSCAppVersionAttributeListHelper.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/helper/SSCAppVersionAttributeListHelper.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/helper/SSCAppVersionAttributeListHelper.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/helper/SSCAppVersionAttributeListHelper.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/helper/SSCAppVersionAttributeUpdateBuilder.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/helper/SSCAppVersionAttributeUpdateBuilder.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/helper/SSCAppVersionAttributeUpdateBuilder.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/helper/SSCAppVersionAttributeUpdateBuilder.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/cmd/SSCAppVersionFilterSetCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/cmd/SSCAppVersionFilterSetCommands.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/cmd/SSCAppVersionFilterSetCommands.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/cmd/SSCAppVersionFilterSetCommands.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/cmd/SSCAppVersionFilterSetGetCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/cmd/SSCAppVersionFilterSetGetCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/cmd/SSCAppVersionFilterSetGetCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/cmd/SSCAppVersionFilterSetGetCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/cmd/SSCAppVersionFilterSetListCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/cmd/SSCAppVersionFilterSetListCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/cmd/SSCAppVersionFilterSetListCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/cmd/SSCAppVersionFilterSetListCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/mixin/SSCAppVersionFilterSetResolverMixin.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/mixin/SSCAppVersionFilterSetResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/mixin/SSCAppVersionFilterSetResolverMixin.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/mixin/SSCAppVersionFilterSetResolverMixin.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/helper/SSCAppVersionFilterSetDescriptor.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/helper/SSCAppVersionFilterSetDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/helper/SSCAppVersionFilterSetDescriptor.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/helper/SSCAppVersionFilterSetDescriptor.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/helper/SSCAppVersionFilterSetHelper.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/helper/SSCAppVersionFilterSetHelper.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/helper/SSCAppVersionFilterSetHelper.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/helper/SSCAppVersionFilterSetHelper.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionAuthEntityAddCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionAuthEntityAddCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionAuthEntityAddCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionAuthEntityAddCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionAuthEntityCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionAuthEntityCommands.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionAuthEntityCommands.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionAuthEntityCommands.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionAuthEntityDeleteCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionAuthEntityDeleteCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionAuthEntityDeleteCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionAuthEntityDeleteCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionAuthEntityListCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionAuthEntityListCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionAuthEntityListCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionAuthEntityListCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/mixin/SSCAppVersionAuthEntityMixin.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/mixin/SSCAppVersionAuthEntityMixin.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/mixin/SSCAppVersionAuthEntityMixin.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/mixin/SSCAppVersionAuthEntityMixin.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/helper/SSCAppVersionAuthEntitiesUpdateBuilder.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/helper/SSCAppVersionAuthEntitiesUpdateBuilder.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/helper/SSCAppVersionAuthEntitiesUpdateBuilder.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/helper/SSCAppVersionAuthEntitiesUpdateBuilder.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_vuln/cli/cmd/SSCAppVersionVulnCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_vuln/cli/cmd/SSCAppVersionVulnCommands.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_vuln/cli/cmd/SSCAppVersionVulnCommands.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_vuln/cli/cmd/SSCAppVersionVulnCommands.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_vuln/cli/cmd/SSCAppVersionVulnCountCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_vuln/cli/cmd/SSCAppVersionVulnCountCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_vuln/cli/cmd/SSCAppVersionVulnCountCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_vuln/cli/cmd/SSCAppVersionVulnCountCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/cmd/SSCAttributeDefinitionCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/cmd/SSCAttributeDefinitionCommands.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/cmd/SSCAttributeDefinitionCommands.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/cmd/SSCAttributeDefinitionCommands.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/cmd/SSCAttributeDefinitionGetCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/cmd/SSCAttributeDefinitionGetCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/cmd/SSCAttributeDefinitionGetCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/cmd/SSCAttributeDefinitionGetCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/cmd/SSCAttributeDefinitionListCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/cmd/SSCAttributeDefinitionListCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/cmd/SSCAttributeDefinitionListCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/cmd/SSCAttributeDefinitionListCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/mixin/SSCAttributeDefinitionResolverMixin.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/mixin/SSCAttributeDefinitionResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/mixin/SSCAttributeDefinitionResolverMixin.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/mixin/SSCAttributeDefinitionResolverMixin.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/domain/SSCAttributeDefinitionCategory.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/domain/SSCAttributeDefinitionCategory.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/domain/SSCAttributeDefinitionCategory.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/domain/SSCAttributeDefinitionCategory.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/domain/SSCAttributeDefinitionType.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/domain/SSCAttributeDefinitionType.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/domain/SSCAttributeDefinitionType.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/domain/SSCAttributeDefinitionType.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/helper/SSCAttributeDefinitionDescriptor.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/helper/SSCAttributeDefinitionDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/helper/SSCAttributeDefinitionDescriptor.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/helper/SSCAttributeDefinitionDescriptor.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/helper/SSCAttributeDefinitionHelper.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/helper/SSCAttributeDefinitionHelper.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/helper/SSCAttributeDefinitionHelper.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/helper/SSCAttributeDefinitionHelper.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/helper/SSCAttributeOptionDefinitionDescriptor.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/helper/SSCAttributeOptionDefinitionDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/helper/SSCAttributeOptionDefinitionDescriptor.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/helper/SSCAttributeOptionDefinitionDescriptor.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/event/cli/cmd/SSCEventCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/event/cli/cmd/SSCEventCommands.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/event/cli/cmd/SSCEventCommands.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/event/cli/cmd/SSCEventCommands.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/event/cli/cmd/SSCEventListCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/event/cli/cmd/SSCEventListCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/event/cli/cmd/SSCEventListCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/event/cli/cmd/SSCEventListCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateCommands.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateCommands.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateCommands.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateCreateCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateCreateCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateCreateCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateCreateCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateDeleteCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateDeleteCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateDeleteCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateDeleteCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateDownloadCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateDownloadCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateDownloadCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateDownloadCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateGetCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateGetCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateGetCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateGetCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateListCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateListCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateListCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateListCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateUpdateCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateUpdateCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateUpdateCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateUpdateCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/mixin/SSCIssueTemplateResolverMixin.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/mixin/SSCIssueTemplateResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/mixin/SSCIssueTemplateResolverMixin.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/mixin/SSCIssueTemplateResolverMixin.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/helper/SSCIssueTemplateDescriptor.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/helper/SSCIssueTemplateDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/helper/SSCIssueTemplateDescriptor.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/helper/SSCIssueTemplateDescriptor.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/helper/SSCIssueTemplateHelper.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/helper/SSCIssueTemplateHelper.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/helper/SSCIssueTemplateHelper.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/helper/SSCIssueTemplateHelper.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobCancelCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobCancelCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobCancelCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobCancelCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobCommands.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobCommands.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobCommands.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobGetCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobGetCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobGetCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobGetCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobListCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobListCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobListCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobListCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobUpdateCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobUpdateCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobUpdateCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobUpdateCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/mixin/SSCJobResolverMixin.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/mixin/SSCJobResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/mixin/SSCJobResolverMixin.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/mixin/SSCJobResolverMixin.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/helper/SSCJobDescriptor.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/helper/SSCJobDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/helper/SSCJobDescriptor.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/helper/SSCJobDescriptor.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/helper/SSCJobHelper.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/helper/SSCJobHelper.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/helper/SSCJobHelper.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/helper/SSCJobHelper.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginCommands.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginCommands.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginCommands.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginDisableCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginDisableCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginDisableCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginDisableCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginEnableCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginEnableCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginEnableCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginEnableCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginGetCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginGetCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginGetCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginGetCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginInstallCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginInstallCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginInstallCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginInstallCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginListCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginListCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginListCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginListCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginUninstallCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginUninstallCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginUninstallCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginUninstallCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/mixin/SSCPluginResolverMixin.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/mixin/SSCPluginResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/mixin/SSCPluginResolverMixin.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/mixin/SSCPluginResolverMixin.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/helper/SSCPluginStateHelper.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/helper/SSCPluginStateHelper.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/helper/SSCPluginStateHelper.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/helper/SSCPluginStateHelper.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateCommands.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateCommands.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateCommands.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateCreateCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateCreateCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateCreateCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateCreateCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateDeleteCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateDeleteCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateDeleteCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateDeleteCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateDownloadCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateDownloadCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateDownloadCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateDownloadCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateGenerateConfigCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateGenerateConfigCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateGenerateConfigCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateGenerateConfigCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateGetCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateGetCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateGetCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateGetCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateListCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateListCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateListCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateListCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/mixin/SSCReportTemplateResolverMixin.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/mixin/SSCReportTemplateResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/mixin/SSCReportTemplateResolverMixin.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/mixin/SSCReportTemplateResolverMixin.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportParameter.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportParameter.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportParameter.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportParameter.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportParameterOption.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportParameterOption.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportParameterOption.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportParameterOption.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportParameterType.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportParameterType.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportParameterType.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportParameterType.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportRenderingEngineType.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportRenderingEngineType.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportRenderingEngineType.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportRenderingEngineType.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportTemplateDef.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportTemplateDef.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportTemplateDef.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportTemplateDef.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportType.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportType.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportType.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/domain/SSCReportType.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/helper/SSCReportTemplateDescriptor.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/helper/SSCReportTemplateDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/helper/SSCReportTemplateDescriptor.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/helper/SSCReportTemplateDescriptor.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/helper/SSCReportTemplateHelper.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/helper/SSCReportTemplateHelper.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/helper/SSCReportTemplateHelper.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/helper/SSCReportTemplateHelper.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/rest/cli/cmd/SSCRestCallCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/rest/cli/cmd/SSCRestCallCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/rest/cli/cmd/SSCRestCallCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/rest/cli/cmd/SSCRestCallCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/rest/cli/cmd/SSCRestCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/rest/cli/cmd/SSCRestCommands.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/rest/cli/cmd/SSCRestCommands.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/rest/cli/cmd/SSCRestCommands.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleCommands.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleCommands.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleCommands.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleCreateCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleCreateCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleCreateCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleCreateCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleDeleteCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleDeleteCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleDeleteCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleDeleteCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleGetCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleGetCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleGetCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleGetCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleListCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleListCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleListCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleListCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/mixin/SSCRoleResolverMixin.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/mixin/SSCRoleResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/mixin/SSCRoleResolverMixin.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/mixin/SSCRoleResolverMixin.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/helper/SSCRoleDescriptor.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/helper/SSCRoleDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/helper/SSCRoleDescriptor.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/helper/SSCRoleDescriptor.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/helper/SSCRoleHelper.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/helper/SSCRoleHelper.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/helper/SSCRoleHelper.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/helper/SSCRoleHelper.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/cmd/SSCRolePermissionCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/cmd/SSCRolePermissionCommands.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/cmd/SSCRolePermissionCommands.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/cmd/SSCRolePermissionCommands.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/cmd/SSCRolePermissionGetCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/cmd/SSCRolePermissionGetCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/cmd/SSCRolePermissionGetCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/cmd/SSCRolePermissionGetCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/cmd/SSCRolePermissionListCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/cmd/SSCRolePermissionListCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/cmd/SSCRolePermissionListCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/cmd/SSCRolePermissionListCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/mixin/SSCRolePermissionResolverMixin.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/mixin/SSCRolePermissionResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/mixin/SSCRolePermissionResolverMixin.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/mixin/SSCRolePermissionResolverMixin.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/helper/SSCRolePermissionDescriptor.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/helper/SSCRolePermissionDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/helper/SSCRolePermissionDescriptor.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/helper/SSCRolePermissionDescriptor.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/helper/SSCRolePermissionHelper.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/helper/SSCRolePermissionHelper.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/helper/SSCRolePermissionHelper.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/helper/SSCRolePermissionHelper.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/seed_bundle/cli/cmd/SSCSeedBundleCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/seed_bundle/cli/cmd/SSCSeedBundleCommands.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/seed_bundle/cli/cmd/SSCSeedBundleCommands.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/seed_bundle/cli/cmd/SSCSeedBundleCommands.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/seed_bundle/cli/cmd/SSCSeedBundleUploadCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/seed_bundle/cli/cmd/SSCSeedBundleUploadCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/seed_bundle/cli/cmd/SSCSeedBundleUploadCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/seed_bundle/cli/cmd/SSCSeedBundleUploadCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/AbstractSSCTokenCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/AbstractSSCTokenCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/AbstractSSCTokenCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/AbstractSSCTokenCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenCommands.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenCommands.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenCommands.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenCreateCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenCreateCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenCreateCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenCreateCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenListCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenListCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenListCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenListCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenRevokeCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenRevokeCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenRevokeCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenRevokeCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenUpdateCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenUpdateCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenUpdateCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenUpdateCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/mixin/SSCTokenCommandUrlConfigMixin.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/mixin/SSCTokenCommandUrlConfigMixin.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/mixin/SSCTokenCommandUrlConfigMixin.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/mixin/SSCTokenCommandUrlConfigMixin.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenConverter.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenConverter.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenConverter.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenConverter.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenCreateRequest.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenCreateRequest.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenCreateRequest.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenCreateRequest.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenCreateResponse.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenCreateResponse.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenCreateResponse.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenCreateResponse.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenHelper.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenHelper.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenHelper.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenHelper.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenUpdateRequest.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenUpdateRequest.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenUpdateRequest.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/helper/SSCTokenUpdateRequest.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token_definition/cli/cmd/SSCTokenDefinitionCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token_definition/cli/cmd/SSCTokenDefinitionCommands.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token_definition/cli/cmd/SSCTokenDefinitionCommands.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token_definition/cli/cmd/SSCTokenDefinitionCommands.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token_definition/cli/cmd/SSCTokenDefinitionListCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token_definition/cli/cmd/SSCTokenDefinitionListCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/token_definition/cli/cmd/SSCTokenDefinitionListCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token_definition/cli/cmd/SSCTokenDefinitionListCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCAuthEntityCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCAuthEntityCommands.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCAuthEntityCommands.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCAuthEntityCommands.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCAuthEntityDeleteCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCAuthEntityDeleteCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCAuthEntityDeleteCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCAuthEntityDeleteCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCAuthEntityGetCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCAuthEntityGetCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCAuthEntityGetCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCAuthEntityGetCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCAuthEntityListCommand.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCAuthEntityListCommand.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCAuthEntityListCommand.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCAuthEntityListCommand.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/mixin/SSCAuthEntityResolverMixin.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/mixin/SSCAuthEntityResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/mixin/SSCAuthEntityResolverMixin.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/mixin/SSCAuthEntityResolverMixin.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/helper/SSCAuthEntitiesHelper.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/helper/SSCAuthEntitiesHelper.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/helper/SSCAuthEntitiesHelper.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/helper/SSCAuthEntitiesHelper.java diff --git a/buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/helper/SSCAuthEntitySpecPredicate.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/helper/SSCAuthEntitySpecPredicate.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/helper/SSCAuthEntitySpecPredicate.java rename to fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/helper/SSCAuthEntitySpecPredicate.java diff --git a/buildRoot/modules/fcli-ssc/src/main/resources/com/fortify/cli/ssc/i18n/SSCMessages.properties b/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/i18n/SSCMessages.properties similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/resources/com/fortify/cli/ssc/i18n/SSCMessages.properties rename to fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/i18n/SSCMessages.properties diff --git a/buildRoot/modules/fcli-ssc/src/main/resources/com/fortify/cli/ssc/report_template/ReportTemplateConfig.yml b/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/report_template/ReportTemplateConfig.yml similarity index 100% rename from buildRoot/modules/fcli-ssc/src/main/resources/com/fortify/cli/ssc/report_template/ReportTemplateConfig.yml rename to fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/report_template/ReportTemplateConfig.yml diff --git a/buildRoot/modules/fcli-ssc/src/test/java/com/fortify/cli/ssc/rest/query/SSCQParamGeneratorTest.java b/fcli-core/fcli-ssc/src/test/java/com/fortify/cli/ssc/rest/query/SSCQParamGeneratorTest.java similarity index 100% rename from buildRoot/modules/fcli-ssc/src/test/java/com/fortify/cli/ssc/rest/query/SSCQParamGeneratorTest.java rename to fcli-core/fcli-ssc/src/test/java/com/fortify/cli/ssc/rest/query/SSCQParamGeneratorTest.java diff --git a/buildRoot/modules/fcli-ssc/src/test/resources/com/fortify/cli/ssc/rest/query/qparam.csv b/fcli-core/fcli-ssc/src/test/resources/com/fortify/cli/ssc/rest/query/qparam.csv similarity index 100% rename from buildRoot/modules/fcli-ssc/src/test/resources/com/fortify/cli/ssc/rest/query/qparam.csv rename to fcli-core/fcli-ssc/src/test/resources/com/fortify/cli/ssc/rest/query/qparam.csv diff --git a/fcli-core/fcli-state/build.gradle b/fcli-core/fcli-state/build.gradle new file mode 100644 index 0000000000..8e063597b9 --- /dev/null +++ b/fcli-core/fcli-state/build.gradle @@ -0,0 +1 @@ +apply from: "${sharedGradleScriptsDir}/fcli-module.gradle" \ No newline at end of file diff --git a/buildRoot/modules/fcli-state/src/main/java/com/fortify/cli/state/_main/cli/cmd/StateClearCommand.java b/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/_main/cli/cmd/StateClearCommand.java similarity index 100% rename from buildRoot/modules/fcli-state/src/main/java/com/fortify/cli/state/_main/cli/cmd/StateClearCommand.java rename to fcli-core/fcli-state/src/main/java/com/fortify/cli/state/_main/cli/cmd/StateClearCommand.java diff --git a/buildRoot/modules/fcli-state/src/main/java/com/fortify/cli/state/_main/cli/cmd/StateCommands.java b/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/_main/cli/cmd/StateCommands.java similarity index 100% rename from buildRoot/modules/fcli-state/src/main/java/com/fortify/cli/state/_main/cli/cmd/StateCommands.java rename to fcli-core/fcli-state/src/main/java/com/fortify/cli/state/_main/cli/cmd/StateCommands.java diff --git a/buildRoot/modules/fcli-state/src/main/java/com/fortify/cli/state/_main/cli/cmd/package-info.java b/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/_main/cli/cmd/package-info.java similarity index 100% rename from buildRoot/modules/fcli-state/src/main/java/com/fortify/cli/state/_main/cli/cmd/package-info.java rename to fcli-core/fcli-state/src/main/java/com/fortify/cli/state/_main/cli/cmd/package-info.java diff --git a/buildRoot/modules/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableClearCommand.java b/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableClearCommand.java similarity index 100% rename from buildRoot/modules/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableClearCommand.java rename to fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableClearCommand.java diff --git a/buildRoot/modules/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableCommands.java b/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableCommands.java similarity index 100% rename from buildRoot/modules/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableCommands.java rename to fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableCommands.java diff --git a/buildRoot/modules/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableContentsCommand.java b/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableContentsCommand.java similarity index 100% rename from buildRoot/modules/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableContentsCommand.java rename to fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableContentsCommand.java diff --git a/buildRoot/modules/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableDeleteCommand.java b/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableDeleteCommand.java similarity index 100% rename from buildRoot/modules/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableDeleteCommand.java rename to fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableDeleteCommand.java diff --git a/buildRoot/modules/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableGetCommand.java b/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableGetCommand.java similarity index 100% rename from buildRoot/modules/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableGetCommand.java rename to fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableGetCommand.java diff --git a/buildRoot/modules/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableListCommand.java b/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableListCommand.java similarity index 100% rename from buildRoot/modules/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableListCommand.java rename to fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableListCommand.java diff --git a/buildRoot/modules/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/mixin/VariableOutputHelperMixins.java b/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/mixin/VariableOutputHelperMixins.java similarity index 100% rename from buildRoot/modules/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/mixin/VariableOutputHelperMixins.java rename to fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/mixin/VariableOutputHelperMixins.java diff --git a/buildRoot/modules/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/mixin/VariableResolverMixin.java b/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/mixin/VariableResolverMixin.java similarity index 100% rename from buildRoot/modules/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/mixin/VariableResolverMixin.java rename to fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/mixin/VariableResolverMixin.java diff --git a/buildRoot/modules/fcli-state/src/main/resources/com/fortify/cli/state/i18n/StateMessages.properties b/fcli-core/fcli-state/src/main/resources/com/fortify/cli/state/i18n/StateMessages.properties similarity index 100% rename from buildRoot/modules/fcli-state/src/main/resources/com/fortify/cli/state/i18n/StateMessages.properties rename to fcli-core/fcli-state/src/main/resources/com/fortify/cli/state/i18n/StateMessages.properties diff --git a/fcli-core/fcli-tool/build.gradle b/fcli-core/fcli-tool/build.gradle new file mode 100644 index 0000000000..8e063597b9 --- /dev/null +++ b/fcli-core/fcli-tool/build.gradle @@ -0,0 +1 @@ +apply from: "${sharedGradleScriptsDir}/fcli-module.gradle" \ No newline at end of file diff --git a/buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/_common/cli/cmd/AbstractToolInstallCommand.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/cli/cmd/AbstractToolInstallCommand.java similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/_common/cli/cmd/AbstractToolInstallCommand.java rename to fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/cli/cmd/AbstractToolInstallCommand.java diff --git a/buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/_common/cli/cmd/AbstractToolListCommand.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/cli/cmd/AbstractToolListCommand.java similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/_common/cli/cmd/AbstractToolListCommand.java rename to fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/cli/cmd/AbstractToolListCommand.java diff --git a/buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/_common/cli/cmd/AbstractToolUninstallCommand.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/cli/cmd/AbstractToolUninstallCommand.java similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/_common/cli/cmd/AbstractToolUninstallCommand.java rename to fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/cli/cmd/AbstractToolUninstallCommand.java diff --git a/buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolDownloadDescriptor.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolDownloadDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolDownloadDescriptor.java rename to fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolDownloadDescriptor.java diff --git a/buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolHelper.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolHelper.java similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolHelper.java rename to fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolHelper.java diff --git a/buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolVersionCombinedDescriptor.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolVersionCombinedDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolVersionCombinedDescriptor.java rename to fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolVersionCombinedDescriptor.java diff --git a/buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolVersionDownloadDescriptor.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolVersionDownloadDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolVersionDownloadDescriptor.java rename to fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolVersionDownloadDescriptor.java diff --git a/buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolVersionInstallDescriptor.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolVersionInstallDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolVersionInstallDescriptor.java rename to fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolVersionInstallDescriptor.java diff --git a/buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/_common/util/FileUtils.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/util/FileUtils.java similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/_common/util/FileUtils.java rename to fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/util/FileUtils.java diff --git a/buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/_main/cli/cmd/ToolCommands.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_main/cli/cmd/ToolCommands.java similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/_main/cli/cmd/ToolCommands.java rename to fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_main/cli/cmd/ToolCommands.java diff --git a/buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderCommands.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderCommands.java similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderCommands.java rename to fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderCommands.java diff --git a/buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderInstallCommand.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderInstallCommand.java similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderInstallCommand.java rename to fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderInstallCommand.java diff --git a/buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderListCommand.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderListCommand.java similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderListCommand.java rename to fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderListCommand.java diff --git a/buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderUninstallCommand.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderUninstallCommand.java similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderUninstallCommand.java rename to fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderUninstallCommand.java diff --git a/buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientCommands.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientCommands.java similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientCommands.java rename to fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientCommands.java diff --git a/buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientInstallCommand.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientInstallCommand.java similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientInstallCommand.java rename to fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientInstallCommand.java diff --git a/buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientListCommand.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientListCommand.java similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientListCommand.java rename to fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientListCommand.java diff --git a/buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientUninstallCommand.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientUninstallCommand.java similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientUninstallCommand.java rename to fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientUninstallCommand.java diff --git a/buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterCommands.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterCommands.java similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterCommands.java rename to fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterCommands.java diff --git a/buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterInstallCommand.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterInstallCommand.java similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterInstallCommand.java rename to fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterInstallCommand.java diff --git a/buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterListCommand.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterListCommand.java similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterListCommand.java rename to fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterListCommand.java diff --git a/buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterUninstallCommand.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterUninstallCommand.java similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterUninstallCommand.java rename to fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterUninstallCommand.java diff --git a/buildRoot/modules/fcli-tool/src/main/resources/com/fortify/cli/tool/fod-uploader/extra-files/.gitignore b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fod-uploader/extra-files/.gitignore similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/resources/com/fortify/cli/tool/fod-uploader/extra-files/.gitignore rename to fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fod-uploader/extra-files/.gitignore diff --git a/buildRoot/modules/fcli-tool/src/main/resources/com/fortify/cli/tool/fod-uploader/extra-files/bin/FoDUpload b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fod-uploader/extra-files/bin/FoDUpload similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/resources/com/fortify/cli/tool/fod-uploader/extra-files/bin/FoDUpload rename to fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fod-uploader/extra-files/bin/FoDUpload diff --git a/buildRoot/modules/fcli-tool/src/main/resources/com/fortify/cli/tool/fod-uploader/extra-files/bin/FoDUpload.bat b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fod-uploader/extra-files/bin/FoDUpload.bat similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/resources/com/fortify/cli/tool/fod-uploader/extra-files/bin/FoDUpload.bat rename to fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fod-uploader/extra-files/bin/FoDUpload.bat diff --git a/buildRoot/modules/fcli-tool/src/main/resources/com/fortify/cli/tool/fod-uploader/fod-uploader.yaml b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fod-uploader/fod-uploader.yaml similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/resources/com/fortify/cli/tool/fod-uploader/fod-uploader.yaml rename to fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fod-uploader/fod-uploader.yaml diff --git a/buildRoot/modules/fcli-tool/src/main/resources/com/fortify/cli/tool/i18n/ToolMessages.properties b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/i18n/ToolMessages.properties similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/resources/com/fortify/cli/tool/i18n/ToolMessages.properties rename to fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/i18n/ToolMessages.properties diff --git a/buildRoot/modules/fcli-tool/src/main/resources/com/fortify/cli/tool/sc-client/sc-client.yaml b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/sc-client/sc-client.yaml similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/resources/com/fortify/cli/tool/sc-client/sc-client.yaml rename to fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/sc-client/sc-client.yaml diff --git a/buildRoot/modules/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln-exporter/extra-files/.gitignore b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln-exporter/extra-files/.gitignore similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln-exporter/extra-files/.gitignore rename to fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln-exporter/extra-files/.gitignore diff --git a/buildRoot/modules/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln-exporter/extra-files/bin/FortifyVulnerabilityExporter b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln-exporter/extra-files/bin/FortifyVulnerabilityExporter similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln-exporter/extra-files/bin/FortifyVulnerabilityExporter rename to fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln-exporter/extra-files/bin/FortifyVulnerabilityExporter diff --git a/buildRoot/modules/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln-exporter/extra-files/bin/FortifyVulnerabilityExporter.bat b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln-exporter/extra-files/bin/FortifyVulnerabilityExporter.bat similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln-exporter/extra-files/bin/FortifyVulnerabilityExporter.bat rename to fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln-exporter/extra-files/bin/FortifyVulnerabilityExporter.bat diff --git a/buildRoot/modules/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln-exporter/vuln-exporter.yaml b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln-exporter/vuln-exporter.yaml similarity index 100% rename from buildRoot/modules/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln-exporter/vuln-exporter.yaml rename to fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln-exporter/vuln-exporter.yaml diff --git a/buildRoot/modules/fcli-util/.gitignore b/fcli-core/fcli-util/.gitignore similarity index 100% rename from buildRoot/modules/fcli-util/.gitignore rename to fcli-core/fcli-util/.gitignore diff --git a/buildRoot/modules/fcli-util/build.gradle b/fcli-core/fcli-util/build.gradle similarity index 70% rename from buildRoot/modules/fcli-util/build.gradle rename to fcli-core/fcli-util/build.gradle index ce97a65bcd..9f33df4e68 100644 --- a/buildRoot/modules/fcli-util/build.gradle +++ b/fcli-core/fcli-util/build.gradle @@ -1,3 +1,5 @@ +apply from: "${sharedGradleScriptsDir}/fcli-module.gradle" + dependencies { // We require fcli-ssc as dependency for 'fcli util msp-report generate' command implementation project("${fcliSSCRef}") diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/_main/cli/cmd/UtilCommands.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/_main/cli/cmd/UtilCommands.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/_main/cli/cmd/UtilCommands.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/_main/cli/cmd/UtilCommands.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsCommands.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsCommands.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsCommands.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsCommands.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsListCommand.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsListCommand.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsListCommand.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsListCommand.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsUsageCommand.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsUsageCommand.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsUsageCommand.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsUsageCommand.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/mixin/AllCommandsCommandSelectorMixin.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/mixin/AllCommandsCommandSelectorMixin.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/mixin/AllCommandsCommandSelectorMixin.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/mixin/AllCommandsCommandSelectorMixin.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/mixin/AllCommandsOutputHelperMixins.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/mixin/AllCommandsOutputHelperMixins.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/mixin/AllCommandsOutputHelperMixins.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/mixin/AllCommandsOutputHelperMixins.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/autocomplete/cli/cmd/AutoCompleteCommands.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/autocomplete/cli/cmd/AutoCompleteCommands.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/autocomplete/cli/cmd/AutoCompleteCommands.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/autocomplete/cli/cmd/AutoCompleteCommands.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/autocomplete/cli/cmd/AutoCompleteGenerationCommand.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/autocomplete/cli/cmd/AutoCompleteGenerationCommand.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/autocomplete/cli/cmd/AutoCompleteGenerationCommand.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/autocomplete/cli/cmd/AutoCompleteGenerationCommand.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/AbstractCryptoCommand.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/AbstractCryptoCommand.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/AbstractCryptoCommand.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/AbstractCryptoCommand.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/CryptoCommands.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/CryptoCommands.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/CryptoCommands.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/CryptoCommands.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/CryptoDecryptCommand.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/CryptoDecryptCommand.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/CryptoDecryptCommand.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/CryptoDecryptCommand.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/CryptoEncryptCommand.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/CryptoEncryptCommand.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/CryptoEncryptCommand.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/CryptoEncryptCommand.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/cli/cmd/MspReportCommands.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/cli/cmd/MspReportCommands.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/cli/cmd/MspReportCommands.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/cli/cmd/MspReportCommands.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/cli/cmd/MspReportGenerateCommand.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/cli/cmd/MspReportGenerateCommand.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/cli/cmd/MspReportGenerateCommand.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/cli/cmd/MspReportGenerateCommand.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/cli/cmd/MspReportGenerateConfigCommand.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/cli/cmd/MspReportGenerateConfigCommand.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/cli/cmd/MspReportGenerateConfigCommand.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/cli/cmd/MspReportGenerateConfigCommand.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportAppCollector.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportAppCollector.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportAppCollector.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportAppCollector.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportAppScanCollector.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportAppScanCollector.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportAppScanCollector.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportAppScanCollector.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportAppVersionCollector.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportAppVersionCollector.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportAppVersionCollector.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportAppVersionCollector.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportArtifactCollector.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportArtifactCollector.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportArtifactCollector.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportArtifactCollector.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportResultsCollector.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportResultsCollector.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportResultsCollector.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportResultsCollector.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/IMspReportSourceConfig.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/IMspReportSourceConfig.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/IMspReportSourceConfig.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/IMspReportSourceConfig.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/MspReportConfig.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/MspReportConfig.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/MspReportConfig.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/MspReportConfig.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/MspReportSSCSourceConfig.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/MspReportSSCSourceConfig.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/MspReportSSCSourceConfig.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/MspReportSSCSourceConfig.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/MspReportSourcesConfig.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/MspReportSourcesConfig.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/MspReportSourcesConfig.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/MspReportSourcesConfig.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/AbstractMspReportUnirestResultsGenerator.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/AbstractMspReportUnirestResultsGenerator.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/AbstractMspReportUnirestResultsGenerator.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/AbstractMspReportUnirestResultsGenerator.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportLicenseType.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportLicenseType.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportLicenseType.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportLicenseType.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportProcessingStatus.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportProcessingStatus.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportProcessingStatus.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportProcessingStatus.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppDescriptor.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppDescriptor.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppDescriptor.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppSummaryDescriptor.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppSummaryDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppSummaryDescriptor.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppSummaryDescriptor.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppVersionAttribute.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppVersionAttribute.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppVersionAttribute.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppVersionAttribute.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppVersionDescriptor.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppVersionDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppVersionDescriptor.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppVersionDescriptor.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCArtifactDescriptor.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCArtifactDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCArtifactDescriptor.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCArtifactDescriptor.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCProcessedAppDescriptor.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCProcessedAppDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCProcessedAppDescriptor.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCProcessedAppDescriptor.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCProcessedAppVersionDescriptor.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCProcessedAppVersionDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCProcessedAppVersionDescriptor.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCProcessedAppVersionDescriptor.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCResultsGenerator.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCResultsGenerator.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCResultsGenerator.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCResultsGenerator.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCScanDescriptor.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCScanDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCScanDescriptor.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCScanDescriptor.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCScanType.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCScanType.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCScanType.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCScanType.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportAppVersionsWriter.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportAppVersionsWriter.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportAppVersionsWriter.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportAppVersionsWriter.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportAppsWriter.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportAppsWriter.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportAppsWriter.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportAppsWriter.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportArtifactsWriter.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportArtifactsWriter.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportArtifactsWriter.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportArtifactsWriter.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportScansWriter.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportScansWriter.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportScansWriter.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportScansWriter.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportAppVersionsWriter.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportAppVersionsWriter.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportAppVersionsWriter.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportAppVersionsWriter.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportAppsWriter.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportAppsWriter.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportAppsWriter.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportAppsWriter.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportArtifactsWriter.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportArtifactsWriter.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportArtifactsWriter.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportArtifactsWriter.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportResultsWriters.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportResultsWriters.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportResultsWriters.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportResultsWriters.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportScansWriter.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportScansWriter.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportScansWriter.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportScansWriter.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/cli/cmd/NcdReportCommands.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/cli/cmd/NcdReportCommands.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/cli/cmd/NcdReportCommands.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/cli/cmd/NcdReportCommands.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/cli/cmd/NcdReportGenerateCommand.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/cli/cmd/NcdReportGenerateCommand.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/cli/cmd/NcdReportGenerateCommand.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/cli/cmd/NcdReportGenerateCommand.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/cli/cmd/NcdReportGenerateConfigCommand.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/cli/cmd/NcdReportGenerateConfigCommand.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/cli/cmd/NcdReportGenerateConfigCommand.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/cli/cmd/NcdReportGenerateConfigCommand.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/INcdReportRepositoryBranchCommitCollector.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/INcdReportRepositoryBranchCommitCollector.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/INcdReportRepositoryBranchCommitCollector.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/INcdReportRepositoryBranchCommitCollector.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/INcdReportRepositoryProcessor.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/INcdReportRepositoryProcessor.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/INcdReportRepositoryProcessor.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/INcdReportRepositoryProcessor.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportAuthorCollector.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportAuthorCollector.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportAuthorCollector.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportAuthorCollector.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportAuthorDeduplicator.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportAuthorDeduplicator.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportAuthorDeduplicator.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportAuthorDeduplicator.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportRepositoryBranchCommitCollector.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportRepositoryBranchCommitCollector.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportRepositoryBranchCommitCollector.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportRepositoryBranchCommitCollector.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportRepositoryCollector.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportRepositoryCollector.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportRepositoryCollector.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportRepositoryCollector.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportRepositoryProcessor.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportRepositoryProcessor.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportRepositoryProcessor.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportRepositoryProcessor.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportResultsCollector.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportResultsCollector.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportResultsCollector.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportResultsCollector.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/AbstractNcdReportRepoSelectorConfig.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/AbstractNcdReportRepoSelectorConfig.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/AbstractNcdReportRepoSelectorConfig.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/AbstractNcdReportRepoSelectorConfig.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/INcdReportRepoSelectorConfig.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/INcdReportRepoSelectorConfig.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/INcdReportRepoSelectorConfig.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/INcdReportRepoSelectorConfig.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/INcdReportSourceConfig.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/INcdReportSourceConfig.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/INcdReportSourceConfig.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/INcdReportSourceConfig.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportCombinedRepoSelectorConfig.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportCombinedRepoSelectorConfig.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportCombinedRepoSelectorConfig.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportCombinedRepoSelectorConfig.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportConfig.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportConfig.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportConfig.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportConfig.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportContributorConfig.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportContributorConfig.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportContributorConfig.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportContributorConfig.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitHubOrganizationConfig.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitHubOrganizationConfig.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitHubOrganizationConfig.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitHubOrganizationConfig.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitHubSourceConfig.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitHubSourceConfig.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitHubSourceConfig.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitHubSourceConfig.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitLabGroupConfig.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitLabGroupConfig.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitLabGroupConfig.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitLabGroupConfig.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitLabSourceConfig.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitLabSourceConfig.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitLabSourceConfig.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitLabSourceConfig.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportSourcesConfig.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportSourcesConfig.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportSourcesConfig.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportSourcesConfig.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportAuthorDescriptor.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportAuthorDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportAuthorDescriptor.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportAuthorDescriptor.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportBranchDescriptor.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportBranchDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportBranchDescriptor.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportBranchDescriptor.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportCommitDescriptor.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportCommitDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportCommitDescriptor.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportCommitDescriptor.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportRepositoryDescriptor.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportRepositoryDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportRepositoryDescriptor.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportRepositoryDescriptor.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/NcdReportBranchCommitDescriptor.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/NcdReportBranchCommitDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/NcdReportBranchCommitDescriptor.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/NcdReportBranchCommitDescriptor.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/NcdReportProcessedAuthorDescriptor.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/NcdReportProcessedAuthorDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/NcdReportProcessedAuthorDescriptor.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/NcdReportProcessedAuthorDescriptor.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/AbstractNcdReportUnirestResultsGenerator.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/AbstractNcdReportUnirestResultsGenerator.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/AbstractNcdReportUnirestResultsGenerator.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/AbstractNcdReportUnirestResultsGenerator.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/INcdReportBranchCommitGenerator.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/INcdReportBranchCommitGenerator.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/INcdReportBranchCommitGenerator.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/INcdReportBranchCommitGenerator.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/GitHubPagingHelper.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/GitHubPagingHelper.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/GitHubPagingHelper.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/GitHubPagingHelper.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubAuthorDescriptor.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubAuthorDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubAuthorDescriptor.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubAuthorDescriptor.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubBranchDescriptor.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubBranchDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubBranchDescriptor.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubBranchDescriptor.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubCommitDescriptor.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubCommitDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubCommitDescriptor.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubCommitDescriptor.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubRepositoryDescriptor.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubRepositoryDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubRepositoryDescriptor.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubRepositoryDescriptor.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubResultsGenerator.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubResultsGenerator.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubResultsGenerator.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubResultsGenerator.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/GitLabPagingHelper.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/GitLabPagingHelper.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/GitLabPagingHelper.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/GitLabPagingHelper.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabAuthorDescriptor.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabAuthorDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabAuthorDescriptor.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabAuthorDescriptor.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabBranchDescriptor.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabBranchDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabBranchDescriptor.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabBranchDescriptor.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabCommitDescriptor.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabCommitDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabCommitDescriptor.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabCommitDescriptor.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabRepositoryDescriptor.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabRepositoryDescriptor.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabRepositoryDescriptor.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabRepositoryDescriptor.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabResultsGenerator.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabResultsGenerator.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabResultsGenerator.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabResultsGenerator.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/package-info.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/package-info.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/package-info.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/package-info.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportAuthorsByRepositoryWriter.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportAuthorsByRepositoryWriter.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportAuthorsByRepositoryWriter.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportAuthorsByRepositoryWriter.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportAuthorsWriter.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportAuthorsWriter.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportAuthorsWriter.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportAuthorsWriter.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportCommitsByBranchWriter.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportCommitsByBranchWriter.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportCommitsByBranchWriter.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportCommitsByBranchWriter.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportCommitsByRepositoryWriter.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportCommitsByRepositoryWriter.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportCommitsByRepositoryWriter.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportCommitsByRepositoryWriter.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportRepositoriesWriter.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportRepositoriesWriter.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportRepositoriesWriter.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportRepositoriesWriter.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportAuthorsByRepositoryWriter.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportAuthorsByRepositoryWriter.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportAuthorsByRepositoryWriter.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportAuthorsByRepositoryWriter.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportAuthorsWriter.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportAuthorsWriter.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportAuthorsWriter.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportAuthorsWriter.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportCommitsByBranchWriter.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportCommitsByBranchWriter.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportCommitsByBranchWriter.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportCommitsByBranchWriter.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportCommitsByRepositoryWriter.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportCommitsByRepositoryWriter.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportCommitsByRepositoryWriter.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportCommitsByRepositoryWriter.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportRepositoriesWriter.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportRepositoriesWriter.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportRepositoriesWriter.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportRepositoriesWriter.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportResultsWriters.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportResultsWriters.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportResultsWriters.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportResultsWriters.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/sample_data/cli/cmd/SampleDataCommands.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/sample_data/cli/cmd/SampleDataCommands.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/sample_data/cli/cmd/SampleDataCommands.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/sample_data/cli/cmd/SampleDataCommands.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/sample_data/cli/cmd/SampleDataGetCommand.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/sample_data/cli/cmd/SampleDataGetCommand.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/sample_data/cli/cmd/SampleDataGetCommand.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/sample_data/cli/cmd/SampleDataGetCommand.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/sample_data/cli/cmd/SampleDataListCommand.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/sample_data/cli/cmd/SampleDataListCommand.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/sample_data/cli/cmd/SampleDataListCommand.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/sample_data/cli/cmd/SampleDataListCommand.java diff --git a/buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/sample_data/helper/SampleDataHelper.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/sample_data/helper/SampleDataHelper.java similarity index 100% rename from buildRoot/modules/fcli-util/src/main/java/com/fortify/cli/util/sample_data/helper/SampleDataHelper.java rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/sample_data/helper/SampleDataHelper.java diff --git a/buildRoot/modules/fcli-util/src/main/resources/com/fortify/cli/util/i18n/UtilMessages.properties b/fcli-core/fcli-util/src/main/resources/com/fortify/cli/util/i18n/UtilMessages.properties similarity index 100% rename from buildRoot/modules/fcli-util/src/main/resources/com/fortify/cli/util/i18n/UtilMessages.properties rename to fcli-core/fcli-util/src/main/resources/com/fortify/cli/util/i18n/UtilMessages.properties diff --git a/buildRoot/modules/fcli-util/src/main/resources/com/fortify/cli/util/msp_report/MspReportConfig.yml b/fcli-core/fcli-util/src/main/resources/com/fortify/cli/util/msp_report/MspReportConfig.yml similarity index 100% rename from buildRoot/modules/fcli-util/src/main/resources/com/fortify/cli/util/msp_report/MspReportConfig.yml rename to fcli-core/fcli-util/src/main/resources/com/fortify/cli/util/msp_report/MspReportConfig.yml diff --git a/buildRoot/modules/fcli-util/src/main/resources/com/fortify/cli/util/ncd_report/NcdReportConfig.yml b/fcli-core/fcli-util/src/main/resources/com/fortify/cli/util/ncd_report/NcdReportConfig.yml similarity index 100% rename from buildRoot/modules/fcli-util/src/main/resources/com/fortify/cli/util/ncd_report/NcdReportConfig.yml rename to fcli-core/fcli-util/src/main/resources/com/fortify/cli/util/ncd_report/NcdReportConfig.yml diff --git a/buildRoot/modules/fcli-util/src/test/java/com/fortify/cli/util/ncd_report/collector/NcdReportAuthorDeduplicatorTest.java b/fcli-core/fcli-util/src/test/java/com/fortify/cli/util/ncd_report/collector/NcdReportAuthorDeduplicatorTest.java similarity index 100% rename from buildRoot/modules/fcli-util/src/test/java/com/fortify/cli/util/ncd_report/collector/NcdReportAuthorDeduplicatorTest.java rename to fcli-core/fcli-util/src/test/java/com/fortify/cli/util/ncd_report/collector/NcdReportAuthorDeduplicatorTest.java diff --git a/buildRoot/app/fcli-autocomplete/build.gradle b/fcli-other/fcli-autocomplete/build.gradle similarity index 100% rename from buildRoot/app/fcli-autocomplete/build.gradle rename to fcli-other/fcli-autocomplete/build.gradle diff --git a/buildRoot/common/fcli-bom/build.gradle b/fcli-other/fcli-bom/build.gradle similarity index 100% rename from buildRoot/common/fcli-bom/build.gradle rename to fcli-other/fcli-bom/build.gradle diff --git a/buildRoot/app/fcli-doc/build.gradle b/fcli-other/fcli-doc/build.gradle similarity index 100% rename from buildRoot/app/fcli-doc/build.gradle rename to fcli-other/fcli-doc/build.gradle diff --git a/buildRoot/app/fcli-doc/src/docs/asciidoc/static/dev-info.adoc b/fcli-other/fcli-doc/src/docs/asciidoc/static/dev-info.adoc similarity index 100% rename from buildRoot/app/fcli-doc/src/docs/asciidoc/static/dev-info.adoc rename to fcli-other/fcli-doc/src/docs/asciidoc/static/dev-info.adoc diff --git a/buildRoot/app/fcli-doc/src/docs/asciidoc/static/index.adoc b/fcli-other/fcli-doc/src/docs/asciidoc/static/index.adoc similarity index 100% rename from buildRoot/app/fcli-doc/src/docs/asciidoc/static/index.adoc rename to fcli-other/fcli-doc/src/docs/asciidoc/static/index.adoc diff --git a/buildRoot/app/fcli-doc/src/docs/asciidoc/templates/html5/README.txt b/fcli-other/fcli-doc/src/docs/asciidoc/templates/html5/README.txt similarity index 100% rename from buildRoot/app/fcli-doc/src/docs/asciidoc/templates/html5/README.txt rename to fcli-other/fcli-doc/src/docs/asciidoc/templates/html5/README.txt diff --git a/buildRoot/app/fcli-doc/src/docs/asciidoc/templates/html5/document.html.erb b/fcli-other/fcli-doc/src/docs/asciidoc/templates/html5/document.html.erb similarity index 100% rename from buildRoot/app/fcli-doc/src/docs/asciidoc/templates/html5/document.html.erb rename to fcli-other/fcli-doc/src/docs/asciidoc/templates/html5/document.html.erb diff --git a/buildRoot/app/fcli-doc/src/docs/asciidoc/versioned/index.adoc b/fcli-other/fcli-doc/src/docs/asciidoc/versioned/index.adoc similarity index 100% rename from buildRoot/app/fcli-doc/src/docs/asciidoc/versioned/index.adoc rename to fcli-other/fcli-doc/src/docs/asciidoc/versioned/index.adoc diff --git a/buildRoot/app/fcli-functional-test/build.gradle b/fcli-other/fcli-functional-test/build.gradle similarity index 100% rename from buildRoot/app/fcli-functional-test/build.gradle rename to fcli-other/fcli-functional-test/build.gradle diff --git a/buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/TestRunner.groovy b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/TestRunner.groovy similarity index 100% rename from buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/TestRunner.groovy rename to fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/TestRunner.groovy diff --git a/buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/Input.java b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/Input.java similarity index 100% rename from buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/Input.java rename to fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/Input.java diff --git a/buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/extension/FcliGlobalExtension.groovy b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/extension/FcliGlobalExtension.groovy similarity index 100% rename from buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/extension/FcliGlobalExtension.groovy rename to fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/extension/FcliGlobalExtension.groovy diff --git a/buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/extension/FcliSessionExtension.groovy b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/extension/FcliSessionExtension.groovy similarity index 100% rename from buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/extension/FcliSessionExtension.groovy rename to fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/extension/FcliSessionExtension.groovy diff --git a/buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/runner/FcliRunner.groovy b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/runner/FcliRunner.groovy similarity index 100% rename from buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/runner/FcliRunner.groovy rename to fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/runner/FcliRunner.groovy diff --git a/buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/spec/BaseFcliSpec.groovy b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/spec/BaseFcliSpec.groovy similarity index 100% rename from buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/spec/BaseFcliSpec.groovy rename to fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/spec/BaseFcliSpec.groovy diff --git a/buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/spec/Fcli.groovy b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/spec/Fcli.groovy similarity index 100% rename from buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/spec/Fcli.groovy rename to fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/spec/Fcli.groovy diff --git a/buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/spec/FcliSession.groovy b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/spec/FcliSession.groovy similarity index 100% rename from buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/spec/FcliSession.groovy rename to fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/spec/FcliSession.groovy diff --git a/buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/spec/FcliSessionType.groovy b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/spec/FcliSessionType.groovy similarity index 100% rename from buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/spec/FcliSessionType.groovy rename to fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/spec/FcliSessionType.groovy diff --git a/buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/spec/Prefix.groovy b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/spec/Prefix.groovy similarity index 100% rename from buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/spec/Prefix.groovy rename to fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/_common/spec/Prefix.groovy diff --git a/buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/core/BasicInfoSpec.groovy b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/core/BasicInfoSpec.groovy similarity index 100% rename from buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/core/BasicInfoSpec.groovy rename to fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/core/BasicInfoSpec.groovy diff --git a/buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/core/ListOutputOptionsSpec.groovy b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/core/ListOutputOptionsSpec.groovy similarity index 100% rename from buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/core/ListOutputOptionsSpec.groovy rename to fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/core/ListOutputOptionsSpec.groovy diff --git a/buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/fod/FoDAppSpec.groovy b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/fod/FoDAppSpec.groovy similarity index 100% rename from buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/fod/FoDAppSpec.groovy rename to fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/fod/FoDAppSpec.groovy diff --git a/buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/sc_dast/SCDastSensorSpec.groovy b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/sc_dast/SCDastSensorSpec.groovy similarity index 100% rename from buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/sc_dast/SCDastSensorSpec.groovy rename to fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/sc_dast/SCDastSensorSpec.groovy diff --git a/buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/sc_sast/SCSastScanSpec.groovy b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/sc_sast/SCSastScanSpec.groovy similarity index 100% rename from buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/sc_sast/SCSastScanSpec.groovy rename to fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/sc_sast/SCSastScanSpec.groovy diff --git a/buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/ssc/SSCAppSpec.groovy b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/ssc/SSCAppSpec.groovy similarity index 100% rename from buildRoot/app/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/ssc/SSCAppSpec.groovy rename to fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/ssc/SSCAppSpec.groovy diff --git a/buildRoot/app/fcli-functional-test/src/ftest/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtension b/fcli-other/fcli-functional-test/src/ftest/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtension similarity index 100% rename from buildRoot/app/fcli-functional-test/src/ftest/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtension rename to fcli-other/fcli-functional-test/src/ftest/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtension diff --git a/buildRoot/_gradle/fcli-java.gradle b/fcli-other/fcli-gradle/fcli-java.gradle similarity index 100% rename from buildRoot/_gradle/fcli-java.gradle rename to fcli-other/fcli-gradle/fcli-java.gradle diff --git a/buildRoot/_gradle/module.gradle b/fcli-other/fcli-gradle/fcli-module.gradle similarity index 100% rename from buildRoot/_gradle/module.gradle rename to fcli-other/fcli-gradle/fcli-module.gradle diff --git a/buildRoot/patches/graalvm-annotations-processor-patch/build.gradle b/fcli-other/patches/graalvm-annotations-processor-patch/build.gradle similarity index 100% rename from buildRoot/patches/graalvm-annotations-processor-patch/build.gradle rename to fcli-other/patches/graalvm-annotations-processor-patch/build.gradle diff --git a/buildRoot/patches/graalvm-annotations-processor-patch/src/main/java/com/formkiq/graalvm/processors/GraalvmReflectAnnontationProcessor.java b/fcli-other/patches/graalvm-annotations-processor-patch/src/main/java/com/formkiq/graalvm/processors/GraalvmReflectAnnontationProcessor.java similarity index 100% rename from buildRoot/patches/graalvm-annotations-processor-patch/src/main/java/com/formkiq/graalvm/processors/GraalvmReflectAnnontationProcessor.java rename to fcli-other/patches/graalvm-annotations-processor-patch/src/main/java/com/formkiq/graalvm/processors/GraalvmReflectAnnontationProcessor.java diff --git a/buildRoot/patches/graalvm-annotations-processor-patch/src/main/java/com/formkiq/graalvm/processors/Reflect.java b/fcli-other/patches/graalvm-annotations-processor-patch/src/main/java/com/formkiq/graalvm/processors/Reflect.java similarity index 100% rename from buildRoot/patches/graalvm-annotations-processor-patch/src/main/java/com/formkiq/graalvm/processors/Reflect.java rename to fcli-other/patches/graalvm-annotations-processor-patch/src/main/java/com/formkiq/graalvm/processors/Reflect.java diff --git a/gradle.properties b/gradle.properties index b447b6f9cc..e9f7949982 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,33 +3,31 @@ # and in build.gradle files for declaring inter-project dependencies. Where # needed, the corresponding project directory path can be obtained through the # getRefDir(ref) function. -fcliBomRef=:buildRoot:common:fcli-bom -fcliCommonRef=:buildRoot:common:fcli-common -fcliConfigRef=:buildRoot:modules:fcli-config -fcliStateRef=:buildRoot:modules:fcli-state -fcliSSCRef=:buildRoot:modules:fcli-ssc -fcliFoDRef=:buildRoot:modules:fcli-fod -fcliSCSastRef=:buildRoot:modules:fcli-sc-sast -fcliSCDastRef=:buildRoot:modules:fcli-sc-dast -fcliToolRef=:buildRoot:modules:fcli-tool -fcliUtilRef=:buildRoot:modules:fcli-util -fcliAppRef=:buildRoot:app:fcli -fcliFunctionalTestRef=:buildRoot:app:fcli-functional-test -fcliAutoCompleteRef=:buildRoot:app:fcli-autocomplete -fcliDocRef=:buildRoot:app:fcli-doc +fcliAppRef=:fcli-core:fcli-app +fcliCommonRef=:fcli-core:fcli-common +fcliConfigRef=:fcli-core:fcli-config +fcliFoDRef=:fcli-core:fcli-fod +fcliSCDastRef=:fcli-core:fcli-sc-dast +fcliSCSastRef=:fcli-core:fcli-sc-sast +fcliSSCRef=:fcli-core:fcli-ssc +fcliStateRef=:fcli-core:fcli-state +fcliToolRef=:fcli-core:fcli-tool +fcliUtilRef=:fcli-core:fcli-util + +fcliBomRef=:fcli-other:fcli-bom +fcliFunctionalTestRef=:fcli-other:fcli-functional-test +fcliAutoCompleteRef=:fcli-other:fcli-autocomplete +fcliDocRef=:fcli-other:fcli-doc # TODO Remove once patch is available for # https://github.com/formkiq/graalvm-annotations-processor/issues/9 -patchGraalVMAnnotationsProcessorRef=:buildRoot:patches:graalvm-annotations-processor-patch +patchGraalVMAnnotationsProcessorRef=:fcli-other:patches:graalvm-annotations-processor-patch # Comma-separated list of patterns that should match all of the *Ref properties above refPatterns=fcli.+Ref,patchGraalVMAnnotationsProcessorRef # Location of shared Gradle scripts, relative from project root, used to set the # sharedGradleScriptsDir property in the top-level build.gradle file -sharedGradleScriptsRelativeDir=buildRoot/_gradle - -# Used in the top-level build.gradle file to identify fcli modules -fcliModulePathPrefix=:buildRoot:modules: +sharedGradleScriptsRelativeDir=fcli-other/fcli-gradle // Define the class names of the fcli top-level @Command class, used for generating manual pages, // reflect-config.json, ...