Merge pull request #635 from pvdrz/deduplicate-modules

Deduplicate specs modules

Author: Shnatsel

cyclonedx-bom/src/specs/v1_3/attached_text.rs renamed to cyclonedx-bom/src/specs/common/attached_text.rs

@@ -20,7 +20,7 @@ use crate::{
     errors::XmlReadError,
     external_models::{date_time::DateTime, normalized_string::NormalizedString, uri::Uri},
     models,
-    specs::v1_3::attached_text::AttachedText,
+    specs::common::attached_text::AttachedText,
     utilities::{convert_optional, convert_optional_vec, convert_vec},
     xml::{
         attribute_or_error, read_lax_validation_list_tag, read_lax_validation_tag, read_list_tag,
@@ -872,7 +872,7 @@ impl FromXml for Source {
 #[cfg(test)]
 pub(crate) mod test {
     use crate::{
-        specs::v1_3::attached_text::test::{corresponding_attached_text, example_attached_text},
+        specs::common::attached_text::test::{corresponding_attached_text, example_attached_text},
         xml::test::{read_element_from_string, write_element_to_string},
     };
 

cyclonedx-bom/src/specs/v1_3/code.rs renamed to cyclonedx-bom/src/specs/common/code.rs

@@ -28,7 +28,7 @@ use crate::{
     models,
     utilities::{convert_optional, convert_vec},
 };
-use crate::{specs::v1_3::hash::Hashes, xml::to_xml_write_error};
+use crate::{specs::common::hash::Hashes, xml::to_xml_write_error};
 use serde::{Deserialize, Serialize};
 use xml::{reader, writer::XmlEvent};
 
@@ -213,7 +213,7 @@ impl FromXml for ExternalReference {
 pub(crate) mod test {
     use super::*;
     use crate::{
-        specs::v1_3::hash::test::{corresponding_hashes, example_hashes},
+        specs::common::hash::test::{corresponding_hashes, example_hashes},
         xml::test::{read_element_from_string, write_element_to_string},
     };
 

cyclonedx-bom/src/specs/v1_3/dependency.rs renamed to cyclonedx-bom/src/specs/common/dependency.rs

@@ -0,0 +1,8 @@
+pub(crate) mod attached_text;
+pub(crate) mod code;
+pub(crate) mod dependency;
+pub(crate) mod external_reference;
+pub(crate) mod hash;
+pub(crate) mod organization;
+pub(crate) mod property;
+pub(crate) mod tool;

cyclonedx-bom/src/specs/v1_3/external_reference.rs renamed to cyclonedx-bom/src/specs/common/external_reference.rs

@@ -1,5 +1,5 @@
 ---
-source: cyclonedx-bom/src/specs/v1_4/attached_text.rs
+source: cyclonedx-bom/src/specs/common/attached_text.rs
 expression: xml_output
 ---
 <?xml version="1.0" encoding="utf-8"?>

cyclonedx-bom/src/specs/v1_3/hash.rs renamed to cyclonedx-bom/src/specs/common/hash.rs

@@ -1,5 +1,5 @@
 ---
-source: cyclonedx-bom/src/specs/v1_4/attached_text.rs
+source: cyclonedx-bom/src/specs/common/attached_text.rs
 expression: xml_output
 ---
 <?xml version="1.0" encoding="utf-8"?>