Merge pull request #159 from spdx/updatexsd

Update the license list XSD
spdx · Apr 15, 2023 · ad7d78b · ad7d78b
2 parents 2b5adde + e6fd590
commit ad7d78b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 12 deletions.
diff --git a/TestFiles/test-license.xml b/TestFiles/test-license.xml
@@ -30,7 +30,7 @@
 		</p>
 	  </text>
 	</license>
-	<license name="Test Deprecated License" licenseId="test-dep" isOsiApproved="false" isDeprecated="true" deprecatedVersion="2.2">
+	<license name="Test Deprecated License" licenseId="test-dep" isOsiApproved="false" deprecatedVersion="2.2">
 		<notes>Test dep note</notes>
 		<crossRefs>
 			<crossRef>http://test/url1d</crossRef>

diff --git a/src/org/spdx/licenselistpublisher/LicenseRDFAGenerator.java b/src/org/spdx/licenselistpublisher/LicenseRDFAGenerator.java
@@ -387,7 +387,6 @@ private static void writeExceptionList(String version, String releaseDate,
 						}
 					}
 					// check for a license ID with the same ID as the exception
-
 					addedExceptionsMap.put(nextException.getLicenseExceptionId(), nextException.getLicenseExceptionText());
 				}
 				if (licenseIds.contains(nextException.getLicenseExceptionId())) {

diff --git a/src/org/spdx/licensexml/ListedLicense.xsd b/src/org/spdx/licensexml/ListedLicense.xsd
@@ -48,7 +48,6 @@
 			<element name="text" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
 		</all>
 		<attribute name="licenseId" type="string" use="required" />
-		<attribute name="isDeprecated" type="boolean"/>
 		<attribute name="name" type="string" use="required" />
 		<attribute name="listVersionAdded" type="string"/>
 		<attribute name="deprecatedVersion" type="string"/>
@@ -110,15 +109,6 @@
 				</documentation>
 			</annotation>
 		</attribute>
-		<attribute name="isDeprecated" type="boolean">
-			<annotation>
-				<documentation xml:lang="en">
-					<xhtml:p>
-						<xhtml:code>isDeprecated</xhtml:code> is true if and only if the short identifier has been superseded by another.  See the <xhtml:code>deprecatedVersion</xhtml:code> documentation for more details.
-					</xhtml:p>
-				</documentation>
-			</annotation>
-		</attribute>
 		<attribute name="name" type="string" use="required">
 			<annotation>
 				<documentation xml:lang="en">
-Original file line number
+Diff line change
@@ Expand Up @@
     						}
     					}
     					// check for a license ID with the same ID as the exception
     					addedExceptionsMap.put(nextException.getLicenseExceptionId(), nextException.getLicenseExceptionText());
     				}
     				if (licenseIds.contains(nextException.getLicenseExceptionId())) {
@@ Expand Down @@