From 4236a2e6f7ccfc533dec39b00423e4e981e9f6a3 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Mon, 25 Nov 2013 19:34:07 -0500 Subject: [PATCH] updated schema Former-commit-id: 8a78c1f646d48aa61d46f62e36bfdf34f8818a1e --- .../suppressions/generated/ObjectFactory.java | 54 +-- .../suppressions/generated/Suppressions.java | 353 ++++++++++++------ .../suppressions/generated/package-info.java | 2 +- .../src/main/resources/schema/suppression.xsd | 2 + 4 files changed, 260 insertions(+), 151 deletions(-) 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 index b9169006f..feb6051ce 100644 --- 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 @@ -2,7 +2,7 @@ // 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.23 at 10:04:41 PM EST +// Generated on: 2013.11.25 at 07:33:00 PM EST // @@ -34,8 +34,8 @@ 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 _SuppressionsSuppressCwe_QNAME = new QName("https://www.owasp.org/index.php/OWASP_Dependency_Check_Suppression", "cwe"); 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 @@ -44,22 +44,6 @@ public class ObjectFactory { public ObjectFactory() { } - /** - * Create an instance of {@link Suppressions } - * - */ - public Suppressions createSuppressions() { - return new Suppressions(); - } - - /** - * Create an instance of {@link Suppressions.Suppress } - * - */ - public Suppressions.Suppress createSuppressionsSuppress() { - return new Suppressions.Suppress(); - } - /** * Create an instance of {@link Suppressions.Suppress.Cpe } * @@ -68,6 +52,14 @@ public class ObjectFactory { 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 } * @@ -76,6 +68,14 @@ public class ObjectFactory { 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 >}} * @@ -94,15 +94,6 @@ public class ObjectFactory { return new JAXBElement(_SuppressionsSuppressCve_QNAME, String.class, Suppressions.Suppress.class, value); } - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "https://www.owasp.org/index.php/OWASP_Dependency_Check_Suppression", name = "cwe", scope = Suppressions.Suppress.class) - public JAXBElement createSuppressionsSuppressCwe(String value) { - return new JAXBElement(_SuppressionsSuppressCwe_QNAME, String.class, Suppressions.Suppress.class, value); - } - /** * Create an instance of {@link JAXBElement }{@code <}{@link Suppressions.Suppress.Cpe }{@code >}} * @@ -112,4 +103,13 @@ public class ObjectFactory { return new JAXBElement(_SuppressionsSuppressCpe_QNAME, Suppressions.Suppress.Cpe.class, Suppressions.Suppress.class, value); } + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "https://www.owasp.org/index.php/OWASP_Dependency_Check_Suppression", name = "cwe", scope = Suppressions.Suppress.class) + public JAXBElement createSuppressionsSuppressCwe(String value) { + return new JAXBElement(_SuppressionsSuppressCwe_QNAME, String.class, Suppressions.Suppress.class, value); + } + } diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/jaxb/suppressions/generated/Suppressions.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/jaxb/suppressions/generated/Suppressions.java index 62b61cf3d..6157b96a6 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/jaxb/suppressions/generated/Suppressions.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/jaxb/suppressions/generated/Suppressions.java @@ -1,11 +1,14 @@ // -// 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.23 at 10:04:41 PM EST +// 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 java.util.ArrayList; import java.util.List; import javax.annotation.Generated; @@ -19,12 +22,12 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; + /** *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained - * within this class. - * + * + *

The following schema fragment specifies the expected content contained within this class. + * * 

  * <complexType>
  *   <complexContent>
@@ -44,6 +47,7 @@ import javax.xml.bind.annotation.XmlValue;
  *                         <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>
@@ -57,6 +61,7 @@ import javax.xml.bind.annotation.XmlValue;
  *                           <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>
@@ -76,43 +81,43 @@ import javax.xml.bind.annotation.XmlValue;
  *   </complexContent>
  * </complexType>
  *
- * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { "suppress" }) @XmlRootElement(name = "suppressions") -@Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") +@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-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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 List suppress; /** * Gets the value of the suppress property. - * + * *

- * 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 - * set method for the suppress property. - * + * 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 set method for the suppress property. + * *

* For example, to add a new item, do as follows: * 

      *    getSuppress().add(newItem);
      *
- * - * + * + * *

