Merge pull request #784 from jacobcalvert/jacobcalvert/fix-annotation-serialization-issue

Fix annotation serialization issue

Author: Shnatsel

cyclonedx-bom/src/specs/common/snapshots/cyclonedx_bom__specs__common__bom__v1_5__test__it_should_serialize_a_complex_example_to_json.snap

@@ -1,6 +1,5 @@
 ---
 source: cyclonedx-bom/src/specs/common/bom.rs
-assertion_line: 654
 expression: actual
 ---
 {
@@ -851,7 +850,7 @@ expression: actual
   },
   "annotations": [
     {
-      "bomRef": "annotation-1",
+      "bom-ref": "annotation-1",
       "subjects": [
         "subject1"
       ],

cyclonedx-bom/src/specs/v1_5/annotation.rs

@@ -114,7 +114,7 @@ impl FromXml for Annotations {
 #[serde(rename_all = "camelCase")]
 pub(crate) struct Annotation {
     /// Optional identifier to reference the annotation elsewhere in the Bom.
-    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(rename = "bom-ref", skip_serializing_if = "Option::is_none")]
     bom_ref: Option<String>,
     /// A list of BOM references, TODO change to `Subjects`
     subjects: Vec<String>,

cyclonedx-bom/tests/spec/snapshots/1.5/it_should_parse_all_of_the_valid_json_specifications@valid-annotation-1.5.json.snap

@@ -18,6 +18,7 @@ input_file: cyclonedx-bom/tests/spec/1.5/valid-annotation-1.5.json
   ],
   "annotations": [
     {
+      "bom-ref": "annotation-1",
       "subjects": [
         "component-a"
       ],
@@ -39,6 +40,7 @@ input_file: cyclonedx-bom/tests/spec/1.5/valid-annotation-1.5.json
       "text": "This is a sample annotation made by an organization"
     },
     {
+      "bom-ref": "annotation-2",
       "subjects": [
         "component-a"
       ],
@@ -53,6 +55,7 @@ input_file: cyclonedx-bom/tests/spec/1.5/valid-annotation-1.5.json
       "text": "This is a sample annotation made by a person"
     },
     {
+      "bom-ref": "annotation-3",
       "subjects": [
         "component-a"
       ],
@@ -67,6 +70,7 @@ input_file: cyclonedx-bom/tests/spec/1.5/valid-annotation-1.5.json
       "text": "This is a sample annotation made by a component"
     },
     {
+      "bom-ref": "annotation-4",
       "subjects": [
         "component-a"
       ],