Merge pull request #121 from spdx/schemaupdate

Update JSON schema to latest
spdx · Apr 16, 2023 · 7346c5f · 7346c5f
2 parents f5cc907 + ea38afb
commit 7346c5f
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/resources/spdx-schema-v2.3.json b/resources/spdx-schema-v2.3.json
@@ -1,5 +1,5 @@
 {
-  "$schema" : "http://json-schema.org/draft-07/schema#",
+  "$schema" : "https://json-schema.org/draft/2019-09/schema#",
   "$id" : "http://spdx.org/rdf/terms/2.3",
   "title" : "SPDX 2.3",
   "type" : "object",
@@ -187,6 +187,7 @@
     },
     "revieweds" : {
       "description" : "Reviewed",
+      "deprecated": true,
       "type" : "array",
       "items" : {
         "type" : "object",
@@ -217,7 +218,9 @@
       "description" : "The URI provides an unambiguous mechanism for other SPDX documents to reference SPDX elements within this SPDX document."
     },
     "documentDescribes" : {
-      "description" : "Packages, files and/or Snippets described by this SPDX document",
+      "description" : "DEPRECATED: use relationships instead of this field. Packages, files and/or Snippets described by this SPDX document",
+      "deprecated": true,
+      "$comment": "This field has been deprecated as it is a duplicate of using the SPDXRef-DOCUMENT DESCRIBES relationship",
       "type" : "array",
       "items" : {
         "type" : "string",
@@ -343,7 +346,9 @@
             "type" : "boolean"
           },
           "hasFiles" : {
-            "description" : "Indicates that a particular file belongs to a package.",
+            "description" : "DEPRECATED: use relationships instead of this field. Indicates that a particular file belongs to a package.",
+            "deprecated": true,
+            "$comment": "This field has been deprecated as it is a duplicate of using CONTAINS relationships from a package to files",
             "type" : "array",
             "items" : {
               "description" : "SPDX ID for File.  Indicates that a particular file belongs to a package.",
@@ -366,10 +371,10 @@
             "type" : "string"
           },
           "licenseInfoFromFiles" : {
-            "description" : "The licensing information that was discovered directly within the package. There will be an instance of this property for each distinct value of alllicenseInfoInFile properties of all files contained in the package.\n\nIf the licenseInfoFromFiles field is not present for a package and filesAnalyzed property for that same pacakge is true or omitted, it implies an equivalent meaning to NOASSERTION.",
+            "description" : "The licensing information that was discovered directly within the package. There will be an instance of this property for each distinct value of alllicenseInfoInFile properties of all files contained in the package.\n\nIf the licenseInfoFromFiles field is not present for a package and filesAnalyzed property for that same package is true or omitted, it implies an equivalent meaning to NOASSERTION.",
             "type" : "array",
             "items" : {
-              "description" : "License expression for licenseInfoFromFiles. See SPDX Annex D for the license expression syntax.  The licensing information that was discovered directly within the package. There will be an instance of this property for each distinct value of alllicenseInfoInFile properties of all files contained in the package.\n\nIf the licenseInfoFromFiles field is not present for a package and filesAnalyzed property for that same pacakge is true or omitted, it implies an equivalent meaning to NOASSERTION.",
+              "description" : "License expression for licenseInfoFromFiles. See SPDX Annex D for the license expression syntax.  The licensing information that was discovered directly within the package. There will be an instance of this property for each distinct value of alllicenseInfoInFile properties of all files contained in the package.\n\nIf the licenseInfoFromFiles field is not present for a package and filesAnalyzed property for that same package is true or omitted, it implies an equivalent meaning to NOASSERTION.",
               "type" : "string"
             }
           },
@@ -531,6 +536,7 @@
           },
           "fileDependencies" : {
             "description" : "This field is deprecated since SPDX 2.0 in favor of using Section 7 which provides more granularity about relationships.",
+            "deprecated": true,
             "type" : "array",
             "items" : {
               "description" : "SPDX ID for File.  This field is deprecated since SPDX 2.0 in favor of using Section 7 which provides more granularity about relationships.",
@@ -735,6 +741,6 @@
       }
     }
   },
-  "required" : [ "SPDXID", "creationInfo", "dataLicense", "name", "spdxVersion" ],
+  "required" : [ "SPDXID", "creationInfo", "dataLicense", "name", "spdxVersion", "documentNamespace" ],
   "additionalProperties" : false
-}
+}