Remove JAXB annotations

CycloneDX · Aug 22, 2023 · 1f1c057 · 1f1c057
1 parent 84c73d2
commit 1f1c057
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 13 deletions.
diff --git a/src/main/java/org/cyclonedx/model/LifecycleChoice.java b/src/main/java/org/cyclonedx/model/LifecycleChoice.java
@@ -22,11 +22,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
 
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
-@XmlAccessorType(XmlAccessType.FIELD)
 public class LifecycleChoice
 {
     @JsonProperty("phase")

diff --git a/src/main/java/org/cyclonedx/model/Lifecycles.java b/src/main/java/org/cyclonedx/model/Lifecycles.java
@@ -22,11 +22,8 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
 
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
-@XmlAccessorType(XmlAccessType.FIELD)
 public class Lifecycles
 {
     @JacksonXmlProperty(localName = "lifecycle")

diff --git a/src/main/java/org/cyclonedx/model/Metadata.java b/src/main/java/org/cyclonedx/model/Metadata.java
@@ -35,8 +35,6 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -55,8 +53,8 @@ public class Metadata
     @VersionFilter(versions = {"1.0", "1.1", "1.2", "1.3", "1.4"})
     @JsonProperty("lifecycles")
     @JsonDeserialize(using = LifecycleDeserializer.class)
-    @XmlElementWrapper(name = "lifecycles")
-    @XmlElement(name = "lifecycle")
+    @JacksonXmlElementWrapper(localName = "lifecycles")
+    @JacksonXmlProperty(localName = "lifecycle")
     private Lifecycles lifecycles;
 
     @VersionFilter(versions = {"1.0", "1.1"})

diff --git a/src/main/java/org/cyclonedx/model/metadata/ToolInformation.java b/src/main/java/org/cyclonedx/model/metadata/ToolInformation.java
@@ -1,15 +1,12 @@
 package org.cyclonedx.model.metadata;
 
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import org.cyclonedx.model.Component;
 import org.cyclonedx.model.Service;
 
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
-@XmlAccessorType(XmlAccessType.FIELD)
 public class ToolInformation
 {
   private List<Component> components;