* 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-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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 getSuppress() { if (suppress == null) { suppress = new ArrayList(); @@ -120,12 +125,12 @@ public class Suppressions { return this.suppress; } + /** *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained - * within this class. - * + * + *

The following schema fragment specifies the expected content contained within this class. + * * 

      * <complexType>
      *   <complexContent>
@@ -140,6 +145,7 @@ public class Suppressions {
      *               <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>
@@ -153,6 +159,7 @@ public class Suppressions {
      *                 <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>
@@ -167,8 +174,8 @@ public class Suppressions {
      *   </complexContent>
      * </complexType>
      *
- * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { @@ -177,116 +184,128 @@ public class Suppressions { "sha1", "cpeOrCveOrCwe" }) - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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), - @XmlElementRef(name = "cve", 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-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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 List> cpeOrCveOrCwe; /** * Gets the value of the notes property. - * - * @return possible object is {@link String } - * + * + * @return + * possible object is + * {@link String } + * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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 getNotes() { return notes; } /** * Sets the value of the notes property. - * - * @param value allowed object is {@link String } - * + * + * @param value + * allowed object is + * {@link String } + * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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 setNotes(String value) { this.notes = value; } /** * Gets the value of the filePath property. - * - * @return possible object is {@link Suppressions.Suppress.FilePath } - * + * + * @return + * possible object is + * {@link Suppressions.Suppress.FilePath } + * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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 Suppressions.Suppress.FilePath getFilePath() { return filePath; } /** * Sets the value of the filePath property. - * - * @param value allowed object is + * + * @param value + * allowed object is * {@link Suppressions.Suppress.FilePath } - * + * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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 setFilePath(Suppressions.Suppress.FilePath value) { this.filePath = value; } /** * Gets the value of the sha1 property. - * - * @return possible object is {@link String } - * + * + * @return + * possible object is + * {@link String } + * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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 getSha1() { return sha1; } /** * Sets the value of the sha1 property. - * - * @param value allowed object is {@link String } - * + * + * @param value + * allowed object is + * {@link String } + * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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 setSha1(String value) { this.sha1 = value; } /** * Gets the value of the cpeOrCveOrCwe property. - * + * *

- * 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 - * set method for the cpeOrCveOrCwe property. - * + * 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 set method for the cpeOrCveOrCwe property. + * *

* For example, to add a new item, do as follows: * 

          *    getCpeOrCveOrCwe().add(newItem);
          *
- * - * + * + * *

- * Objects of the following type(s) are allowed in the list {@link JAXBElement }{@code <}{@link Suppressions.Suppress.Cpe }{@code >} + * 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 >} - * {@link JAXBElement }{@code <}{@link String }{@code >} - * - * + * + * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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> getCpeOrCveOrCwe() { if (cpeOrCveOrCwe == null) { cpeOrCveOrCwe = new ArrayList>(); @@ -294,67 +313,77 @@ public class Suppressions { return this.cpeOrCveOrCwe; } + /** *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content - * contained within this class. - * + * + *

The following schema fragment specifies the expected content contained within this class. + * * 

          * <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-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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 } - * + * + * @return + * possible object is + * {@link String } + * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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 } - * + * + * @param value + * allowed object is + * {@link String } + * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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 } - * + * + * @return + * possible object is + * {@link Boolean } + * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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; @@ -365,77 +394,120 @@ public class Suppressions { /** * Sets the value of the regex property. - * - * @param value allowed object is {@link Boolean } - * + * + * @param value + * allowed object is + * {@link Boolean } + * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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; + } + } + /** *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content - * contained within this class. - * + * + *

The following schema fragment specifies the expected content contained within this class. + * * 

          * <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-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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 } - * + * + * @return + * possible object is + * {@link String } + * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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 } - * + * + * @param value + * allowed object is + * {@link String } + * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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 } - * + * + * @return + * possible object is + * {@link Boolean } + * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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; @@ -446,14 +518,49 @@ public class Suppressions { /** * Sets the value of the regex property. - * - * @param value allowed object is {@link Boolean } - * + * + * @param value + * allowed object is + * {@link Boolean } + * */ - @Generated(value = "com.sun.tools.internal.xjc.Driver", date = "2013-11-23T10:04:41-05:00", comments = "JAXB RI vJAXB 2.1.10 in JDK 6") + @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 index 50676156f..735bc1b6a 100644 --- 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 @@ -2,7 +2,7 @@ // 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.23 at 10:04:41 PM EST +// 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) diff --git a/dependency-check-core/src/main/resources/schema/suppression.xsd b/dependency-check-core/src/main/resources/schema/suppression.xsd index 07020efe9..1ed2f32bb 100644 --- a/dependency-check-core/src/main/resources/schema/suppression.xsd +++ b/dependency-check-core/src/main/resources/schema/suppression.xsd @@ -15,6 +15,7 @@ + @@ -28,6 +29,7 @@ +