diff --git a/detectable/src/main/java/com/blackduck/integration/detectable/detectables/conan/lockfile/parser/ConanLockfileParser.java b/detectable/src/main/java/com/blackduck/integration/detectable/detectables/conan/lockfile/parser/ConanLockfileParser.java index 72531998ba..c1f1ef780d 100644 --- a/detectable/src/main/java/com/blackduck/integration/detectable/detectables/conan/lockfile/parser/ConanLockfileParser.java +++ b/detectable/src/main/java/com/blackduck/integration/detectable/detectables/conan/lockfile/parser/ConanLockfileParser.java @@ -105,7 +105,7 @@ private Map> generateIndexedNodeMap(JsonElement cona ConanLockfileData conanLockfileData = gson.fromJson(conanLockfileContents, ConanLockfileData.class); logger.trace("conanLockfileData: {}", conanLockfileData); if (!conanLockfileData.getConanLockfileGraph().isRevisionsEnabled()) { - logger.warn("The Conan revisions feature is not enabled, which will significantly reduce Black Duck's ability to identify dependencies"); + logger.warn("The Conan revisions feature is not enabled, which will significantly reduce Black Duck SCA's ability to identify dependencies"); } else { logger.debug("The Conan revisions feature is enabled"); } diff --git a/documentation/src/main/markdown/downloadingandinstalling/selfupdatingdetect.md b/documentation/src/main/markdown/downloadingandinstalling/selfupdatingdetect.md index af3cbb977f..abb7a60759 100644 --- a/documentation/src/main/markdown/downloadingandinstalling/selfupdatingdetect.md +++ b/documentation/src/main/markdown/downloadingandinstalling/selfupdatingdetect.md @@ -39,7 +39,7 @@ Downgrade to prior version blocked: ``` 2024-10-31 12:20:57 EDT INFO \[main] - Detect-Self-Updater: Checking https://test1.blackduck‎.com/api/tools/detect API for centrally managed Detect version to download to /Users/testuser/tmp. -2024-10-31 12:21:03 EDT WARN \[main] - Detect-Self-Updater: The Detect version 8.7.0 mapped at Black Duck server is not eligible for downgrade as it lacks the self-update feature. The self-update feature is available from 8.9.0 onwards. +2024-10-31 12:21:03 EDT WARN \[main] - Detect-Self-Updater: The Detect version 8.7.0 mapped at Black Duck SCA server is not eligible for downgrade as it lacks the self-update feature. The self-update feature is available from 8.9.0 onwards. ``` Update to version allowed (8.9.0+): @@ -47,7 +47,7 @@ Update to version allowed (8.9.0+): ``` 2024-10-31 12:33:52 EDT INFO \[main] - Detect-Self-Updater: Checking https://test1.blackduck‎.com/api/tools/detect API for centrally managed Detect version to download to /Users/testuser/tmp. -2024-10-31 12:33:53 EDT WARN \[main] - Detect-Self-Updater: The Detect version 10.0.0 mapped at Black Duck server is eligible for downgrade from the current version of 10.0.1. The self-update feature is available from 8.9.0 onwards. +2024-10-31 12:33:53 EDT WARN \[main] - Detect-Self-Updater: The Detect version 10.0.0 mapped at Black Duck SCA server is eligible for downgrade from the current version of 10.0.1. The self-update feature is available from 8.9.0 onwards. 2024-10-31 12:33:53 EDT INFO \[main] - Detect-Self-Updater: Centrally managed version of Detect was downloaded successfully and is ready to be run: /Users/testuser/tmp/detect-10.0.0.jar. ``` diff --git a/documentation/src/main/markdown/gettingstarted/quickstart.md b/documentation/src/main/markdown/gettingstarted/quickstart.md index 144b14a8cb..49a31b653f 100644 --- a/documentation/src/main/markdown/gettingstarted/quickstart.md +++ b/documentation/src/main/markdown/gettingstarted/quickstart.md @@ -33,13 +33,13 @@ The command you run looks like this: On Linux or Mac: ```` -bash <(curl -s -L https://detect.blackduck.com/detect10.sh) --blackduck.url={your Black Duck server URL} --blackduck.api.token={your Black Duck access token} +bash <(curl -s -L https://detect.blackduck.com/detect10.sh) --blackduck.url={your Black Duck SCA server URL} --blackduck.api.token={your Black Duck access token} ```` On Windows: ```` -powershell "[Net.ServicePointManager]::SecurityProtocol = 'tls12'; irm https://detect.blackduck.com/detect10.ps1?$(Get-Random) | iex; detect" --blackduck.url={your Black Duck server URL} --blackduck.api.token={your Black Duck access token} +powershell "[Net.ServicePointManager]::SecurityProtocol = 'tls12'; irm https://detect.blackduck.com/detect10.ps1?$(Get-Random) | iex; detect" --blackduck.url={your Black Duck SCA server URL} --blackduck.api.token={your Black Duck access token} ```` The operations performed by [detect_product_short] depends on what it finds in your source directory. diff --git a/documentation/src/main/markdown/results/overview.md b/documentation/src/main/markdown/results/overview.md index 35e79bd428..e5f19eab6a 100644 --- a/documentation/src/main/markdown/results/overview.md +++ b/documentation/src/main/markdown/results/overview.md @@ -8,7 +8,7 @@ To view and manage your [detect_product_long] scan results after running [detect ```` 2020-06-11 06:35:39 INFO [main] ---======== Detect Result ======== -2020-06-11 06:35:39 INFO [main] --- Black Duck Project BOM: https://my-hub-docker/api/projects/d8f798f1-1901-4902-aec7-f2e1cf2e4958/versions/6a8938e9-3615-40dd-8386-3bcb4ba52bec/components +2020-06-11 06:35:39 INFO [main] --- Black Duck SCA Project BOM: https://my-hub-docker/api/projects/d8f798f1-1901-4902-aec7-f2e1cf2e4958/versions/6a8938e9-3615-40dd-8386-3bcb4ba52bec/components ```` - Open the [bd_product_short] Project BOM URL in a browser to view the scan results in [bd_product_short]. - To find your scan in [bd_product_short], go to your [bd_product_short] instance and click Scans to see a list of scans on the Scans page. diff --git a/documentation/src/main/markdown/runningdetect/basics/runningwithblackduck.md b/documentation/src/main/markdown/runningdetect/basics/runningwithblackduck.md index 8d38de0a50..ea42acef75 100644 --- a/documentation/src/main/markdown/runningdetect/basics/runningwithblackduck.md +++ b/documentation/src/main/markdown/runningdetect/basics/runningwithblackduck.md @@ -21,7 +21,7 @@ project directory. * Fail on [policy violation](../../properties/configuration/project.md#fail-on-policy-violation-severities-advanced). * Run [IaC Scan](../iacscan.md) on provided targets. Note: Iac Scan capabilities require [bd_product_short] 2022.7.0 or later. -Refer to [Black Duck Server properties](../../properties/configuration/blackduck-server.md), [Black Duck Signature Scanner properties](../../properties/configuration/signature-scanner.md), and [IaC Scan](../iacscan.md) for details. +Refer to [Black Duck SCA Server properties](../../properties/configuration/blackduck-server.md), [Black Duck Signature Scanner properties](../../properties/configuration/signature-scanner.md), and [IaC Scan](../iacscan.md) for details. Available signature scanner properties can be determined by specifying `--help` when executing the signature scanner jar file from the command line. diff --git a/documentation/src/main/markdown/unsupportedreleasenotes.md b/documentation/src/main/markdown/unsupportedreleasenotes.md index 5ef277cf41..c0d422de9d 100644 --- a/documentation/src/main/markdown/unsupportedreleasenotes.md +++ b/documentation/src/main/markdown/unsupportedreleasenotes.md @@ -569,7 +569,7 @@ GO_MOD, GRADLE, LERNA, RUBYGEMS. and [detect.lerna.included.packages](properties/detectors/lerna.md#lerna-packages-included-advanced) to exclude and include specific Lerna packages. * Added critical security risks to the Black Duck Risk Report pdf. * Added detect.target.type to enhance the docker user experience. When set to IMAGE, some tools are automatically disabled and detect optimizes for an image-based scan. -* Added binary scanning of the container filesystem to the default Docker image scanning workflow. If you are scanning Docker images and your Black Duck server does not have the +* Added binary scanning of the container filesystem to the default Docker image scanning workflow. If you are scanning Docker images and your Black Duck SCA server does not have the binary scanning feature enabled; use --detect.tools.exluded=BINARY_SCAN to disable the binary scan step. ### Changed features diff --git a/src/main/java/com/blackduck/integration/detect/ApplicationUpdater.java b/src/main/java/com/blackduck/integration/detect/ApplicationUpdater.java index 74b007de57..b4b7937fe6 100644 --- a/src/main/java/com/blackduck/integration/detect/ApplicationUpdater.java +++ b/src/main/java/com/blackduck/integration/detect/ApplicationUpdater.java @@ -567,7 +567,7 @@ protected boolean canSelfUpdate() { } if (blackduckHost == null) { - logMessages.add("Black Duck URL is required for the Self-Update feature."); + logMessages.add("Black Duck SCA URL is required for the Self-Update feature."); } if(!logMessages.isEmpty()) { @@ -587,14 +587,14 @@ protected boolean isDownloadVersionTooOld(String currentVersion, String download && (downloadVersion.getMinor() < MINIMUM_DETECT_VERSION.getMinor() || (downloadVersion.getMinor() == MINIMUM_DETECT_VERSION.getMinor() && (downloadVersion.getMicro() < MINIMUM_DETECT_VERSION.getMicro()))))) { - logger.warn("{} The Detect version {} mapped at Black Duck server is " + logger.warn("{} The Detect version {} mapped at Black Duck SCA server is " + "not eligible for downgrade from the current version of {} " + "because it will not be possible to use the self-update feature " + "after the update as the feature is available only from {} onwards.", LOG_PREFIX, downloadVersionString, currentVersion, MINIMUM_DETECT_VERSION); return true; } - logger.info("{} The Detect version {} mapped at Black Duck server is " + logger.info("{} The Detect version {} mapped at Black Duck SCA server is " + "eligible for updating the current version of {} as the self-update " + "feature is available in the mapped version.", LOG_PREFIX, downloadVersionString, currentVersion); diff --git a/src/main/java/com/blackduck/integration/detect/configuration/DetectProperties.java b/src/main/java/com/blackduck/integration/detect/configuration/DetectProperties.java index f88d925bb3..d403175a19 100644 --- a/src/main/java/com/blackduck/integration/detect/configuration/DetectProperties.java +++ b/src/main/java/com/blackduck/integration/detect/configuration/DetectProperties.java @@ -80,8 +80,8 @@ private DetectProperties() { public static final NullableStringProperty BLACKDUCK_API_TOKEN = NullableStringProperty.newBuilder("blackduck.api.token") - .setInfo("Black Duck API Token", DetectPropertyFromVersion.VERSION_4_2_0) - .setHelp("The access token used to authenticate with the Black Duck Server.") + .setInfo("Black Duck SCA API Token", DetectPropertyFromVersion.VERSION_4_2_0) + .setHelp("The access token used to authenticate with the Black Duck SCA Server.") .setGroups(DetectGroup.BLACKDUCK_SERVER, DetectGroup.BLACKDUCK, DetectGroup.DEFAULT) .build(); @@ -89,7 +89,7 @@ private DetectProperties() { BooleanProperty.newBuilder("blackduck.offline.mode", false) .setInfo("Offline Mode", DetectPropertyFromVersion.VERSION_4_2_0) .setHelp( - "This can disable Black Duck communication - if set to true, Detect will not upload BDIO files, or check policies, and it will not download and install the signature scanner. Note that the path to a local instance of the scanner can be provided using the -detect.blackduck.signature.scanner.local.path parameter.") + "This can disable Black Duck SCA communication - if set to true, Detect will not upload BDIO files, or check policies, and it will not download and install the signature scanner. Note that the path to a local instance of the scanner can be provided using the -detect.blackduck.signature.scanner.local.path parameter.") .setGroups(DetectGroup.BLACKDUCK_SERVER, DetectGroup.BLACKDUCK, DetectGroup.OFFLINE, DetectGroup.DEFAULT) .build(); @@ -166,8 +166,8 @@ private DetectProperties() { public static final NullableStringProperty BLACKDUCK_URL = NullableStringProperty.newBuilder("blackduck.url") - .setInfo("Black Duck URL", DetectPropertyFromVersion.VERSION_4_2_0) - .setHelp("URL of the Black Duck server.") + .setInfo("Black Duck SCA URL", DetectPropertyFromVersion.VERSION_4_2_0) + .setHelp("URL of the Black Duck SCA server.") .setExample("https://blackduck.mydomain.com") .setGroups(DetectGroup.BLACKDUCK_SERVER, DetectGroup.BLACKDUCK, DetectGroup.DEFAULT) .build(); @@ -388,7 +388,7 @@ private DetectProperties() { NullableStringProperty.newBuilder("detect.blackduck.signature.scanner.arguments") .setInfo("Signature Scanner Arguments", DetectPropertyFromVersion.VERSION_4_2_0) .setHelp( - "A space-separated list of additional arguments to use when running the Black Duck signature scanner. Key-value pairs specified as arguments will replace the same entries specifed elswhere. Available signature scanner properties can be determined by specifying '--help' when executing the signature scanner jar file from the command line.", + "A space-separated list of additional arguments to use when running the Black Duck SCA signature scanner. Key-value pairs specified as arguments will replace the same entries specifed elswhere. Available signature scanner properties can be determined by specifying '--help' when executing the signature scanner jar file from the command line.", "Example usage: Running in bash on Linux and you want signature scanner to read a list of directories to exclude from the scan (using the signature scanner '--exclude-from' option). Configure signature scanner to read excluded directories from a file named excludes.txt in the current working directory with: --detect.blackduck.signature.scanner.arguments='--exclude-from ./excludes.txt'" ) .setGroups(DetectGroup.SIGNATURE_SCANNER, DetectGroup.GLOBAL) @@ -429,7 +429,7 @@ private DetectProperties() { public static final BooleanProperty DETECT_BLACKDUCK_SIGNATURE_SCANNER_COPYRIGHT_SEARCH = BooleanProperty.newBuilder("detect.blackduck.signature.scanner.copyright.search", false) .setInfo("Signature Scanner Copyright Search", DetectPropertyFromVersion.VERSION_6_4_0) - .setHelp("When set to true, user will be able to scan and discover copyright names in Black Duck. Corresponding Signature Scanner CLI Argument: --copyright-search.") + .setHelp("When set to true, user will be able to scan and discover copyright names in Black Duck SCA. Corresponding Signature Scanner CLI Argument: --copyright-search.") .setGroups(DetectGroup.SIGNATURE_SCANNER) .build(); @@ -444,7 +444,7 @@ private DetectProperties() { BooleanProperty.newBuilder("detect.blackduck.signature.scanner.dry.run", false) .setInfo("Signature Scanner Dry Run", DetectPropertyFromVersion.VERSION_4_2_0) .setHelp( - "If set to true, the signature scanner results are not uploaded to Black Duck, and the scanner results are written to disk via the Signature Scanner CLI argument: --dryRunWriteDir.") + "If set to true, the signature scanner results are not uploaded to Black Duck SCA, and the scanner results are written to disk via the Signature Scanner CLI argument: --dryRunWriteDir.") .setGroups(DetectGroup.SIGNATURE_SCANNER, DetectGroup.GLOBAL) .build(); @@ -464,7 +464,7 @@ private DetectProperties() { public static final BooleanProperty DETECT_BLACKDUCK_SIGNATURE_SCANNER_LICENSE_SEARCH = BooleanProperty.newBuilder("detect.blackduck.signature.scanner.license.search", false) .setInfo("Signature Scanner License Search", DetectPropertyFromVersion.VERSION_6_2_0) - .setHelp("When set to true, user will be able to scan and discover license names in Black Duck. Corresponding Signature Scanner CLI Argument: --license-search.") + .setHelp("When set to true, user will be able to scan and discover license names in Black Duck SCA. Corresponding Signature Scanner CLI Argument: --license-search.") .setGroups(DetectGroup.SIGNATURE_SCANNER) .build(); @@ -524,7 +524,7 @@ private DetectProperties() { BooleanProperty.newBuilder("detect.blackduck.signature.scanner.upload.source.mode", false) .setInfo("Upload source mode", DetectPropertyFromVersion.VERSION_5_4_0) .setHelp( - "If set to true, the signature scanner will, if supported by your Black Duck version, upload source code to Black Duck. Corresponding Signature Scanner CLI Argument: --upload-source.") + "If set to true, the signature scanner will, if supported by your Black Duck SCA version, upload source code to Black Duck SCA. Corresponding Signature Scanner CLI Argument: --upload-source.") .setGroups(DetectGroup.SIGNATURE_SCANNER, DetectGroup.GLOBAL, DetectGroup.SOURCE_SCAN) .build(); @@ -539,7 +539,7 @@ private DetectProperties() { NullableStringProperty.newBuilder("detect.clone.project.version.name") .setInfo("Clone Project Version Name", DetectPropertyFromVersion.VERSION_4_2_0) .setHelp( - "The name of the project version to clone this project version from. Respects the given Clone Categories in detect.project.clone.categories or as set on the Black Duck server.") + "The name of the project version to clone this project version from. Respects the given Clone Categories in detect.project.clone.categories or as set on the Black Duck SCA.") .setGroups(DetectGroup.PROJECT, DetectGroup.GLOBAL, DetectGroup.PROJECT_SETTING) .setCategory(DetectCategory.Advanced) .build(); @@ -680,8 +680,8 @@ private DetectProperties() { BooleanProperty.newBuilder("detect.ignore.connection.failures", false) .setInfo("Detect Ignore Connection Failures", DetectPropertyFromVersion.VERSION_5_3_0) .setHelp( - "If true, Detect will ignore any products (eg. Black Duck) that it cannot connect to.", - "If true, when Detect attempts to boot a product (eg. Black Duck) it will also check if it can communicate with it - if it cannot, it will not run the product." + "If true, Detect will ignore any products (eg. Black Duck SCA) that it cannot connect to.", + "If true, when Detect attempts to boot a product (eg. Black Duck SCA) it will also check if it can communicate with it - if it cannot, it will not run the product." ) .setGroups(DetectGroup.GENERAL, DetectGroup.BLACKDUCK_SERVER) .setCategory(DetectCategory.Advanced) @@ -807,7 +807,7 @@ private DetectProperties() { BooleanProperty.newBuilder("detect.force.success.on.skip", false) .setInfo("Force Success On Skip", DetectPropertyFromVersion.VERSION_7_12_1) .setHelp( - "If true, Detect will always exit with code 0 when a scan of any type is skipped. Typically this happens when the Black Duck minimum scan interval timer has not been met.") + "If true, Detect will always exit with code 0 when a scan of any type is skipped. Typically this happens when the Black Duck SCA minimum scan interval timer has not been met.") .setGroups(DetectGroup.GENERAL, DetectGroup.GLOBAL) .setCategory(DetectCategory.Advanced) .build(); @@ -991,7 +991,7 @@ private DetectProperties() { BooleanProperty.newBuilder("detect.impact.analysis.enabled", false) .setInfo("Vulnerability Impact Analysis Enabled", DetectPropertyFromVersion.VERSION_6_5_0) .setHelp( - "If set to true, Detect will attempt to look for *.class files and generate a Vulnerability Impact Analysis Report for upload to Black Duck.") + "If set to true, Detect will attempt to look for *.class files and generate a Vulnerability Impact Analysis Report for upload to Black Duck SCA.") .setGroups(DetectGroup.IMPACT_ANALYSIS, DetectGroup.GLOBAL, DetectGroup.SOURCE_SCAN) .build(); @@ -1150,7 +1150,7 @@ private DetectProperties() { public static final BooleanProperty DETECT_NOTICES_REPORT = BooleanProperty.newBuilder("detect.notices.report", false) .setInfo("Generate Notices Report", DetectPropertyFromVersion.VERSION_3_0_0) - .setHelp("When set to true, a Black Duck notices report in text form will be created in your source directory.") + .setHelp("When set to true, a Black Duck SCA notices report in text form will be created in your source directory.") .setGroups(DetectGroup.REPORT, DetectGroup.GLOBAL) .build(); @@ -1426,7 +1426,7 @@ private DetectProperties() { public static final NullableStringProperty DETECT_PROJECT_GROUP_NAME = NullableStringProperty.newBuilder("detect.project.group.name") .setInfo("Project Group Name", DetectPropertyFromVersion.VERSION_7_8_0) - .setHelp("Sets the 'Project Group' to assign the project to. Must match exactly to an existing project group on Black Duck.") + .setHelp("Sets the 'Project Group' to assign the project to. Must match exactly to an existing project group on Black Duck SCA.") .setGroups(DetectGroup.PROJECT, DetectGroup.PROJECT_SETTING) .setCategory(DetectCategory.Advanced) .build(); @@ -1459,7 +1459,7 @@ private DetectProperties() { AllNoneEnumListProperty.newBuilder("detect.project.clone.categories", AllNoneEnum.ALL, ProjectCloneCategoriesType.class) .setInfo("Clone Project Categories", DetectPropertyFromVersion.VERSION_4_2_0) .setHelp( - "The value of this property is used to set the 'Cloning' settings on created Black Duck projects. If property detect.project.version.update is set to true, the value of this property is used to set the 'Cloning' settings on updated Black Duck projects.") + "The value of this property is used to set the 'Cloning' settings on created Black Duck SCA projects. If property detect.project.version.update is set to true, the value of this property is used to set the 'Cloning' settings on updated Black Duck SCA projects.") .setGroups(DetectGroup.PROJECT, DetectGroup.PROJECT_SETTING) .setCategory(DetectCategory.Advanced) .build(); @@ -1521,7 +1521,7 @@ private DetectProperties() { .setInfo("Allow Project Level Adjustments", DetectPropertyFromVersion.VERSION_3_0_0) .setHelp( "If set, created projects will be created with the value of this property. For updates, see detect.project.version.update.", - "Corresponds to the 'Always maintain component adjustments to all versions of this project' checkbox under 'Component Adjustments' on the Black Duck Project settings page." + "Corresponds to the 'Always maintain component adjustments to all versions of this project' checkbox under 'Component Adjustments' on the Black Duck SCA Project settings page." ) .setGroups(DetectGroup.PROJECT, DetectGroup.PROJECT_SETTING, DetectGroup.GLOBAL) .setCategory(DetectCategory.Advanced) @@ -1531,7 +1531,7 @@ private DetectProperties() { NullableStringProperty.newBuilder("detect.project.name") .setInfo("Project Name", DetectPropertyFromVersion.VERSION_3_0_0) .setHelp( - "An override for the name to use for the Black Duck project. If not supplied, Detect will attempt to use the tools to figure out a reasonable project name. If that fails, the final part of the directory path where the inspection is taking place will be used.") + "An override for the name to use for the Black Duck SCA project. If not supplied, Detect will attempt to use the tools to figure out a reasonable project name. If that fails, the final part of the directory path where the inspection is taking place will be used.") .setGroups(DetectGroup.PROJECT, DetectGroup.PROJECT_SETTING, DetectGroup.RAPID_SCAN) .build(); @@ -1539,7 +1539,7 @@ private DetectProperties() { NullableStringProperty.newBuilder("detect.parent.project.name") .setInfo("Parent Project Name", DetectPropertyFromVersion.VERSION_3_0_0) .setHelp( - "When a parent project and version name are specified, the created detect project will be added as a component to the specified parent project version. The specified parent project and parent project version must exist on Black Duck.") + "When a parent project and version name are specified, the created detect project will be added as a component to the specified parent project version. The specified parent project and parent project version must exist on Black Duck SCA.") .setGroups(DetectGroup.PROJECT, DetectGroup.PROJECT_SETTING) .setCategory(DetectCategory.Advanced) .build(); @@ -1548,7 +1548,7 @@ private DetectProperties() { NullableStringProperty.newBuilder("detect.parent.project.version.name") .setInfo("Parent Project Version Name", DetectPropertyFromVersion.VERSION_3_0_0) .setHelp( - "When a parent project and version name are specified, the created detect project will be added as a component to the specified parent project version. The specified parent project and parent project version must exist on Black Duck.") + "When a parent project and version name are specified, the created detect project will be added as a component to the specified parent project version. The specified parent project and parent project version must exist on Black Duck SCA.") .setGroups(DetectGroup.PROJECT, DetectGroup.PROJECT_SETTING) .setCategory(DetectCategory.Advanced) .build(); @@ -1556,7 +1556,7 @@ private DetectProperties() { public static final NullableIntegerProperty DETECT_PROJECT_TIER = NullableIntegerProperty.newBuilder("detect.project.tier") .setInfo("Project Tier", DetectPropertyFromVersion.VERSION_3_1_0) - .setHelp("If a Black Duck project tier is specified, your project will be created with this tier. For updates, see detect.project.version.update.") + .setHelp("If a Black Duck SCA project tier is specified, your project will be created with this tier. For updates, see detect.project.version.update.") .setGroups(DetectGroup.PROJECT, DetectGroup.PROJECT_SETTING) .build(); @@ -1583,7 +1583,7 @@ private DetectProperties() { NullableStringProperty.newBuilder("detect.project.version.name") .setInfo("Version Name", DetectPropertyFromVersion.VERSION_3_0_0) .setHelp( - "An override for the version to use for the Black Duck project. If not supplied, Detect will attempt to use the tools to figure out a reasonable version name. If that fails, the current date will be used.") + "An override for the version to use for the Black Duck SCA project. If not supplied, Detect will attempt to use the tools to figure out a reasonable version name. If that fails, the current date will be used.") .setGroups(DetectGroup.PROJECT, DetectGroup.PROJECT_SETTING, DetectGroup.RAPID_SCAN) .build(); @@ -1612,7 +1612,7 @@ private DetectProperties() { BooleanProperty.newBuilder("detect.project.version.update", false) .setInfo("Update Project Version", DetectPropertyFromVersion.VERSION_4_0_0) .setHelp( - "If set to true, Detect will update the Black Duck project and project version according to configured project and project version properties. (By default, these properties are only set on created projects / project versions.)", + "If set to true, Detect will update the Black Duck SCA project and project version according to configured project and project version properties. (By default, these properties are only set on created projects / project versions.)", "When set to true, the following properties will be updated on the Project: description (detect.project.description), tier (detect.project.tier), and project level adjustments (detect.project.level.adjustments). " + "The following properties will also be updated on the project version: notes (detect.project.version.notes), phase (detect.project.version.phase), distribution (detect.project.version.distribution), nickname (detect.project.version.nickname), license (detect.project.version.license)." ) @@ -1655,14 +1655,14 @@ private DetectProperties() { public static final BooleanProperty DETECT_RISK_REPORT_PDF = BooleanProperty.newBuilder("detect.risk.report.pdf", false) .setInfo("Generate Risk Report (PDF)", DetectPropertyFromVersion.VERSION_3_0_0) - .setHelp("When set to true, a Black Duck risk report in PDF form will be created.") + .setHelp("When set to true, a Black Duck SCA risk report in PDF form will be created.") .setGroups(DetectGroup.REPORT, DetectGroup.GLOBAL, DetectGroup.REPORT_SETTING) .build(); public static final BooleanProperty DETECT_RISK_REPORT_JSON = BooleanProperty.newBuilder("detect.risk.report.json", false) .setInfo("Generate Risk Report (JSON)", DetectPropertyFromVersion.VERSION_10_6_0) - .setHelp("When set to true, a Black Duck risk report in JSON form will be created.") + .setHelp("When set to true, a Black Duck SCA risk report in JSON form will be created.") .setGroups(DetectGroup.REPORT, DetectGroup.GLOBAL, DetectGroup.REPORT_SETTING) .build(); @@ -1767,8 +1767,8 @@ private DetectProperties() { public static final BooleanProperty DETECT_TEST_CONNECTION = BooleanProperty.newBuilder("detect.test.connection", false) - .setInfo("Test Connection to Black Duck", DetectPropertyFromVersion.VERSION_3_0_0) - .setHelp("Test the connection to Black Duck with the current configuration.") + .setInfo("Test Connection to Black Duck SCA", DetectPropertyFromVersion.VERSION_3_0_0) + .setHelp("Test the connection to Black Duck SCA with the current configuration.") .setGroups(DetectGroup.BLACKDUCK_SERVER, DetectGroup.GLOBAL) .build(); @@ -1891,9 +1891,9 @@ private DetectProperties() { "Detect logging uses Spring Boot logging, which uses Logback (https://logback.qos.ch). " + "The format of this property name is logging.level.{package}[.{class}]. " + "The property name shown above specifies package com.blackduck.integration because that is the name of Detect's top-level package. " + - "Changing the logging level for that package changes the logging level for all Detect code, as well as Black Duck integration libraries that Detect uses. " + - "Non-Black Duck libraries that Detect uses are not affected. " + - "However, you can use this property to set the logging level for some of the non-Black Duck libraries that Detect uses by using the appropriate package name. " + + "Changing the logging level for that package changes the logging level for all Detect code, as well as Black Duck SCA integration libraries that Detect uses. " + + "Non-Black Duck SCA libraries that Detect uses are not affected. " + + "However, you can use this property to set the logging level for some of the non-Black Duck SCA libraries that Detect uses by using the appropriate package name. " + "For example, logging.level.org.apache.http=TRACE sets the logging level to TRACE for the Apache HTTP client library. " + "

" + "For log message format, a default value of %d{yyyy-MM-dd HH:mm:ss z} ${LOG_LEVEL_PATTERN:%-6p}[%thread] %clr(---){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:%wEx} is used. " @@ -1908,7 +1908,7 @@ private DetectProperties() { public static final BooleanProperty DETECT_WAIT_FOR_RESULTS = BooleanProperty.newBuilder("detect.wait.for.results", false) .setInfo("Wait For Results", DetectPropertyFromVersion.VERSION_5_5_0) - .setHelp("If set to true, Detect will wait for Black Duck products until results are available or the detect.timeout is exceeded.") + .setHelp("If set to true, Detect will wait for Black Duck SCA products until results are available or the detect.timeout is exceeded.") .setGroups(DetectGroup.GENERAL, DetectGroup.GLOBAL) .build(); @@ -1924,8 +1924,8 @@ private DetectProperties() { EnumProperty.newBuilder("detect.blackduck.scan.mode", BlackduckScanMode.INTELLIGENT, BlackduckScanMode.class) .setInfo("Detect Scan Mode", DetectPropertyFromVersion.VERSION_6_9_0) .setHelp( - "Set the Black Duck scanning mode of Detect.", - "Set the scanning mode to control how Detect will send data to Black Duck. RAPID will not persist the results and disables select Detect functionality for faster results. INTELLIGENT, referred to as 'Full' scan mode in Black Duck, persists the results and permits all features of Detect." + "Set the Black Duck SCA scanning mode of Detect.", + "Set the scanning mode to control how Detect will send data to Black Duck SCA. RAPID will not persist the results and disables select Detect functionality for faster results. INTELLIGENT, referred to as 'Full' scan mode in Black Duck SCA, persists the results and permits all features of Detect." ) .setGroups(DetectGroup.BLACKDUCK_SERVER, DetectGroup.BLACKDUCK, DetectGroup.RAPID_SCAN) .setCategory(DetectCategory.Advanced) @@ -1935,8 +1935,8 @@ private DetectProperties() { BooleanProperty.newBuilder("detect.blackduck.correlated.scanning.enabled", false) .setInfo("Correlated Scanning Enabled", DetectPropertyFromVersion.VERSION_10_0_0) .setHelp( - "When enabled, Detect activates the Black Duck correlated scanning capability to enhance match accuracy.", - "The correlated scanning capability must be present and enabled in your Black Duck server before you enable the correlated scanning feature in Detect." + "When enabled, Detect activates the Black Duck SCA correlated scanning capability to enhance match accuracy.", + "The correlated scanning capability must be present and enabled in your Black Duck SCA server before you enable the correlated scanning feature in Detect." ) .setGroups(DetectGroup.GENERAL, DetectGroup.GLOBAL) .build(); diff --git a/src/main/java/com/blackduck/integration/detect/configuration/connection/BlackDuckConfigFactory.java b/src/main/java/com/blackduck/integration/detect/configuration/connection/BlackDuckConfigFactory.java index b4a7c4b699..aa339e7583 100644 --- a/src/main/java/com/blackduck/integration/detect/configuration/connection/BlackDuckConfigFactory.java +++ b/src/main/java/com/blackduck/integration/detect/configuration/connection/BlackDuckConfigFactory.java @@ -51,7 +51,7 @@ public BlackDuckServerConfig createServerConfig(IntLogger intLogger) throws Dete try { return blackDuckServerConfigBuilder.build(); } catch (IllegalArgumentException e) { - throw new DetectUserFriendlyException("Failed to configure Black Duck server connection: " + e.getMessage(), e, ExitCodeType.FAILURE_CONFIGURATION); + throw new DetectUserFriendlyException("Failed to configure Black Duck SCA server connection: " + e.getMessage(), e, ExitCodeType.FAILURE_CONFIGURATION); } } } diff --git a/src/main/java/com/blackduck/integration/detect/configuration/enumeration/ExitCodeType.java b/src/main/java/com/blackduck/integration/detect/configuration/enumeration/ExitCodeType.java index cab2fdc150..de0451330c 100644 --- a/src/main/java/com/blackduck/integration/detect/configuration/enumeration/ExitCodeType.java +++ b/src/main/java/com/blackduck/integration/detect/configuration/enumeration/ExitCodeType.java @@ -2,8 +2,8 @@ public enum ExitCodeType { SUCCESS(0, "Detect exited successfully."), - FAILURE_BLACKDUCK_CONNECTIVITY(1, "Detect was unable to connect to Black Duck. Check your configuration and connection."), - FAILURE_TIMEOUT(2, "Detect was unable to wait for actions to be completed on Black Duck. Check your Black Duck server or increase your timeout."), + FAILURE_BLACKDUCK_CONNECTIVITY(1, "Detect was unable to connect to Black Duck SCA. Check your configuration and connection."), + FAILURE_TIMEOUT(2, "Detect was unable to wait for actions to be completed on Black Duck SCA. Check your Black Duck SCA server or increase your timeout."), FAILURE_POLICY_VIOLATION(3, "Detect found policy violations."), FAILURE_PROXY_CONNECTIVITY(4, "Detect was unable to use the configured proxy. Check your configuration and connection."), FAILURE_DETECTOR(5, "Detect had one or more detector failures while extracting dependencies. Check that all projects build and your environment is configured correctly."), @@ -12,11 +12,11 @@ public enum ExitCodeType { FAILURE_DETECTOR_REQUIRED(9, "Detect did not run all of the required detectors. Fix detector issues or disable required detectors."), FAILURE_BLACKDUCK_VERSION_NOT_SUPPORTED( 10, - "Detect's configuration requires a Black Duck capability that is not supported by your version of Black Duck. Ensure that your Black Duck version is compatible with this version of Detect." + "Detect's configuration requires a Black Duck SCA capability that is not supported by your version of Black Duck SCA. Ensure that your Black Duck SCA version is compatible with this version of Detect." ), FAILURE_BLACKDUCK_FEATURE_ERROR( 11, - "Detect encountered an error while trying to perform an operation on Black Duck SCA. Ensure that your Black Duck SCA version is compatible with this version of Detect, your Black Duck user account has the required roles, and the project version exists in Black Duck when using BOM_COMPARE mode in a rapid scan." + "Detect encountered an error while trying to perform an operation on Black Duck SCA. Ensure that your Black Duck SCA version is compatible with this version of Detect, your Black Duck SCA user account has the required roles, and the project version exists in Black Duck SCA when using BOM_COMPARE mode in a rapid scan." ), FAILURE_MINIMUM_INTERVAL_NOT_MET(13, "Detect did not wait the minimum required scan interval."), FAILURE_IAC( @@ -31,7 +31,7 @@ public enum ExitCodeType { FAILURE_BLACKDUCK_DUPLICATE_PROJECT_ERROR(21, "Project name already exists, unable to create project."), FAILURE_COMPONENT_LOCATION_ANALYSIS(25, "Component Location Analysis failed."), - FAILURE_BOM_PREPARATION(30, "Black Duck failed to prepare BOM for the scan."), + FAILURE_BOM_PREPARATION(30, "Black Duck SCA failed to prepare BOM for the scan."), FAILURE_GENERAL_ERROR(99, "Detect encountered a known error, details of the error are provided."), FAILURE_UNKNOWN_ERROR(100, "Detect encountered an unknown error."); diff --git a/src/main/java/com/blackduck/integration/detect/interactive/BlackDuckConnectionDecisionBranch.java b/src/main/java/com/blackduck/integration/detect/interactive/BlackDuckConnectionDecisionBranch.java index a7cd6db2c5..2395147f2f 100644 --- a/src/main/java/com/blackduck/integration/detect/interactive/BlackDuckConnectionDecisionBranch.java +++ b/src/main/java/com/blackduck/integration/detect/interactive/BlackDuckConnectionDecisionBranch.java @@ -19,8 +19,8 @@ import com.blackduck.integration.log.SilentIntLogger; public class BlackDuckConnectionDecisionBranch implements DecisionTree { - public static final String SHOULD_TEST_CONNECTION = "Would you like to test the Black Duck connection now?"; - public static final String SHOULD_RETRY_CONNECTION = "Would you like to retry entering Black Duck information?"; + public static final String SHOULD_TEST_CONNECTION = "Would you like to test the Black Duck SCA connection now?"; + public static final String SHOULD_RETRY_CONNECTION = "Would you like to retry entering Black Duck SCA information?"; private final DetectInfo detectInfo; private final List existingPropertySources; private final BlackDuckConnectivityChecker blackDuckConnectivityChecker; diff --git a/src/main/java/com/blackduck/integration/detect/interactive/BlackDuckServerDecisionBranch.java b/src/main/java/com/blackduck/integration/detect/interactive/BlackDuckServerDecisionBranch.java index 61118df79a..53a1aa0d6b 100644 --- a/src/main/java/com/blackduck/integration/detect/interactive/BlackDuckServerDecisionBranch.java +++ b/src/main/java/com/blackduck/integration/detect/interactive/BlackDuckServerDecisionBranch.java @@ -23,7 +23,7 @@ public class BlackDuckServerDecisionBranch implements DecisionTree { public static final String WHAT_IS_THE_NTLM_PROXY_DOMAIN = "What is the ntlm proxy domain?"; public static final String WHAT_IS_THE_NTLM_PROXY_WORKSTATION = "What is the ntlm proxy workstation?"; public static final String WOULD_YOU_LIKE_TO_AUTOMATICALLY_TRUST_CERTIFICATES = "Would you like to automatically trust certificates?"; - public static final String WHAT_IS_THE_BLACK_DUCK_SERVER_URL = "What is the Black Duck server url?"; + public static final String WHAT_IS_THE_BLACK_DUCK_SERVER_URL = "What is the Black Duck SCA server url?"; public static final String WARNING_PROXY_PASSWORD = "WARNING: If you choose to save the settings, this password will be stored in plain text. You can set this password as an environment variable " + BLACKDUCK_PROXY_PASSWORD.getKeyAsEnvironmentVariable() + "."; diff --git a/src/main/java/com/blackduck/integration/detect/interactive/InteractiveModeDecisionTree.java b/src/main/java/com/blackduck/integration/detect/interactive/InteractiveModeDecisionTree.java index 2c88a7d6d5..764c994dcd 100644 --- a/src/main/java/com/blackduck/integration/detect/interactive/InteractiveModeDecisionTree.java +++ b/src/main/java/com/blackduck/integration/detect/interactive/InteractiveModeDecisionTree.java @@ -19,7 +19,7 @@ public class InteractiveModeDecisionTree implements DecisionTree { public static final String SHOULD_SAVE_TO_APPLICATION_PROPERTIES = "Would you like to save these settings to an application.properties file?"; public static final String SHOULD_SAVE_TO_PROFILE = "Would you like save these settings to a profile?"; public static final String SET_PROFILE_NAME = "What is the profile name?"; - public static final String SHOULD_CONNECT_TO_BLACKDUCK = "Would you like to connect to a Black Duck server?"; + public static final String SHOULD_CONNECT_TO_BLACKDUCK = "Would you like to connect to a Black Duck SCA server?"; public static final String SHOULD_FORCE_BDIO_CREATION = "Would you like to mandate BDIO generation even if no code locations are identified?"; public static final String SHOULD_SET_PROJECT_NAME_VERSION = "Would you like to provide a project name and version to use?"; public static final String SET_PROJECT_NAME = "What is the project name?"; diff --git a/src/main/java/com/blackduck/integration/detect/interactive/SignatureScannerDecisionBranch.java b/src/main/java/com/blackduck/integration/detect/interactive/SignatureScannerDecisionBranch.java index f7837a51c3..711d62b05d 100644 --- a/src/main/java/com/blackduck/integration/detect/interactive/SignatureScannerDecisionBranch.java +++ b/src/main/java/com/blackduck/integration/detect/interactive/SignatureScannerDecisionBranch.java @@ -4,7 +4,7 @@ import static com.blackduck.integration.detect.configuration.DetectProperties.DETECT_BLACKDUCK_SIGNATURE_SCANNER_LOCAL_PATH; public class SignatureScannerDecisionBranch implements DecisionTree { - public static final String SHOULD_UPLOAD_TO_BLACK_DUCK = "Would you like to upload signature scan results to the Black Duck server?"; + public static final String SHOULD_UPLOAD_TO_BLACK_DUCK = "Would you like to upload signature scan results to the Black Duck SCA server?"; public static final String SHOULD_USE_CUSTOM_SCANNER = "Would you like to provide a custom signature scanner path?"; public static final String SET_SCANNER_OFFLINE_LOCAL_PATH = "What is the location of your offline signature scanner?"; private final boolean connectedToBlackDuck; diff --git a/src/main/java/com/blackduck/integration/detect/lifecycle/boot/decision/ProductDecider.java b/src/main/java/com/blackduck/integration/detect/lifecycle/boot/decision/ProductDecider.java index 6a18e7822d..feab222c2d 100644 --- a/src/main/java/com/blackduck/integration/detect/lifecycle/boot/decision/ProductDecider.java +++ b/src/main/java/com/blackduck/integration/detect/lifecycle/boot/decision/ProductDecider.java @@ -27,23 +27,23 @@ public BlackDuckDecision decideBlackDuck(BlackDuckConnectionDetails blackDuckCon Optional blackDuckUrl = blackDuckConnectionDetails.getBlackDuckUrl(); if(autonomousScanEnabled && blackduckUrlSpecified && !blackduckOfflineModeSpecified) { - logger.debug("Black Duck will run ONLINE: A Black Duck url was found."); + logger.debug("Black Duck SCA will run ONLINE: A Black Duck SCA url was found."); return BlackDuckDecision.runOnline(scanMode, hasSigScan); } else if (offline && (BlackduckScanMode.RAPID.equals(scanMode) || BlackduckScanMode.STATELESS.equals(scanMode))) { - logger.debug("Black Duck will NOT run: Rapid mode cannot be run offline."); + logger.debug("Black Duck SCA will NOT run: Rapid mode cannot be run offline."); return BlackDuckDecision.skip(); } else if (offline) { - logger.debug("Black Duck will run: Black Duck offline mode was set to true."); + logger.debug("Black Duck SCA will run: Black Duck SCA offline mode was set to true."); return BlackDuckDecision.runOffline(); } else if (blackDuckUrl.isPresent()) { - logger.debug("Black Duck will run ONLINE: A Black Duck url was found."); + logger.debug("Black Duck SCA will run ONLINE: A Black Duck SCA url was found."); return BlackDuckDecision.runOnline(scanMode, hasSigScan); } else { if(autonomousScanEnabled) { - logger.debug("Black Duck will run offline as determined by autonomous scan mode."); + logger.debug("Black Duck SCA will run offline as determined by autonomous scan mode."); return BlackDuckDecision.runOffline(); } - logger.debug("Black Duck will NOT run: The Black Duck url must be provided or offline mode must be set to true."); + logger.debug("Black Duck SCA will NOT run: The Black Duck SCA url must be provided or offline mode must be set to true."); return BlackDuckDecision.skip(); } } diff --git a/src/main/java/com/blackduck/integration/detect/lifecycle/boot/product/BlackDuckConnectivityChecker.java b/src/main/java/com/blackduck/integration/detect/lifecycle/boot/product/BlackDuckConnectivityChecker.java index 388939f5d2..ee3e128bd8 100644 --- a/src/main/java/com/blackduck/integration/detect/lifecycle/boot/product/BlackDuckConnectivityChecker.java +++ b/src/main/java/com/blackduck/integration/detect/lifecycle/boot/product/BlackDuckConnectivityChecker.java @@ -32,14 +32,14 @@ public class BlackDuckConnectivityChecker { public BlackDuckConnectivityResult determineConnectivity(BlackDuckServerConfig blackDuckServerConfig) throws DetectUserFriendlyException { - logger.debug("Detect will check communication with the Black Duck server."); + logger.debug("Detect will check communication with the Black Duck SCA server."); ConnectionResult connectionResult = blackDuckServerConfig.attemptConnection(new SilentIntLogger()); if (connectionResult.isFailure()) { blackDuckServerConfig.attemptConnection(new Slf4jIntLogger(logger)); //TODO: For the logs, when connection result returns the client, can drop this. - logger.error("Failed to connect to the Black Duck server"); - return BlackDuckConnectivityResult.failure(connectionResult.getFailureMessage().orElse("Could not reach the Black Duck server or the credentials were invalid.")); + logger.error("Failed to connect to the Black Duck SCA server"); + return BlackDuckConnectivityResult.failure(connectionResult.getFailureMessage().orElse("Could not reach the Black Duck SCA server or the credentials were invalid.")); } BlackDuckServicesFactory blackDuckServicesFactory = blackDuckServerConfig.createBlackDuckServicesFactory(new Slf4jIntLogger(logger)); @@ -56,7 +56,7 @@ public BlackDuckConnectivityResult determineConnectivity(BlackDuckServerConfig b BlackDuckServerData blackDuckServerData = blackDuckRegistrationService.getBlackDuckServerData(isAdminOperationAllowed); if(blackDuckServerData != null) { version = blackDuckServerData.getVersion(); - logger.info("Successfully connected to Black Duck (version {})!", version); + logger.info("Successfully connected to Black Duck SCA (version {})!", version); } if (logger.isDebugEnabled()) { logger.debug("Connected as: " + userView.getUserName()); diff --git a/src/main/java/com/blackduck/integration/detect/lifecycle/boot/product/ProductBoot.java b/src/main/java/com/blackduck/integration/detect/lifecycle/boot/product/ProductBoot.java index 6585c2239a..72a9e6c5ca 100644 --- a/src/main/java/com/blackduck/integration/detect/lifecycle/boot/product/ProductBoot.java +++ b/src/main/java/com/blackduck/integration/detect/lifecycle/boot/product/ProductBoot.java @@ -54,7 +54,7 @@ public ProductBoot( public ProductRunData boot(BlackDuckDecision blackDuckDecision, DetectToolFilter detectToolFilter) throws DetectUserFriendlyException { if (!blackDuckDecision.shouldRun()) { throw new DetectUserFriendlyException( - "Your environment was not sufficiently configured to run Black Duck. See online help at: https://documentation.blackduck.com/bundle/detect/page/introduction.html", + "Your environment was not sufficiently configured to run Black Duck SCA. See online help at: https://documentation.blackduck.com/bundle/detect/page/introduction.html", ExitCodeType.FAILURE_CONFIGURATION ); @@ -95,7 +95,7 @@ private BlackDuckRunData getBlackDuckRunData( return BlackDuckRunData.offline(); } - logger.debug("Will boot Black Duck product."); + logger.debug("Will boot Black Duck SCA product."); BlackDuckServerConfig blackDuckServerConfig = productBootFactory.createBlackDuckServerConfig(); BlackDuckConnectivityResult blackDuckConnectivityResult = blackDuckConnectivityChecker.determineConnectivity(blackDuckServerConfig); @@ -115,9 +115,9 @@ private BlackDuckRunData getBlackDuckRunData( return createBlackDuckRunDataBasedOnPhoneHomeDecision(blackDuckDecision, blackDuckServicesFactory, blackDuckConnectivityResult, waitAtScanLevel); } else { if (productBootOptions.isIgnoreConnectionFailures()) { - logger.info(String.format("Failed to connect to Black Duck: %s", blackDuckConnectivityResult.getFailureReason())); + logger.info(String.format("Failed to connect to Black Duck SCA: %s", blackDuckConnectivityResult.getFailureReason())); logger.info(String.format( - "%s is set to 'true' so Detect will simply disable the Black Duck product.", + "%s is set to 'true' so Detect will simply disable the Black Duck SCA product.", DetectProperties.DETECT_IGNORE_CONNECTION_FAILURES.getName() )); return null; @@ -148,7 +148,7 @@ private BlackDuckRunData createBlackDuckRunDataBasedOnPhoneHomeDecision(BlackDuc logger.debug("Analytics credentials file syntax is invalid. Skipping phone home. Exception: " + e.getMessage()); } } else { - logger.debug("Skipping phone home due to Black Duck global settings."); + logger.debug("Skipping phone home due to Black Duck SCA global settings."); } return BlackDuckRunData.onlineNoPhoneHome(blackDuckDecision.scanMode(), blackDuckServicesFactory, blackDuckConnectivityResult, waitAtScanLevel); } @@ -168,7 +168,7 @@ private boolean shouldUsePhoneHome(AnalyticsConfigurationService analyticsConfig AnalyticsSetting analyticsSetting = analyticsConfigurationService.fetchAnalyticsSetting(apiDiscovery, blackDuckService); return analyticsSetting.isEnabled(); } catch (IntegrationException | IOException e) { - logger.trace("Failed to check analytics setting on Black Duck. Likely this Black Duck instance does not support it.", e); + logger.trace("Failed to check analytics setting on Black Duck SCA. Likely this Black Duck instance does not support it.", e); return true; // Skip phone home will be applied at the library level. } } diff --git a/src/main/java/com/blackduck/integration/detect/lifecycle/boot/product/version/BlackDuckVersionChecker.java b/src/main/java/com/blackduck/integration/detect/lifecycle/boot/product/version/BlackDuckVersionChecker.java index 4f5500e18e..a41a91c6df 100644 --- a/src/main/java/com/blackduck/integration/detect/lifecycle/boot/product/version/BlackDuckVersionChecker.java +++ b/src/main/java/com/blackduck/integration/detect/lifecycle/boot/product/version/BlackDuckVersionChecker.java @@ -26,13 +26,13 @@ public BlackDuckVersionChecker( public BlackDuckVersionCheckerResult check(String actualBlackDuckVersionString) { Optional actualBlackDuckVersion = parser.parse(actualBlackDuckVersionString); if (!actualBlackDuckVersion.isPresent()) { - logger.debug("Unable to parse Black Duck version string {}, so unable to perform version compatibility check", actualBlackDuckVersion); + logger.debug("Unable to parse Black Duck SCA version string {}, so unable to perform version compatibility check", actualBlackDuckVersion); return BlackDuckVersionCheckerResult.passed(); } for (BlackDuckMinimumVersionCheck blackDuckMinimumVersionCheck : blackDuckMinimumVersionChecks.get()) { if (blackDuckMinimumVersionCheck.getTest().test(blackDuckVersionSensitiveOptions) && !actualBlackDuckVersion.get() .isAtLeast(blackDuckMinimumVersionCheck.getMinimumBlackDuckVersion())) { - String msg = String.format("%s requires at least Black Duck version %s but the connected server is %s.", + String msg = String.format("%s requires at least Black Duck SCA version %s but the connected server is %s.", blackDuckMinimumVersionCheck.getDescription(), blackDuckMinimumVersionCheck.getMinimumBlackDuckVersion(), actualBlackDuckVersion.get() ); diff --git a/src/main/java/com/blackduck/integration/detect/lifecycle/boot/product/version/BlackDuckVersionCheckerResult.java b/src/main/java/com/blackduck/integration/detect/lifecycle/boot/product/version/BlackDuckVersionCheckerResult.java index 2683335bfe..d0815bcbec 100644 --- a/src/main/java/com/blackduck/integration/detect/lifecycle/boot/product/version/BlackDuckVersionCheckerResult.java +++ b/src/main/java/com/blackduck/integration/detect/lifecycle/boot/product/version/BlackDuckVersionCheckerResult.java @@ -5,7 +5,7 @@ public class BlackDuckVersionCheckerResult { private final String message; public static BlackDuckVersionCheckerResult passed() { - return new BlackDuckVersionCheckerResult(true, "Black Duck version check passed"); + return new BlackDuckVersionCheckerResult(true, "Black Duck SCA version check passed"); } public static BlackDuckVersionCheckerResult failed(String message) { diff --git a/src/main/java/com/blackduck/integration/detect/lifecycle/boot/product/version/BlackDuckVersionParser.java b/src/main/java/com/blackduck/integration/detect/lifecycle/boot/product/version/BlackDuckVersionParser.java index 7bcb31c429..c380b3a4e5 100644 --- a/src/main/java/com/blackduck/integration/detect/lifecycle/boot/product/version/BlackDuckVersionParser.java +++ b/src/main/java/com/blackduck/integration/detect/lifecycle/boot/product/version/BlackDuckVersionParser.java @@ -24,12 +24,12 @@ public Optional parse(String blackDuckVersionString) { int major_version_from_bd = Integer.parseInt(parts[0]); int minor_version_from_bd = Integer.parseInt(parts[1]); int patch_version_from_bd = Integer.parseInt(parts[2]); - logger.trace("Black Duck version parsed from version string {}: major: {}, minor: {}, patch: {}", + logger.trace("Black Duck SCA version parsed from version string {}: major: {}, minor: {}, patch: {}", blackDuckVersionString, major_version_from_bd, minor_version_from_bd, patch_version_from_bd ); return Optional.of(new BlackDuckVersion(major_version_from_bd, minor_version_from_bd, patch_version_from_bd)); } catch (Exception e) { - logger.warn("Unable to determine the Black Duck version from version string {}", blackDuckVersionString); + logger.warn("Unable to determine the Black Duck SCA version from version string {}", blackDuckVersionString); return Optional.empty(); } } diff --git a/src/main/java/com/blackduck/integration/detect/lifecycle/run/operation/OperationRunner.java b/src/main/java/com/blackduck/integration/detect/lifecycle/run/operation/OperationRunner.java index 63073f4a3e..a24c76774b 100644 --- a/src/main/java/com/blackduck/integration/detect/lifecycle/run/operation/OperationRunner.java +++ b/src/main/java/com/blackduck/integration/detect/lifecycle/run/operation/OperationRunner.java @@ -689,10 +689,10 @@ public void uploadBdioEntries(BlackDuckRunData blackDuckRunData, UUID bdScanId) try (Response response = blackDuckApiClient.execute(buildBlackDuckResponseRequest)) { if (response.isStatusCodeSuccess()) { - logger.debug("Sent FINISH chunk to Black Duck."); + logger.debug("Sent FINISH chunk to Black Duck SCA."); } else { - logger.trace("Sent FINISH chunk to Black Duck. Response code: " + response.getStatusCode() + " " + response.getStatusMessage()); - throw new IntegrationException("Sent FINISH chunk to Black Duck. Response code: " + response.getStatusCode() + " " + response.getStatusMessage()); + logger.trace("Sent FINISH chunk to Black Duck SCA. Response code: " + response.getStatusCode() + " " + response.getStatusMessage()); + throw new IntegrationException("Sent FINISH chunk to Black Duck SCA. Response code: " + response.getStatusCode() + " " + response.getStatusMessage()); } } } @@ -756,7 +756,7 @@ private boolean isBomCompareError(IntegrationRestException e, RapidCompareMode r } private String createBomCompareErrorMessage(String originalMessage) { - return originalMessage + " BOM_COMPARE mode requires the target project version to exist in Black Duck Hub. " + + return originalMessage + " BOM_COMPARE mode requires the target project version to exist in Black Duck SCA Hub. " + "Please ensure 'detect.project.version.name' matches an existing project version. " + "Consider running a full scan first if the version hasn't been uploaded yet."; } @@ -1125,7 +1125,7 @@ public Long calculateDetectTimeout() { } public ScanBatchRunner createScanBatchRunnerWithBlackDuck(BlackDuckRunData blackDuckRunData, File installDirectory) throws OperationException { - return auditLog.namedInternal("Create Scan Batch Runner with Black Duck", () -> { + return auditLog.namedInternal("Create Scan Batch Runner with Black Duck SCA", () -> { ExecutorService executorService = Executors.newFixedThreadPool(detectConfigurationFactory.createBlackDuckSignatureScannerOptions().getParallelProcessors()); IntEnvironmentVariables intEnvironmentVariables = IntEnvironmentVariables.includeSystemEnv(); Optional blackDuckVersion = blackDuckRunData.getBlackDuckServerVersion(); @@ -1330,7 +1330,7 @@ public void waitForCodeLocations(BlackDuckRunData blackDuckRunData, CodeLocation ); if (result.getStatus() == CodeLocationWaitResult.Status.PARTIAL) { throw new DetectUserFriendlyException( - result.getErrorMessage().orElse("Timed out waiting for code locations to finish on the Black Duck server."), + result.getErrorMessage().orElse("Timed out waiting for code locations to finish on the Black Duck SCA server."), ExitCodeType.FAILURE_TIMEOUT ); } @@ -1686,7 +1686,7 @@ public BomStatusScanView waitForBomCompletion(BlackDuckRunData blackDuckRunData, void checkBomStatusAndHandleFailure(BomStatusScanView bomStatusScanView) { BomStatusScanStatusType status = bomStatusScanView.getStatus(); if (status != BomStatusScanStatusType.SUCCESS) { - String message = "Black Duck failed to prepare BOM for the scan"; + String message = "Black Duck SCA failed to prepare BOM for the scan"; logger.error("BOM Scan Status: {} - {}.", status, message); exitCodePublisher.publishExitCode(ExitCodeType.FAILURE_BOM_PREPARATION); } diff --git a/src/main/java/com/blackduck/integration/detect/lifecycle/run/step/IacScanStepRunner.java b/src/main/java/com/blackduck/integration/detect/lifecycle/run/step/IacScanStepRunner.java index 62cdd286fb..f56ab34fe0 100644 --- a/src/main/java/com/blackduck/integration/detect/lifecycle/run/step/IacScanStepRunner.java +++ b/src/main/java/com/blackduck/integration/detect/lifecycle/run/step/IacScanStepRunner.java @@ -68,7 +68,7 @@ public IacScanCodeLocationData runIacScanOnline(String detectRunUuid, NameVersio public void runIacScanOffline() throws OperationException, IntegrationException { List iacScanTargets = operationRunner.calculateIacScanScanTargets(); File iacScanExe = operationRunner.calculateUserProvidedIacScanPath() - .orElseThrow(() -> new IntegrationException("Was not able to install or locate IacScan. Must either connect to a Black Duck or provide a path to a local IacScan.")); + .orElseThrow(() -> new IntegrationException("Was not able to install or locate IacScan. Must either connect to a Black Duck SCA or provide a path to a local IacScan.")); validateIacScan(iacScanExe); List iacScanReports = new LinkedList<>(); int count = 0; diff --git a/src/main/java/com/blackduck/integration/detect/lifecycle/run/step/IntelligentModeStepRunner.java b/src/main/java/com/blackduck/integration/detect/lifecycle/run/step/IntelligentModeStepRunner.java index 22211c7c66..2133cb3ee1 100644 --- a/src/main/java/com/blackduck/integration/detect/lifecycle/run/step/IntelligentModeStepRunner.java +++ b/src/main/java/com/blackduck/integration/detect/lifecycle/run/step/IntelligentModeStepRunner.java @@ -314,7 +314,7 @@ public void uploadBdio(BlackDuckRunData blackDuckRunData, BdioResult bdioResult, } public void uploadCorrelatedScanCounts(BlackDuckRunData blackDuckRunData, CodeLocationAccumulator codeLocationAccumulator, String detectRunUuid) throws OperationException { - logger.debug("Uploading correlated scan counts to Black Duck (correlation ID: {})", detectRunUuid); + logger.debug("Uploading correlated scan counts to Black Duck SCA (correlation ID: {})", detectRunUuid); ScanCountsPayload scanCountsPayload = scanCountsPayloadCreator.create(codeLocationAccumulator.getWaitableCodeLocations(), codeLocationAccumulator.getAdditionalCountsByTool()); if (scanCountsPayload.isValid()) { diff --git a/src/main/java/com/blackduck/integration/detect/lifecycle/run/step/utility/OperationWrapper.java b/src/main/java/com/blackduck/integration/detect/lifecycle/run/step/utility/OperationWrapper.java index c762724c80..7b39599d60 100644 --- a/src/main/java/com/blackduck/integration/detect/lifecycle/run/step/utility/OperationWrapper.java +++ b/src/main/java/com/blackduck/integration/detect/lifecycle/run/step/utility/OperationWrapper.java @@ -54,7 +54,7 @@ public T wrapped(Operation operation, OperationSupplier supplier, Runnabl errorConsumer.accept(e); throw e; } catch (BlackDuckApiException e) { - String contentDetails = "Black Duck response body: " + e.getOriginalIntegrationRestException().getHttpResponseContent(); + String contentDetails = "Black Duck SCA response body: " + e.getOriginalIntegrationRestException().getHttpResponseContent(); if (StringUtils.isNotBlank(contentDetails)) { if (contentDetails.length() > MESSAGE_LENGTH_LIMIT) { contentDetails = contentDetails.substring(0, MESSAGE_LENGTH_LIMIT) + "..."; diff --git a/src/main/java/com/blackduck/integration/detect/lifecycle/shutdown/ExceptionUtility.java b/src/main/java/com/blackduck/integration/detect/lifecycle/shutdown/ExceptionUtility.java index 5ec7941c63..6c42d670c7 100644 --- a/src/main/java/com/blackduck/integration/detect/lifecycle/shutdown/ExceptionUtility.java +++ b/src/main/java/com/blackduck/integration/detect/lifecycle/shutdown/ExceptionUtility.java @@ -17,7 +17,7 @@ public class ExceptionUtility { private final Logger logger = LoggerFactory.getLogger(this.getClass()); private static final String BLACKDUCK_ERROR_MESSAGE = "An unrecoverable error occurred which may be due to your environment and/or configuration. Please double check the Detect documentation: https://documentation.blackduck.com/bundle/integrations-detect/page/introduction.html"; - private static final String BLACKDUCK_TIMEOUT_ERROR_MESSAGE = "The Black Duck server did not respond within the timeout period."; + private static final String BLACKDUCK_TIMEOUT_ERROR_MESSAGE = "The Black Duck SCA server did not respond within the timeout period."; public void logException(Exception e) { if (e instanceof OperationException) { diff --git a/src/main/java/com/blackduck/integration/detect/tool/binaryscanner/BinaryUploadOperation.java b/src/main/java/com/blackduck/integration/detect/tool/binaryscanner/BinaryUploadOperation.java index 0cda2995ff..12a82464a9 100644 --- a/src/main/java/com/blackduck/integration/detect/tool/binaryscanner/BinaryUploadOperation.java +++ b/src/main/java/com/blackduck/integration/detect/tool/binaryscanner/BinaryUploadOperation.java @@ -160,7 +160,7 @@ private void throwExceptionForError(BinaryScanBatchOutput binaryScanBatchOutput) // cleanResponse() attempts to produce something reasonable to log in either case String cleanedBlackDuckResponse = cleanResponse(binaryScanOutput.getResponse()); String uploadErrorMessage = String.format( - "Error when uploading binary scan: %s (Black Duck response: %s)", + "Error when uploading binary scan: %s (Black Duck SCA response: %s)", binaryScanOutput.getErrorMessage().orElse(binaryScanOutput.getStatusMessage()), cleanedBlackDuckResponse ); diff --git a/src/main/java/com/blackduck/integration/detect/tool/impactanalysis/service/ImpactAnalysisBatchOutput.java b/src/main/java/com/blackduck/integration/detect/tool/impactanalysis/service/ImpactAnalysisBatchOutput.java index 0d7f1700d2..423e641b3d 100644 --- a/src/main/java/com/blackduck/integration/detect/tool/impactanalysis/service/ImpactAnalysisBatchOutput.java +++ b/src/main/java/com/blackduck/integration/detect/tool/impactanalysis/service/ImpactAnalysisBatchOutput.java @@ -15,11 +15,11 @@ public ImpactAnalysisBatchOutput(List outputs) { public void throwExceptionForError(Logger logger) throws BlackDuckIntegrationException { for (ImpactAnalysisOutput impactAnalysisOutput : this) { if (impactAnalysisOutput.getStatusCode() == 404) { - logger.error("Impact analysis upload failed with 404. Your version of Black Duck may not support Vulnerability Impact Analysis."); + logger.error("Impact analysis upload failed with 404. Your version of Black Duck SCA may not support Vulnerability Impact Analysis."); } else if (impactAnalysisOutput.getStatusCode() < 200 || impactAnalysisOutput.getStatusCode() >= 300) { logger.error(String.format("Unexpected status code: %d", impactAnalysisOutput.getStatusCode())); throw new BlackDuckIntegrationException( - String.format("Unexpected status code when uploading impact analysis: %d, %s [Black Duck response content: %s]", + String.format("Unexpected status code when uploading impact analysis: %d, %s [Black Duck SCA response content: %s]", impactAnalysisOutput.getStatusCode(), impactAnalysisOutput.getStatusMessage(), impactAnalysisOutput.getContentString() diff --git a/src/main/java/com/blackduck/integration/detect/tool/impactanalysis/service/ImpactAnalysisCallable.java b/src/main/java/com/blackduck/integration/detect/tool/impactanalysis/service/ImpactAnalysisCallable.java index 6d899632a4..c3b67ca096 100644 --- a/src/main/java/com/blackduck/integration/detect/tool/impactanalysis/service/ImpactAnalysisCallable.java +++ b/src/main/java/com/blackduck/integration/detect/tool/impactanalysis/service/ImpactAnalysisCallable.java @@ -43,7 +43,7 @@ public ImpactAnalysisOutput call() { } } catch (BlackDuckApiException apiException) { String errorMessage = String.format( - "Failed to upload impact analysis file: %s; Black Duck response: %s [Black Duck error code: %s]", + "Failed to upload impact analysis file: %s; Black Duck SCA response: %s [Black Duck SCA error code: %s]", impactAnalysis.getImpactAnalysisPath().toAbsolutePath(), apiException.getMessage(), apiException.getBlackDuckErrorCode() diff --git a/src/main/java/com/blackduck/integration/detect/tool/signaturescanner/operation/CreateScanBatchOperation.java b/src/main/java/com/blackduck/integration/detect/tool/signaturescanner/operation/CreateScanBatchOperation.java index 1e6a798da7..1997080aab 100644 --- a/src/main/java/com/blackduck/integration/detect/tool/signaturescanner/operation/CreateScanBatchOperation.java +++ b/src/main/java/com/blackduck/integration/detect/tool/signaturescanner/operation/CreateScanBatchOperation.java @@ -148,7 +148,7 @@ private void attemptToSetCsvArchive(ScanBatchBuilder scanJobBuilder, BlackDuckRu if (blackDuckRunData != null && blackDuckRunData.getBlackDuckServerVersion().isPresent() && !blackDuckRunData.getBlackDuckServerVersion().get().isAtLeast(MIN_CSV_ARCHIVE_VERSION)) { - logger.error("The associated Black Duck server version is not compatible with the CSV archive feature."); + logger.error("The associated Black Duck SCA server version is not compatible with the CSV archive feature."); } scanJobBuilder.csvArchive(signatureScannerOptions.getCsvArchive()); } diff --git a/src/main/java/com/blackduck/integration/detect/tool/signaturescanner/operation/CreateScanBatchRunnerWithBlackDuck.java b/src/main/java/com/blackduck/integration/detect/tool/signaturescanner/operation/CreateScanBatchRunnerWithBlackDuck.java index d34f4557e3..ad90897606 100644 --- a/src/main/java/com/blackduck/integration/detect/tool/signaturescanner/operation/CreateScanBatchRunnerWithBlackDuck.java +++ b/src/main/java/com/blackduck/integration/detect/tool/signaturescanner/operation/CreateScanBatchRunnerWithBlackDuck.java @@ -37,7 +37,7 @@ public CreateScanBatchRunnerWithBlackDuck(IntEnvironmentVariables intEnvironment } public ScanBatchRunner createScanBatchRunner(BlackDuckServerConfig blackDuckServerConfig, File installDirectory, Optional blackDuckVersion, String osArchitecture) throws BlackDuckIntegrationException { - logger.debug("Signature scanner will use the Black Duck server to download/update the scanner - this is the most likely situation."); + logger.debug("Signature scanner will use the Black Duck SCA server to download/update the scanner - this is the most likely situation."); SignatureScannerLogger slf4jIntLogger = new SignatureScannerLogger(logger); ScanPathsUtility scanPathsUtility = new ScanPathsUtility(slf4jIntLogger, intEnvironmentVariables, operatingSystemType); ScanCommandRunner scanCommandRunner = new ScanCommandRunner(slf4jIntLogger, intEnvironmentVariables, scanPathsUtility, executorService); diff --git a/src/main/java/com/blackduck/integration/detect/tool/signaturescanner/operation/PublishSignatureScanReports.java b/src/main/java/com/blackduck/integration/detect/tool/signaturescanner/operation/PublishSignatureScanReports.java index 02883abb40..5338cdbb6f 100644 --- a/src/main/java/com/blackduck/integration/detect/tool/signaturescanner/operation/PublishSignatureScanReports.java +++ b/src/main/java/com/blackduck/integration/detect/tool/signaturescanner/operation/PublishSignatureScanReports.java @@ -46,7 +46,7 @@ public void publishReports(List signatureScannerReports) .filter(SignatureScannerReport::isScassError) .findAny() .ifPresent(report -> { - logger.error("The Signature Scan failed when attempting to communicate with external resources. Check connectivity to SCASS IPs and Black Duck services."); + logger.error("The Signature Scan failed when attempting to communicate with external resources. Check connectivity to SCASS IPs and Black Duck SCA services."); exitCodePublisher.publishExitCode(ExitCodeType.FAILURE_SCAN); }); diff --git a/src/main/java/com/blackduck/integration/detect/workflow/blackduck/developer/RapidModeGenerateJsonOperation.java b/src/main/java/com/blackduck/integration/detect/workflow/blackduck/developer/RapidModeGenerateJsonOperation.java index 952a23c4fa..ca5a73bbb3 100644 --- a/src/main/java/com/blackduck/integration/detect/workflow/blackduck/developer/RapidModeGenerateJsonOperation.java +++ b/src/main/java/com/blackduck/integration/detect/workflow/blackduck/developer/RapidModeGenerateJsonOperation.java @@ -37,7 +37,7 @@ public File generateJsonFile(NameVersion projectNameVersion, List severitiesToFailP private Optional fetchPolicyStatusDescription(ProjectVersionView version) throws IntegrationException { return Bdo.of(projectBomService.getPolicyStatusForVersion(version)) - .peek(policyStatus -> logger.info(String.format("Overall Policy Status of project version as reported by Black Duck: %s", policyStatus.getOverallStatus().name()))) + .peek(policyStatus -> logger.info(String.format("Overall Policy Status of project version as reported by Black Duck SCA: %s", policyStatus.getOverallStatus().name()))) .map(PolicyStatusDescription::new) .toOptional(); } diff --git a/src/main/java/com/blackduck/integration/detect/workflow/blackduck/project/FindLicenseUrlOperation.java b/src/main/java/com/blackduck/integration/detect/workflow/blackduck/project/FindLicenseUrlOperation.java index c1d1c0fbc6..1612bb59c3 100644 --- a/src/main/java/com/blackduck/integration/detect/workflow/blackduck/project/FindLicenseUrlOperation.java +++ b/src/main/java/com/blackduck/integration/detect/workflow/blackduck/project/FindLicenseUrlOperation.java @@ -31,7 +31,7 @@ public String findLicenseUrl(String licenseName) throws DetectUserFriendlyExcept } else { List suggestedLicenses = licenseService.searchLicensesByName(licenseName); logger.error(String.format( - "Could not find url for license with name %s. License names are case sensitive, please verify the name of your license in Black Duck in the License Management section.", + "Could not find url for license with name %s. License names are case sensitive, please verify the name of your license in Black Duck SCA in the License Management section.", licenseName )); if (!suggestedLicenses.isEmpty()) { diff --git a/src/main/java/com/blackduck/integration/detect/workflow/blackduck/project/FindProjectGroupOperation.java b/src/main/java/com/blackduck/integration/detect/workflow/blackduck/project/FindProjectGroupOperation.java index e0e862f074..843cf4ede5 100644 --- a/src/main/java/com/blackduck/integration/detect/workflow/blackduck/project/FindProjectGroupOperation.java +++ b/src/main/java/com/blackduck/integration/detect/workflow/blackduck/project/FindProjectGroupOperation.java @@ -39,7 +39,7 @@ public HttpUrl findProjectGroup(String projectGroupName) throws IntegrationExcep List response = blackDuckApiClient.getAllResponses(requestMultiple); if (response.size() != 1) { throw new DetectUserFriendlyException( - "Project Group Name must have exactly 1 match on Black Duck, instead '" + projectGroupName + "' had " + response.size() + " matches.", + "Project Group Name must have exactly 1 match on Black Duck SCA, instead '" + projectGroupName + "' had " + response.size() + " matches.", ExitCodeType.FAILURE_BLACKDUCK_FEATURE_ERROR ); } diff --git a/src/main/java/com/blackduck/integration/detect/workflow/blackduck/report/pdf/RiskReportPdfWriter.java b/src/main/java/com/blackduck/integration/detect/workflow/blackduck/report/pdf/RiskReportPdfWriter.java index fb9d1d231d..58a12cf67e 100644 --- a/src/main/java/com/blackduck/integration/detect/workflow/blackduck/report/pdf/RiskReportPdfWriter.java +++ b/src/main/java/com/blackduck/integration/detect/workflow/blackduck/report/pdf/RiskReportPdfWriter.java @@ -67,7 +67,7 @@ public File createPDFReportFile(File outputDirectory, ReportData report) throws document.getDocumentInformation().setAuthor("Black Duck Software"); document.getDocumentInformation().setCreator("Integrations"); - document.getDocumentInformation().setSubject("Black Duck Risk Report"); + document.getDocumentInformation().setSubject("Black Duck SCA Risk Report"); try (PDFBoxManager pdfManager = new PDFBoxManager(pdfFile, document)) { this.pdfManager = pdfManager; @@ -93,7 +93,7 @@ private PDRectangle writeHeader(float pageWidth, float startingHeight) throws IO PDRectangle logoRectangle = pdfManager.drawRectangle(0, startingHeight - 100, pageWidth, 100, Color.WHITE); pdfManager.drawImage(30, logoRectangle.getLowerLeftY() + 27.5F, 291, 45, "/riskreport/images/BlackDuckLogo.png"); PDRectangle titleRectangle = pdfManager.drawRectangle(0, logoRectangle.getLowerLeftY() - 80, pageWidth - 35, 80, new Color(154, 115, 184).darker()); - pdfManager.writeText(35, titleRectangle.getLowerLeftY() + 32F, "Black Duck Risk Report", boldFont, 20, Color.WHITE); + pdfManager.writeText(35, titleRectangle.getLowerLeftY() + 32F, "Black Duck SCA Risk Report", boldFont, 20, Color.WHITE); logger.trace("Finished writing the pdf header."); return titleRectangle; } diff --git a/src/main/java/com/blackduck/integration/detect/workflow/blackduck/report/service/ReportService.java b/src/main/java/com/blackduck/integration/detect/workflow/blackduck/report/service/ReportService.java index 416a0537c3..b6a7d02066 100644 --- a/src/main/java/com/blackduck/integration/detect/workflow/blackduck/report/service/ReportService.java +++ b/src/main/java/com/blackduck/integration/detect/workflow/blackduck/report/service/ReportService.java @@ -138,7 +138,7 @@ public ReportData getRiskReportData(ProjectView project, ProjectVersionView vers policyStatus = checkPolicyStatusIfBlank(projectVersionComponentView, policyStatus, originalVersionUrl, policyFailure); } catch (IntegrationException e) { policyFailure = true; - logger.debug("Could not get the component policy status, the Black Duck policy module is not enabled"); + logger.debug("Could not get the component policy status, the Black Duck SCA policy module is not enabled"); } } @@ -299,13 +299,13 @@ public String generateBlackDuckNoticesReport(ProjectVersionView version, ReportF } catch (IntegrationRestException e) { if (e.getHttpStatusCode() == 402) { // unlike the policy module, the licenseReports link is still present when the module is not enabled - logger.warn("Can not create the notice report, the Black Duck notice module is not enabled."); + logger.warn("Can not create the notice report, the Black Duck SCA notice module is not enabled."); } else { throw e; } } } else { - logger.warn("Can not create the notice report, the Black Duck notice module is not enabled."); + logger.warn("Can not create the notice report, the Black Duck SCA notice module is not enabled."); } return null; } diff --git a/src/main/java/com/blackduck/integration/detect/workflow/result/BlackDuckBomDetectResult.java b/src/main/java/com/blackduck/integration/detect/workflow/result/BlackDuckBomDetectResult.java index cf410e1542..9fec638894 100644 --- a/src/main/java/com/blackduck/integration/detect/workflow/result/BlackDuckBomDetectResult.java +++ b/src/main/java/com/blackduck/integration/detect/workflow/result/BlackDuckBomDetectResult.java @@ -17,7 +17,7 @@ public String getResultLocation() { @Override public String getResultMessage() { - return String.format("Black Duck Project BOM: %s", projectComponentsLink); + return String.format("Black Duck SCA Project BOM: %s", projectComponentsLink); } @Override