Skip to content

Commit f42ef6a

Browse files
author
gopanna
committed
Fixed BDIO Aggregation Tests for synopsys to blackduck rename.
1 parent ab1d2fc commit f42ef6a

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

common/build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
dependencies {
22
api "com.blackduck.integration:blackduck-common:${blackDuckCommonVersion}"
33

4-
//implementation "com.blackduck.integration:integration-common"
5-
implementation files("/Users/gopanna/Downloads/integration-common-27.0.1.jar")
4+
implementation "com.blackduck.integration:integration-common"
65
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
76
}

src/main/java/com/blackduck/integration/detect/configuration/DetectProperties.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -502,8 +502,7 @@ private DetectProperties() {
502502
.setHelp(
503503
"Use this value to enable the various snippet scanning modes. For a full explanation, please refer to the 'Running a component scan using the Signature Scanner command line' section in your Black Duck server's online help. Corresponding Signature Scanner CLI Arguments: --snippet-matching, --snippet-matching-only, --full-snippet-scan.")
504504
.setGroups(DetectGroup.SIGNATURE_SCANNER, DetectGroup.GLOBAL, DetectGroup.SOURCE_SCAN)
505-
.build().deprecateValue(SnippetMatching.FULL_SNIPPET_MATCHING,"Is deprecated and will be removed in the next major release")
506-
.deprecateValue(SnippetMatching.FULL_SNIPPET_MATCHING_ONLY,"Is deprecated and will be removed in the next major release");
505+
.build();
507506

508507
public static final ExtendedEnumProperty<ExtendedReducedPersistanceMode, ReducedPersistence> DETECT_BLACKDUCK_SIGNATURE_SCANNER_REDUCED_PERSISTENCE =
509508
ExtendedEnumProperty.newBuilder(

src/test/java/com/blackduck/integration/detect/workflow/bdio/aggregation/BdioAggregationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ static void setup() throws IOException {
4040
gson = new Gson();
4141
bdioTransformer = new BdioTransformer();
4242
List<String> inputBdioFilenames = Arrays.asList(
43-
"basic_multiproject_0_0_0_SNAPSHOT_com_synopsys_integration_basic_multiproject_0_0_0_SNAPSHOT_gradle_bom.jsonld",
43+
"basic_multiproject_0_0_0_SNAPSHOT_com_blackduck_integration_basic_multiproject_0_0_0_SNAPSHOT_gradle_bom.jsonld",
4444
"basic_multiproject_0_0_0_SNAPSHOT_subprojectone_basic_multiproject_subprojectone_unspecified_gradle_bom.jsonld",
4545
"basic_multiproject_0_0_0_SNAPSHOT_subprojecttwo_basic_multiproject_subprojecttwo_unspecified_gradle_bom.jsonld"
4646
);
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"specVersion": "1.1.0",
4-
"spdx:name": "basic-multiproject/0.0.0-SNAPSHOT/com.synopsys.integration/basic-multiproject/0.0.0-SNAPSHOT gradle/bom",
4+
"spdx:name": "basic-multiproject/0.0.0-SNAPSHOT/com.blackduck.integration/basic-multiproject/0.0.0-SNAPSHOT gradle/bom",
55
"creationInfo": {
66
"spdx:creator": [
77
"Tool: Detect-6.9.1",
@@ -16,11 +16,11 @@
1616
{
1717
"name": "basic-multiproject",
1818
"revision": "0.0.0-SNAPSHOT",
19-
"@id": "http:maven/com.synopsys.integration/basic-multiproject/0.0.0-SNAPSHOT",
19+
"@id": "http:maven/com.blackduck.integration/basic-multiproject/0.0.0-SNAPSHOT",
2020
"@type": "Project",
2121
"externalIdentifier": {
2222
"externalSystemTypeId": "maven",
23-
"externalId": "com.synopsys.integration:basic-multiproject:0.0.0-SNAPSHOT",
23+
"externalId": "com.blackduck.integration:basic-multiproject:0.0.0-SNAPSHOT",
2424
"externalIdMetaData": {
2525
"forge": {
2626
"name": "maven",
@@ -30,7 +30,7 @@
3030
"basic-multiproject",
3131
"0.0.0-SNAPSHOT"
3232
],
33-
"prefix": "com.synopsys.integration"
33+
"prefix": "com.blackduck.integration"
3434
}
3535
},
3636
"relationship": [

0 commit comments

Comments
 (0)