diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/jaxb/suppressions/generated/ObjectFactory.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/jaxb/suppressions/generated/ObjectFactory.java deleted file mode 100644 index feb6051ce..000000000 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/jaxb/suppressions/generated/ObjectFactory.java +++ /dev/null @@ -1,115 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2013.11.25 at 07:33:00 PM EST -// - - -package org.owasp.dependencycheck.jaxb.suppressions.generated; - -import java.math.BigDecimal; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the org.owasp.dependencycheck.jaxb.suppressions.generated package. - *
An ObjectFactory allows you to programatically
- * construct new instances of the Java representation
- * for XML content. The Java representation of XML
- * content can consist of schema derived interfaces
- * and classes representing the binding of schema
- * type definitions, element declarations and model
- * groups. Factory methods for each of these are
- * provided in this class.
- *
- */
-@XmlRegistry
-public class ObjectFactory {
-
- private final static QName _SuppressionsSuppressCvssBelow_QNAME = new QName("https://www.owasp.org/index.php/OWASP_Dependency_Check_Suppression", "cvssBelow");
- private final static QName _SuppressionsSuppressCve_QNAME = new QName("https://www.owasp.org/index.php/OWASP_Dependency_Check_Suppression", "cve");
- private final static QName _SuppressionsSuppressCpe_QNAME = new QName("https://www.owasp.org/index.php/OWASP_Dependency_Check_Suppression", "cpe");
- private final static QName _SuppressionsSuppressCwe_QNAME = new QName("https://www.owasp.org/index.php/OWASP_Dependency_Check_Suppression", "cwe");
-
- /**
- * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.owasp.dependencycheck.jaxb.suppressions.generated
- *
- */
- public ObjectFactory() {
- }
-
- /**
- * Create an instance of {@link Suppressions.Suppress.Cpe }
- *
- */
- public Suppressions.Suppress.Cpe createSuppressionsSuppressCpe() {
- return new Suppressions.Suppress.Cpe();
- }
-
- /**
- * Create an instance of {@link Suppressions }
- *
- */
- public Suppressions createSuppressions() {
- return new Suppressions();
- }
-
- /**
- * Create an instance of {@link Suppressions.Suppress.FilePath }
- *
- */
- public Suppressions.Suppress.FilePath createSuppressionsSuppressFilePath() {
- return new Suppressions.Suppress.FilePath();
- }
-
- /**
- * Create an instance of {@link Suppressions.Suppress }
- *
- */
- public Suppressions.Suppress createSuppressionsSuppress() {
- return new Suppressions.Suppress();
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link BigDecimal }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "https://www.owasp.org/index.php/OWASP_Dependency_Check_Suppression", name = "cvssBelow", scope = Suppressions.Suppress.class)
- public JAXBElement Java class for anonymous complex type.
- *
- * The following schema fragment specifies the expected content contained within this class.
- *
- *
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a
- * For example, to add a new item, do as follows:
- *
- * Objects of the following type(s) are allowed in the list
- * {@link Suppressions.Suppress }
- *
- *
- */
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- public List Java class for anonymous complex type.
- *
- * The following schema fragment specifies the expected content contained within this class.
- *
- *
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a
- * For example, to add a new item, do as follows:
- *
- * Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link String }{@code >}
- * {@link JAXBElement }{@code <}{@link Suppressions.Suppress.Cpe }{@code >}
- * {@link JAXBElement }{@code <}{@link BigDecimal }{@code >}
- * {@link JAXBElement }{@code <}{@link String }{@code >}
- *
- *
- */
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- public List Java class for anonymous complex type.
- *
- * The following schema fragment specifies the expected content contained within this class.
- *
- * Java class for anonymous complex type.
- *
- * The following schema fragment specifies the expected content contained within this class.
- *
- *
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence maxOccurs="unbounded" minOccurs="0">
- * <element name="suppress">
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <sequence minOccurs="0">
- * <element name="notes" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * </sequence>
- * <choice minOccurs="0">
- * <element name="filePath">
- * <complexType>
- * <simpleContent>
- * <extension base="<http://www.w3.org/2001/XMLSchema>string">
- * <attribute name="regex" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- * <attribute name="caseSensitive" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- * </extension>
- * </simpleContent>
- * </complexType>
- * </element>
- * <element name="sha1" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * </choice>
- * <sequence maxOccurs="unbounded">
- * <choice>
- * <element name="cpe">
- * <complexType>
- * <simpleContent>
- * <extension base="<http://www.w3.org/2001/XMLSchema>string">
- * <attribute name="regex" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- * <attribute name="caseSensitive" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- * </extension>
- * </simpleContent>
- * </complexType>
- * </element>
- * <element name="cve" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="cwe" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="cvssBelow" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
- * </choice>
- * </sequence>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </element>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- *
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "suppress"
-})
-@XmlRootElement(name = "suppressions")
-@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
-public class Suppressions {
-
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- protected Listset method for the suppress property.
- *
- *
- * getSuppress().add(newItem);
- *
- *
- *
- *
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <sequence minOccurs="0">
- * <element name="notes" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * </sequence>
- * <choice minOccurs="0">
- * <element name="filePath">
- * <complexType>
- * <simpleContent>
- * <extension base="<http://www.w3.org/2001/XMLSchema>string">
- * <attribute name="regex" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- * <attribute name="caseSensitive" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- * </extension>
- * </simpleContent>
- * </complexType>
- * </element>
- * <element name="sha1" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * </choice>
- * <sequence maxOccurs="unbounded">
- * <choice>
- * <element name="cpe">
- * <complexType>
- * <simpleContent>
- * <extension base="<http://www.w3.org/2001/XMLSchema>string">
- * <attribute name="regex" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- * <attribute name="caseSensitive" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- * </extension>
- * </simpleContent>
- * </complexType>
- * </element>
- * <element name="cve" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="cwe" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="cvssBelow" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
- * </choice>
- * </sequence>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- *
- *
- *
- */
- @XmlAccessorType(XmlAccessType.FIELD)
- @XmlType(name = "", propOrder = {
- "notes",
- "filePath",
- "sha1",
- "cpeOrCveOrCwe"
- })
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- public static class Suppress {
-
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- protected String notes;
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- protected Suppressions.Suppress.FilePath filePath;
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- protected String sha1;
- @XmlElementRefs({
- @XmlElementRef(name = "cve", namespace = "https://www.owasp.org/index.php/OWASP_Dependency_Check_Suppression", type = JAXBElement.class),
- @XmlElementRef(name = "cpe", namespace = "https://www.owasp.org/index.php/OWASP_Dependency_Check_Suppression", type = JAXBElement.class),
- @XmlElementRef(name = "cvssBelow", namespace = "https://www.owasp.org/index.php/OWASP_Dependency_Check_Suppression", type = JAXBElement.class),
- @XmlElementRef(name = "cwe", namespace = "https://www.owasp.org/index.php/OWASP_Dependency_Check_Suppression", type = JAXBElement.class)
- })
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- protected Listset method for the cpeOrCveOrCwe property.
- *
- *
- * getCpeOrCveOrCwe().add(newItem);
- *
- *
- *
- *
- * <complexType>
- * <simpleContent>
- * <extension base="<http://www.w3.org/2001/XMLSchema>string">
- * <attribute name="regex" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- * <attribute name="caseSensitive" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- * </extension>
- * </simpleContent>
- * </complexType>
- *
- *
- *
- */
- @XmlAccessorType(XmlAccessType.FIELD)
- @XmlType(name = "", propOrder = {
- "value"
- })
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- public static class Cpe {
-
- @XmlValue
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- protected String value;
- @XmlAttribute
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- protected Boolean regex;
- @XmlAttribute
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- protected Boolean caseSensitive;
-
- /**
- * Gets the value of the value property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- public String getValue() {
- return value;
- }
-
- /**
- * Sets the value of the value property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- public void setValue(String value) {
- this.value = value;
- }
-
- /**
- * Gets the value of the regex property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- public boolean isRegex() {
- if (regex == null) {
- return false;
- } else {
- return regex;
- }
- }
-
- /**
- * Sets the value of the regex property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- public void setRegex(Boolean value) {
- this.regex = value;
- }
-
- /**
- * Gets the value of the caseSensitive property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- public boolean isCaseSensitive() {
- if (caseSensitive == null) {
- return false;
- } else {
- return caseSensitive;
- }
- }
-
- /**
- * Sets the value of the caseSensitive property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- public void setCaseSensitive(Boolean value) {
- this.caseSensitive = value;
- }
-
- }
-
-
- /**
- *
- * <complexType>
- * <simpleContent>
- * <extension base="<http://www.w3.org/2001/XMLSchema>string">
- * <attribute name="regex" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- * <attribute name="caseSensitive" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- * </extension>
- * </simpleContent>
- * </complexType>
- *
- *
- *
- */
- @XmlAccessorType(XmlAccessType.FIELD)
- @XmlType(name = "", propOrder = {
- "value"
- })
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- public static class FilePath {
-
- @XmlValue
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- protected String value;
- @XmlAttribute
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- protected Boolean regex;
- @XmlAttribute
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- protected Boolean caseSensitive;
-
- /**
- * Gets the value of the value property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- public String getValue() {
- return value;
- }
-
- /**
- * Sets the value of the value property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- public void setValue(String value) {
- this.value = value;
- }
-
- /**
- * Gets the value of the regex property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- public boolean isRegex() {
- if (regex == null) {
- return false;
- } else {
- return regex;
- }
- }
-
- /**
- * Sets the value of the regex property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- public void setRegex(Boolean value) {
- this.regex = value;
- }
-
- /**
- * Gets the value of the caseSensitive property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- public boolean isCaseSensitive() {
- if (caseSensitive == null) {
- return false;
- } else {
- return caseSensitive;
- }
- }
-
- /**
- * Sets the value of the caseSensitive property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-25T07:33:00-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6")
- public void setCaseSensitive(Boolean value) {
- this.caseSensitive = value;
- }
-
- }
-
- }
-
-}
diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/jaxb/suppressions/generated/package-info.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/jaxb/suppressions/generated/package-info.java
deleted file mode 100644
index 735bc1b6a..000000000
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/jaxb/suppressions/generated/package-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6
-// See http://java.sun.com/xml/jaxb
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2013.11.25 at 07:33:00 PM EST
-//
-
-@javax.xml.bind.annotation.XmlSchema(namespace = "https://www.owasp.org/index.php/OWASP_Dependency_Check_Suppression", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.owasp.dependencycheck.jaxb.suppressions.generated;
diff --git a/dependency-check-core/src/main/resources/schema/generateSuppressionBindings.bat b/dependency-check-core/src/main/resources/schema/generateSuppressionBindings.bat
deleted file mode 100644
index 0fea621e6..000000000
--- a/dependency-check-core/src/main/resources/schema/generateSuppressionBindings.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-if not "%JAVA_HOME%" == "" goto JAVA_HOME_DEFINED
-
-:NO_JAVA_HOME
-set XJC=xjc.exe
-goto LAUNCH
-
-:JAVA_HOME_DEFINED
-set XJC="%JAVA_HOME%\bin\xjc.exe"
-goto LAUNCH
-
-:LAUNCH
-%XJC% -extension -d ..\..\java -p "org.owasp.dependencycheck.jaxb.suppressions.generated" -mark-generated "suppression.xsd"
diff --git a/dependency-check-core/src/main/resources/schema/generateSuppressionBindings.sh b/dependency-check-core/src/main/resources/schema/generateSuppressionBindings.sh
deleted file mode 100644
index 9d84003e6..000000000
--- a/dependency-check-core/src/main/resources/schema/generateSuppressionBindings.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ -n "$JAVA_HOME" ]
-then
- XJC="$JAVA_HOME/bin/xjc.exe"
-else
- XJC=xjc.exe
-fi
-
-exec "$XJC" -extension -d ../../java -p "org.owasp.dependencycheck.jaxb.suppressions.generated" -mark-generated "suppression.xsd"