|
22 | 22 | using CycloneDX.Models; |
23 | 23 | using CycloneDX.Models.Vulnerabilities; |
24 | 24 | using CycloneDX.Utils.Exceptions; |
25 | | -using Json.Schema; |
26 | 25 |
|
27 | 26 | namespace CycloneDX.Utils |
28 | 27 | { |
@@ -116,7 +115,10 @@ public static Bom FlatMerge(Bom bom1, Bom bom2) |
116 | 115 | /// </summary> |
117 | 116 | /// <param name="bom1"></param> |
118 | 117 | /// <param name="bom2"></param> |
119 | | - /// <param name="keepManufacturer"></param> |
| 118 | + /// <param name="keepManufacturer"> |
| 119 | + /// Keep the first found manufacturer in a BOM. Without this option |
| 120 | + /// all manufacturers are discarded. |
| 121 | + /// </param> |
120 | 122 | /// <returns></returns> |
121 | 123 | public static Bom FlatMerge(Bom bom1, Bom bom2, bool keepManufacturer) |
122 | 124 | { |
@@ -253,7 +255,10 @@ public static Bom FlatMerge(IEnumerable<Bom> boms) |
253 | 255 | /// maintained refer to the <c>HierarchicalMerge</c> method. |
254 | 256 | /// </summary> |
255 | 257 | /// <param name="boms"></param> |
256 | | - /// <param name="keepManufacturer"></param> |
| 258 | + /// <param name="keepManufacturer"> |
| 259 | + /// Keep the first found manufacturer in a BOM. Without this option |
| 260 | + /// all manufacturers are discarded. |
| 261 | + /// </param> |
257 | 262 | /// <returns></returns> |
258 | 263 | public static Bom FlatMerge(IEnumerable<Bom> boms, bool keepManufacturer) |
259 | 264 | { |
@@ -291,7 +296,10 @@ public static Bom FlatMerge(IEnumerable<Bom> boms, Component bomSubject) |
291 | 296 | /// </summary> |
292 | 297 | /// <param name="boms"></param> |
293 | 298 | /// <param name="bomSubject"></param> |
294 | | - /// <param name="keepManufacturer"></param> |
| 299 | + /// <param name="keepManufacturer"> |
| 300 | + /// Keep the first found manufacturer in a BOM. Without this option |
| 301 | + /// all manufacturers are discarded. |
| 302 | + /// </param> |
295 | 303 | /// <returns></returns> |
296 | 304 | public static Bom FlatMerge(IEnumerable<Bom> boms, Component bomSubject, bool keepManufacturer) |
297 | 305 | { |
|
0 commit comments