diff --git a/plugins/reporters/evaluated-model/src/funTest/assets/evaluated-model-reporter-test-deduplicate-expected-output.yml b/plugins/reporters/evaluated-model/src/funTest/assets/evaluated-model-reporter-test-deduplicate-expected-output.yml index b4a6517fbb1c6..9c64e6f31c8e9 100644 --- a/plugins/reporters/evaluated-model/src/funTest/assets/evaluated-model-reporter-test-deduplicate-expected-output.yml +++ b/plugins/reporters/evaluated-model/src/funTest/assets/evaluated-model-reporter-test-deduplicate-expected-output.yml @@ -235,6 +235,25 @@ issues: - 1 pkg: 2 how_to_fix: "Some how to fix text." +- _id: 17 + timestamp: "2024-04-25T07:44:20.725613974Z" + type: "ANALYZER" + source: "Gradle" + message: "Example analyzer warning in included package." + severity: "WARNING" + pkg: 2 + path: 0 + how_to_fix: "Some how to fix text." +- _id: 18 + timestamp: "2024-04-25T07:44:20.725613974Z" + type: "ANALYZER" + source: "Gradle" + message: "Example analyzer warning in excluded package." + severity: "WARNING" + is_excluded: true + pkg: 3 + path: 1 + how_to_fix: "Some how to fix text." scan_results: - _id: 0 provenance: @@ -555,8 +574,8 @@ packages: revision: "" path: "" paths: - - 5 - - 6 + - 7 + - 8 levels: - 0 - 1 @@ -602,7 +621,7 @@ packages: revision: "" path: "" paths: - - 0 + - 2 levels: - 0 scopes: @@ -654,7 +673,7 @@ packages: comment: "Foobar is an imaginary dependency and offers a license choice" concluded_license: "GPL-2.0-only OR MIT" paths: - - 1 + - 3 levels: - 1 scopes: @@ -706,7 +725,7 @@ packages: comment: "H2 database offers a license choice" concluded_license: "MPL-2.0 OR EPL-1.0" paths: - - 2 + - 4 levels: - 1 scopes: @@ -753,8 +772,8 @@ packages: revision: "" path: "" paths: - - 3 - - 4 + - 5 + - 6 levels: - 1 - 2 @@ -837,7 +856,7 @@ packages: revision: "" path: "" paths: - - 7 + - 9 levels: - 1 scopes: @@ -873,8 +892,8 @@ packages: revision: "" path: "" paths: - - 8 - - 9 + - 10 + - 11 levels: - 0 scopes: @@ -883,58 +902,68 @@ packages: is_excluded: false paths: - _id: 0 + pkg: 2 + project: 1 + scope: 0 + path: [] +- _id: 1 pkg: 3 project: 1 scope: 1 path: [] -- _id: 1 +- _id: 2 + pkg: 3 + project: 1 + scope: 1 + path: [] +- _id: 3 pkg: 4 project: 1 scope: 1 path: - 3 -- _id: 2 +- _id: 4 pkg: 5 project: 1 scope: 1 path: - 3 -- _id: 3 +- _id: 5 pkg: 6 project: 1 scope: 0 path: - 2 -- _id: 4 +- _id: 6 pkg: 6 project: 1 scope: 1 path: - 9 - 2 -- _id: 5 +- _id: 7 pkg: 2 project: 1 scope: 0 path: [] -- _id: 6 +- _id: 8 pkg: 2 project: 1 scope: 1 path: - 9 -- _id: 7 +- _id: 9 pkg: 8 project: 1 scope: 1 path: - 3 -- _id: 8 +- _id: 10 pkg: 9 project: 1 scope: 0 path: [] -- _id: 9 +- _id: 11 pkg: 9 project: 1 scope: 1 @@ -953,6 +982,8 @@ dependency_trees: - key: 3 linkage: "DYNAMIC" pkg: 2 + issues: + - 17 children: - key: 4 linkage: "DYNAMIC" @@ -964,33 +995,39 @@ dependency_trees: - key: 6 linkage: "DYNAMIC" pkg: 2 - - key: 7 + children: + - key: 7 + linkage: "DYNAMIC" + pkg: 6 + - key: 8 scope: 1 scope_excludes: - 0 children: - - key: 8 + - key: 9 linkage: "DYNAMIC" pkg: 3 + issues: + - 18 children: - - key: 9 + - key: 10 linkage: "DYNAMIC" pkg: 4 - - key: 10 + - key: 11 linkage: "DYNAMIC" pkg: 5 - - key: 11 + - key: 12 linkage: "DYNAMIC" pkg: 8 - - key: 12 + - key: 13 linkage: "DYNAMIC" pkg: 9 children: - - key: 13 + - key: 14 linkage: "DYNAMIC" pkg: 2 children: - - key: 14 + - key: 15 linkage: "DYNAMIC" pkg: 6 rule_violation_resolutions: @@ -1052,9 +1089,9 @@ statistics: vulnerability_resolutions: 0 open_issues: errors: 4 - warnings: 2 + warnings: 3 hints: 2 - severe: 6 + severe: 7 open_rule_violations: errors: 1 warnings: 1 diff --git a/plugins/reporters/evaluated-model/src/funTest/assets/evaluated-model-reporter-test-expected-output.json b/plugins/reporters/evaluated-model/src/funTest/assets/evaluated-model-reporter-test-expected-output.json index 9ba659183ee5c..b3eeb845178f9 100644 --- a/plugins/reporters/evaluated-model/src/funTest/assets/evaluated-model-reporter-test-expected-output.json +++ b/plugins/reporters/evaluated-model/src/funTest/assets/evaluated-model-reporter-test-expected-output.json @@ -270,6 +270,27 @@ "resolutions" : [ 1 ], "pkg" : 2, "how_to_fix" : "Some how to fix text." + }, { + "_id" : 17, + "timestamp" : "2024-04-25T07:44:20.725613974Z", + "type" : "ANALYZER", + "source" : "Gradle", + "message" : "Example analyzer warning in included package.", + "severity" : "WARNING", + "pkg" : 2, + "path" : 0, + "how_to_fix" : "Some how to fix text." + }, { + "_id" : 18, + "timestamp" : "2024-04-25T07:44:20.725613974Z", + "type" : "ANALYZER", + "source" : "Gradle", + "message" : "Example analyzer warning in excluded package.", + "severity" : "WARNING", + "is_excluded" : true, + "pkg" : 3, + "path" : 1, + "how_to_fix" : "Some how to fix text." } ], "scan_results" : [ { "_id" : 0, @@ -619,7 +640,7 @@ "revision" : "", "path" : "" }, - "paths" : [ 5, 6 ], + "paths" : [ 7, 8 ], "levels" : [ 0, 1 ], "scopes" : [ 0, 1 ], "scan_results" : [ 5 ], @@ -664,7 +685,7 @@ "revision" : "", "path" : "" }, - "paths" : [ 0 ], + "paths" : [ 2 ], "levels" : [ 0 ], "scopes" : [ 1 ], "scan_results" : [ 2 ], @@ -717,7 +738,7 @@ "concluded_license" : "GPL-2.0-only OR MIT" } } ], - "paths" : [ 1 ], + "paths" : [ 3 ], "levels" : [ 1 ], "scopes" : [ 1 ], "is_excluded" : true, @@ -771,7 +792,7 @@ "concluded_license" : "MPL-2.0 OR EPL-1.0" } } ], - "paths" : [ 2 ], + "paths" : [ 4 ], "levels" : [ 1 ], "scopes" : [ 1 ], "scan_results" : [ 3 ], @@ -817,7 +838,7 @@ "revision" : "", "path" : "" }, - "paths" : [ 3, 4 ], + "paths" : [ 5, 6 ], "levels" : [ 1, 2 ], "scopes" : [ 0, 1 ], "scan_results" : [ 4 ], @@ -904,7 +925,7 @@ "revision" : "", "path" : "" }, - "paths" : [ 7 ], + "paths" : [ 9 ], "levels" : [ 1 ], "scopes" : [ 1 ], "scan_results" : [ 6 ], @@ -942,67 +963,79 @@ "revision" : "", "path" : "" }, - "paths" : [ 8, 9 ], + "paths" : [ 10, 11 ], "levels" : [ 0 ], "scopes" : [ 0, 1 ], "is_excluded" : false } ], "paths" : [ { "_id" : 0, + "pkg" : 2, + "project" : 1, + "scope" : 0, + "path" : [ ] + }, { + "_id" : 1, "pkg" : 3, "project" : 1, "scope" : 1, "path" : [ ] }, { - "_id" : 1, + "_id" : 2, + "pkg" : 3, + "project" : 1, + "scope" : 1, + "path" : [ ] + }, { + "_id" : 3, "pkg" : 4, "project" : 1, "scope" : 1, "path" : [ 3 ] }, { - "_id" : 2, + "_id" : 4, "pkg" : 5, "project" : 1, "scope" : 1, "path" : [ 3 ] }, { - "_id" : 3, + "_id" : 5, "pkg" : 6, "project" : 1, "scope" : 0, "path" : [ 2 ] }, { - "_id" : 4, + "_id" : 6, "pkg" : 6, "project" : 1, "scope" : 1, "path" : [ 9, 2 ] }, { - "_id" : 5, + "_id" : 7, "pkg" : 2, "project" : 1, "scope" : 0, "path" : [ ] }, { - "_id" : 6, + "_id" : 8, "pkg" : 2, "project" : 1, "scope" : 1, "path" : [ 9 ] }, { - "_id" : 7, + "_id" : 9, "pkg" : 8, "project" : 1, "scope" : 1, "path" : [ 3 ] }, { - "_id" : 8, + "_id" : 10, "pkg" : 9, "project" : 1, "scope" : 0, "path" : [ ] }, { - "_id" : 9, + "_id" : 11, "pkg" : 9, "project" : 1, "scope" : 1, @@ -1022,6 +1055,7 @@ "key" : 3, "linkage" : "DYNAMIC", "pkg" : 2, + "issues" : [ 17 ], "children" : [ { "key" : 4, "linkage" : "DYNAMIC", @@ -1050,6 +1084,7 @@ "key" : 9, "linkage" : "DYNAMIC", "pkg" : 3, + "issues" : [ 18 ], "children" : [ { "key" : 10, "linkage" : "DYNAMIC", @@ -1142,9 +1177,9 @@ }, "open_issues" : { "errors" : 4, - "warnings" : 2, + "warnings" : 3, "hints" : 2, - "severe" : 6 + "severe" : 7 }, "open_rule_violations" : { "errors" : 1, diff --git a/plugins/reporters/evaluated-model/src/funTest/assets/evaluated-model-reporter-test-expected-output.yml b/plugins/reporters/evaluated-model/src/funTest/assets/evaluated-model-reporter-test-expected-output.yml index 0e6c52f391feb..9c64e6f31c8e9 100644 --- a/plugins/reporters/evaluated-model/src/funTest/assets/evaluated-model-reporter-test-expected-output.yml +++ b/plugins/reporters/evaluated-model/src/funTest/assets/evaluated-model-reporter-test-expected-output.yml @@ -235,6 +235,25 @@ issues: - 1 pkg: 2 how_to_fix: "Some how to fix text." +- _id: 17 + timestamp: "2024-04-25T07:44:20.725613974Z" + type: "ANALYZER" + source: "Gradle" + message: "Example analyzer warning in included package." + severity: "WARNING" + pkg: 2 + path: 0 + how_to_fix: "Some how to fix text." +- _id: 18 + timestamp: "2024-04-25T07:44:20.725613974Z" + type: "ANALYZER" + source: "Gradle" + message: "Example analyzer warning in excluded package." + severity: "WARNING" + is_excluded: true + pkg: 3 + path: 1 + how_to_fix: "Some how to fix text." scan_results: - _id: 0 provenance: @@ -555,8 +574,8 @@ packages: revision: "" path: "" paths: - - 5 - - 6 + - 7 + - 8 levels: - 0 - 1 @@ -602,7 +621,7 @@ packages: revision: "" path: "" paths: - - 0 + - 2 levels: - 0 scopes: @@ -654,7 +673,7 @@ packages: comment: "Foobar is an imaginary dependency and offers a license choice" concluded_license: "GPL-2.0-only OR MIT" paths: - - 1 + - 3 levels: - 1 scopes: @@ -706,7 +725,7 @@ packages: comment: "H2 database offers a license choice" concluded_license: "MPL-2.0 OR EPL-1.0" paths: - - 2 + - 4 levels: - 1 scopes: @@ -753,8 +772,8 @@ packages: revision: "" path: "" paths: - - 3 - - 4 + - 5 + - 6 levels: - 1 - 2 @@ -837,7 +856,7 @@ packages: revision: "" path: "" paths: - - 7 + - 9 levels: - 1 scopes: @@ -873,8 +892,8 @@ packages: revision: "" path: "" paths: - - 8 - - 9 + - 10 + - 11 levels: - 0 scopes: @@ -883,58 +902,68 @@ packages: is_excluded: false paths: - _id: 0 + pkg: 2 + project: 1 + scope: 0 + path: [] +- _id: 1 pkg: 3 project: 1 scope: 1 path: [] -- _id: 1 +- _id: 2 + pkg: 3 + project: 1 + scope: 1 + path: [] +- _id: 3 pkg: 4 project: 1 scope: 1 path: - 3 -- _id: 2 +- _id: 4 pkg: 5 project: 1 scope: 1 path: - 3 -- _id: 3 +- _id: 5 pkg: 6 project: 1 scope: 0 path: - 2 -- _id: 4 +- _id: 6 pkg: 6 project: 1 scope: 1 path: - 9 - 2 -- _id: 5 +- _id: 7 pkg: 2 project: 1 scope: 0 path: [] -- _id: 6 +- _id: 8 pkg: 2 project: 1 scope: 1 path: - 9 -- _id: 7 +- _id: 9 pkg: 8 project: 1 scope: 1 path: - 3 -- _id: 8 +- _id: 10 pkg: 9 project: 1 scope: 0 path: [] -- _id: 9 +- _id: 11 pkg: 9 project: 1 scope: 1 @@ -953,6 +982,8 @@ dependency_trees: - key: 3 linkage: "DYNAMIC" pkg: 2 + issues: + - 17 children: - key: 4 linkage: "DYNAMIC" @@ -976,6 +1007,8 @@ dependency_trees: - key: 9 linkage: "DYNAMIC" pkg: 3 + issues: + - 18 children: - key: 10 linkage: "DYNAMIC" @@ -1056,9 +1089,9 @@ statistics: vulnerability_resolutions: 0 open_issues: errors: 4 - warnings: 2 + warnings: 3 hints: 2 - severe: 6 + severe: 7 open_rule_violations: errors: 1 warnings: 1 diff --git a/plugins/reporters/evaluated-model/src/funTest/assets/reporter-test-input.yml b/plugins/reporters/evaluated-model/src/funTest/assets/reporter-test-input.yml index ee242b53cc064..ee4ffcf734c68 100644 --- a/plugins/reporters/evaluated-model/src/funTest/assets/reporter-test-input.yml +++ b/plugins/reporters/evaluated-model/src/funTest/assets/reporter-test-input.yml @@ -104,6 +104,11 @@ analyzer: - name: "compile" dependencies: - id: "Maven:org.apache.commons:commons-text:1.1" + issues: + - timestamp: "2024-04-25T07:44:20.725613974Z" + source: "Gradle" + message: "Example analyzer warning in included package." + severity: "WARNING" dependencies: - id: "Maven:org.apache.commons:commons-lang3:3.5" - id: "Maven:org.example.test:component:1.11" @@ -114,6 +119,11 @@ analyzer: - name: "testCompile" dependencies: - id: "Ant:junit:junit:4.12" + issues: + - timestamp: "2024-04-25T07:44:20.725613974Z" + source: "Gradle" + message: "Example analyzer warning in excluded package." + severity: "WARNING" dependencies: - id: "Maven:com.foobar:foobar:1.0" - id: "Maven:com.h2database:h2:1.4.200" diff --git a/plugins/reporters/opossum/src/funTest/assets/reporter-test-input.yml b/plugins/reporters/opossum/src/funTest/assets/reporter-test-input.yml index ee242b53cc064..ee4ffcf734c68 100644 --- a/plugins/reporters/opossum/src/funTest/assets/reporter-test-input.yml +++ b/plugins/reporters/opossum/src/funTest/assets/reporter-test-input.yml @@ -104,6 +104,11 @@ analyzer: - name: "compile" dependencies: - id: "Maven:org.apache.commons:commons-text:1.1" + issues: + - timestamp: "2024-04-25T07:44:20.725613974Z" + source: "Gradle" + message: "Example analyzer warning in included package." + severity: "WARNING" dependencies: - id: "Maven:org.apache.commons:commons-lang3:3.5" - id: "Maven:org.example.test:component:1.11" @@ -114,6 +119,11 @@ analyzer: - name: "testCompile" dependencies: - id: "Ant:junit:junit:4.12" + issues: + - timestamp: "2024-04-25T07:44:20.725613974Z" + source: "Gradle" + message: "Example analyzer warning in excluded package." + severity: "WARNING" dependencies: - id: "Maven:com.foobar:foobar:1.0" - id: "Maven:com.h2database:h2:1.4.200" diff --git a/plugins/reporters/static-html/src/funTest/assets/reporter-test-input.yml b/plugins/reporters/static-html/src/funTest/assets/reporter-test-input.yml index ee242b53cc064..ee4ffcf734c68 100644 --- a/plugins/reporters/static-html/src/funTest/assets/reporter-test-input.yml +++ b/plugins/reporters/static-html/src/funTest/assets/reporter-test-input.yml @@ -104,6 +104,11 @@ analyzer: - name: "compile" dependencies: - id: "Maven:org.apache.commons:commons-text:1.1" + issues: + - timestamp: "2024-04-25T07:44:20.725613974Z" + source: "Gradle" + message: "Example analyzer warning in included package." + severity: "WARNING" dependencies: - id: "Maven:org.apache.commons:commons-lang3:3.5" - id: "Maven:org.example.test:component:1.11" @@ -114,6 +119,11 @@ analyzer: - name: "testCompile" dependencies: - id: "Ant:junit:junit:4.12" + issues: + - timestamp: "2024-04-25T07:44:20.725613974Z" + source: "Gradle" + message: "Example analyzer warning in excluded package." + severity: "WARNING" dependencies: - id: "Maven:com.foobar:foobar:1.0" - id: "Maven:com.h2database:h2:1.4.200" diff --git a/plugins/reporters/static-html/src/funTest/assets/static-html-reporter-test-expected-output.html b/plugins/reporters/static-html/src/funTest/assets/static-html-reporter-test-expected-output.html index d8de6dbf637c4..a58b95853ab52 100644 --- a/plugins/reporters/static-html/src/funTest/assets/static-html-reporter-test-expected-output.html +++ b/plugins/reporters/static-html/src/funTest/assets/static-html-reporter-test-expected-output.html @@ -454,7 +454,7 @@
Issues from excluded components are not shown in this summary.
2 | +Maven:org.apache.commons:commons-text:1.1 | +Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0
+
+ How to fix+
|
+ + |
2024-04-25T07:44:20.725613974Z [WARNING]: Gradle - Example analyzer warning in excluded + package.
+2024-04-25T07:44:20.725613974Z [WARNING]: Gradle - Example analyzer warning in included + package.
+