Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ private Map<Integer, ConanNode<Integer>> 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");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ 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+):

```
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.
```
Expand Down
4 changes: 2 additions & 2 deletions documentation/src/main/markdown/gettingstarted/quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion documentation/src/main/markdown/results/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.

<note type="tip">Available signature scanner properties can be determined by specifying `--help` when executing the signature scanner jar file from the command line.</note>

Expand Down
2 changes: 1 addition & 1 deletion documentation/src/main/markdown/unsupportedreleasenotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand All @@ -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);
Expand Down
Loading