*: Add <obsoletedBys> wrapping <obsoletedBy>

The Node tests were choking with: Entity: line 65: element element: Schemas parser error : Element '{http://www.w3.org/2001/XMLSchema}element': Invalid value for maxOccurs (must be 0 or 1). which is mentioned in [1]. Despite unbounded being in the 1.0 spec, maxOccurs was restricted to 1 inside <all> in XSD 1.0. The restriction was lifted in 1.1 [2]. The backing libxml issue is [3]. This commit works around the limitation by adding a wrapping <obsoletedBys> to mirror our existing <crossRefs> wrapping <crossRef>. In both cases, the wrapper adds no useful semantics, but we need it to get the tests passing until we can find an XSD 1.1 validator. [1]: albanm/node-libxml-xsd#12 [2]: https://www.w3.org/TR/xmlschema11-1/#ch_models [3]: https://bugzilla.gnome.org/show_bug.cgi?id=765936
spdx · Mar 24, 2018 · a6df410 · a6df410
1 parent a5ef633
commit a6df410
Show file tree

Hide file tree

Showing 29 changed files with 116 additions and 48 deletions.
diff --git a/schema/ListedLicense.xsd b/schema/ListedLicense.xsd
@@ -42,7 +42,7 @@
 			</documentation>
 		</annotation>
 		<all>
-			<element name="obsoletedBy" type="tns:obsoletedByType" minOccurs="0" maxOccurs="unbounded" />
+			<element name="obsoletedBys" type="tns:obsoletedBysType" minOccurs="0" maxOccurs="1" />
 			<element name="crossRefs" type="tns:crossRefsType" minOccurs="0" maxOccurs="1"/>
 			<element name="notes" type="tns:formattedFixedTextType" minOccurs="0" maxOccurs="1"/>
 			<element name="text" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
@@ -62,7 +62,7 @@
 			</documentation>
 		</annotation>
 		<all>
-			<element name="obsoletedBy" type="tns:obsoletedByType" minOccurs="0" maxOccurs="unbounded" />
+			<element name="obsoletedBys" type="tns:obsoletedBysType" minOccurs="0" maxOccurs="1" />
 			<element name="crossRefs" type="tns:crossRefsType" minOccurs="0" maxOccurs="1"/>
 			<element name="notes" type="tns:formattedFixedTextType" minOccurs="0" maxOccurs="1">
 				<annotation>
@@ -167,6 +167,18 @@
 			</element>
 		</sequence>
 	</complexType>
+	<complexType name="obsoletedBysType">
+		<annotation>
+			<documentation xml:lang="en">
+				<xhtml:p>
+					<xhtml:code>obsoletedBysType</xhtml:code> is a wrapper for a set of <xhtml:code>obsoletedBy</xhtml:code> entries.
+				</xhtml:p>
+			</documentation>
+		</annotation>
+		<sequence>
+			<element name="obsoletedBy" type="tns:obsoletedByType" minOccurs="1" maxOccurs="unbounded" />
+		</sequence>
+	</complexType>
 	<complexType name="obsoletedByType" mixed="true">
 		<annotation>
 			<documentation xml:lang="en">

diff --git a/src/AGPL-1.0.xml b/src/AGPL-1.0.xml
@@ -3,8 +3,10 @@
    <license isOsiApproved="false" licenseId="AGPL-1.0"
             name="Affero General Public License v1.0"
             isDeprecated="true" deprecatedVersion="3.1">
-      <obsoletedBy>AGPL-1.0-only</obsoletedBy>
-      <obsoletedBy expression="AGPL-1.0+">AGPL-1.0-or-later</obsoletedBy>
+      <obsoletedBys>
+         <obsoletedBy>AGPL-1.0-only</obsoletedBy>
+         <obsoletedBy expression="AGPL-1.0+">AGPL-1.0-or-later</obsoletedBy>
+      </obsoletedBys>
       <crossRefs>
          <crossRef>http://www.affero.org/oagpl.html</crossRef>
       </crossRefs>

diff --git a/src/AGPL-3.0.xml b/src/AGPL-3.0.xml
@@ -3,8 +3,10 @@
   <license licenseId="AGPL-3.0" isOsiApproved="true"
   name="GNU Affero General Public License v3.0"
   isDeprecated="true" deprecatedVersion="3.0">
-    <obsoletedBy>AGPL-3.0-only</obsoletedBy>
-    <obsoletedBy expression="AGPL-3.0+">AGPL-3.0-or-later</obsoletedBy>
+    <obsoletedBys>
+      <obsoletedBy>AGPL-3.0-only</obsoletedBy>
+      <obsoletedBy expression="AGPL-3.0+">AGPL-3.0-or-later</obsoletedBy>
+    </obsoletedBys>
     <crossRefs>
       <crossRef>http://www.gnu.org/licenses/agpl.txt</crossRef>
       <crossRef>http://www.opensource.org/licenses/AGPL-3.0</crossRef>

diff --git a/src/GFDL-1.1.xml b/src/GFDL-1.1.xml
@@ -3,8 +3,10 @@
   <license licenseId="GFDL-1.1" isOsiApproved="false"
   name="GNU Free Documentation License v1.1"
   isDeprecated="true" deprecatedVersion="3.0">
-    <obsoletedBy>GFDL-1.1-only</obsoletedBy>
-    <obsoletedBy expression="GFDL-1.1+">GFDL-1.1-or-later</obsoletedBy>
+    <obsoletedBys>
+      <obsoletedBy>GFDL-1.1-only</obsoletedBy>
+      <obsoletedBy expression="GFDL-1.1+">GFDL-1.1-or-later</obsoletedBy>
+    </obsoletedBys>
     <crossRefs>
       <crossRef>http://www.gnu.org/licenses/old-licenses/fdl-1.1.txt</crossRef>
     </crossRefs>

diff --git a/src/GFDL-1.2.xml b/src/GFDL-1.2.xml
@@ -3,8 +3,10 @@
   <license licenseId="GFDL-1.2" isOsiApproved="false"
   name="GNU Free Documentation License v1.2"
   isDeprecated="true" deprecatedVersion="3.0">
-    <obsoletedBy>GFDL-1.2-only</obsoletedBy>
-    <obsoletedBy expression="GFDL-1.2+">GFDL-1.2-or-later</obsoletedBy>
+    <obsoletedBys>
+      <obsoletedBy>GFDL-1.2-only</obsoletedBy>
+      <obsoletedBy expression="GFDL-1.2+">GFDL-1.2-or-later</obsoletedBy>
+    </obsoletedBys>
     <crossRefs>
       <crossRef>http://www.gnu.org/licenses/old-licenses/fdl-1.2.txt</crossRef>
     </crossRefs>

diff --git a/src/GFDL-1.3.xml b/src/GFDL-1.3.xml
@@ -3,8 +3,10 @@
   <license licenseId="GFDL-1.3" isOsiApproved="false"
   name="GNU Free Documentation License v1.3"
   isDeprecated="true" deprecatedVersion="3.0">
-    <obsoletedBy>GFDL-1.3-only</obsoletedBy>
-    <obsoletedBy expression="GFDL-1.3+">GFDL-1.3-or-later</obsoletedBy>
+    <obsoletedBys>
+      <obsoletedBy>GFDL-1.3-only</obsoletedBy>
+      <obsoletedBy expression="GFDL-1.3+">GFDL-1.3-or-later</obsoletedBy>
+    </obsoletedBys>
     <crossRefs>
       <crossRef>http://www.gnu.org/licenses/fdl-1.3.txt</crossRef>
     </crossRefs>

diff --git a/src/GPL-1.0+.xml b/src/GPL-1.0+.xml
@@ -2,7 +2,9 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
    <license isDeprecated="true" deprecatedVersion="2.0rc2" isOsiApproved="false" licenseId="GPL-1.0+"
             name="GNU General Public License v1.0 or later">
-      <obsoletedBy>GPL-1.0-or-later</obsoletedBy>
+      <obsoletedBys>
+         <obsoletedBy>GPL-1.0-or-later</obsoletedBy>
+      </obsoletedBys>
       <crossRefs>
          <crossRef>http://www.gnu.org/licenses/old-licenses/gpl-1.0-standalone.html</crossRef>
       </crossRefs>

diff --git a/src/GPL-1.0.xml b/src/GPL-1.0.xml
@@ -3,8 +3,10 @@
   <license licenseId="GPL-1.0" isOsiApproved="false"
   name="GNU General Public License v1.0 only"
   isDeprecated="true" deprecatedVersion="3.0">
-    <obsoletedBy>GPL-1.0-only</obsoletedBy>
-    <obsoletedBy expression="GPL-1.0+">GPL-1.0-or-later</obsoletedBy>
+    <obsoletedBys>
+      <obsoletedBy>GPL-1.0-only</obsoletedBy>
+      <obsoletedBy expression="GPL-1.0+">GPL-1.0-or-later</obsoletedBy>
+    </obsoletedBys>
     <crossRefs>
       <crossRef>http://www.gnu.org/licenses/old-licenses/gpl-1.0-standalone.html</crossRef>
     </crossRefs>

diff --git a/src/GPL-2.0+.xml b/src/GPL-2.0+.xml
@@ -2,7 +2,9 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
    <license isOsiApproved="true" licenseId="GPL-2.0+" isDeprecated="true" deprecatedVersion="2.0rc2"
             name="GNU General Public License v2.0 or later">
-      <obsoletedBy>GPL-2.0-or-later</obsoletedBy>
+      <obsoletedBys>
+         <obsoletedBy>GPL-2.0-or-later</obsoletedBy>
+      </obsoletedBys>
       <crossRefs>
          <crossRef>http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html</crossRef>
          <crossRef>http://www.opensource.org/licenses/GPL-2.0</crossRef>

diff --git a/src/GPL-2.0-with-GCC-exception.xml b/src/GPL-2.0-with-GCC-exception.xml
@@ -2,8 +2,10 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
    <license isDeprecated="true" deprecatedVersion="2.0rc2" licenseId="GPL-2.0-with-GCC-exception"
             name="GNU General Public License v2.0 w/GCC Runtime Library exception">
-      <obsoletedBy>GPL-2.0 WITH GCC-exception-2.0</obsoletedBy>
-      <obsoletedBy expression="GPL-2.0-with-GCC-exception+">GPL-2.0-or-later WITH GCC-exception-2.0</obsoletedBy>
+      <obsoletedBys>
+         <obsoletedBy>GPL-2.0 WITH GCC-exception-2.0</obsoletedBy>
+         <obsoletedBy expression="GPL-2.0-with-GCC-exception+">GPL-2.0-or-later WITH GCC-exception-2.0</obsoletedBy>
+      </obsoletedBys>
       <crossRefs>
          <crossRef>https://gcc.gnu.org/git/?p=gcc.git;a=blob;f=gcc/libgcc1.c;h=762f5143fc6eed57b6797c82710f3538aa52b40b;hb=cb143a3ce4fb417c68f5fa2691a1b1b1053dfba9#l10</crossRef>
       </crossRefs>

diff --git a/src/GPL-2.0-with-autoconf-exception.xml b/src/GPL-2.0-with-autoconf-exception.xml
@@ -2,8 +2,10 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
    <license isDeprecated="true" deprecatedVersion="2.0rc2" licenseId="GPL-2.0-with-autoconf-exception"
             name="GNU General Public License v2.0 w/Autoconf exception">
-      <obsoletedBy>GPL-2.0 WITH Autoconf-exception-2.0</obsoletedBy>
-      <obsoletedBy expression="GPL-2.0-with-autoconf-exception+">GPL-2.0-or-later WITH Autoconf-exception-2.0</obsoletedBy>
+      <obsoletedBys>
+         <obsoletedBy>GPL-2.0 WITH Autoconf-exception-2.0</obsoletedBy>
+         <obsoletedBy expression="GPL-2.0-with-autoconf-exception+">GPL-2.0-or-later WITH Autoconf-exception-2.0</obsoletedBy>
+      </obsoletedBys>
       <crossRefs>
          <crossRef>http://ac-archive.sourceforge.net/doc/copyright.html</crossRef>
       </crossRefs>

diff --git a/src/GPL-2.0-with-bison-exception.xml b/src/GPL-2.0-with-bison-exception.xml
@@ -2,8 +2,10 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
    <license isDeprecated="true" deprecatedVersion="2.0rc2" licenseId="GPL-2.0-with-bison-exception"
             name="GNU General Public License v2.0 w/Bison exception">
-      <obsoletedBy>GPL-2.0 WITH Bison-exception-2.2</obsoletedBy>
-      <obsoletedBy expression="GPL-2.0-with-bison-exception+">GPL-2.0-or-later WITH Bison-exception-2.2</obsoletedBy>
+      <obsoletedBys>
+         <obsoletedBy>GPL-2.0 WITH Bison-exception-2.2</obsoletedBy>
+         <obsoletedBy expression="GPL-2.0-with-bison-exception+">GPL-2.0-or-later WITH Bison-exception-2.2</obsoletedBy>
+      </obsoletedBys>
       <crossRefs>
          <crossRef>http://git.savannah.gnu.org/cgit/bison.git/tree/data/yacc.c?id=193d7c7054ba7197b0789e14965b739162319b5e#n141</crossRef>
       </crossRefs>

diff --git a/src/GPL-2.0-with-classpath-exception.xml b/src/GPL-2.0-with-classpath-exception.xml
@@ -2,8 +2,10 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
    <license isDeprecated="true" deprecatedVersion="2.0rc2" licenseId="GPL-2.0-with-classpath-exception"
             name="GNU General Public License v2.0 w/Classpath exception">
-      <obsoletedBy>GPL-2.0 WITH Classpath-exception-2.0</obsoletedBy>
-      <obsoletedBy expression="GPL-2.0-with-classpath-exception+">GPL-2.0-or-later WITH Classpath-exception-2.0</obsoletedBy>
+      <obsoletedBys>
+         <obsoletedBy>GPL-2.0 WITH Classpath-exception-2.0</obsoletedBy>
+         <obsoletedBy expression="GPL-2.0-with-classpath-exception+">GPL-2.0-or-later WITH Classpath-exception-2.0</obsoletedBy>
+      </obsoletedBys>
       <crossRefs>
          <crossRef>http://www.gnu.org/software/classpath/license.html</crossRef>
       </crossRefs>

diff --git a/src/GPL-2.0-with-font-exception.xml b/src/GPL-2.0-with-font-exception.xml
@@ -2,8 +2,10 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
    <license isDeprecated="true" deprecatedVersion="2.0rc2" licenseId="GPL-2.0-with-font-exception"
             name="GNU General Public License v2.0 w/Font exception">
-      <obsoletedBy>GPL-2.0 WITH Font-exception-2.0</obsoletedBy>
-      <obsoletedBy expression="GPL-2.0-with-font-exception+">GPL-2.0-or-later+ WITH Font-exception-2.0</obsoletedBy>
+      <obsoletedBys>
+         <obsoletedBy>GPL-2.0 WITH Font-exception-2.0</obsoletedBy>
+         <obsoletedBy expression="GPL-2.0-with-font-exception+">GPL-2.0-or-later+ WITH Font-exception-2.0</obsoletedBy>
+      </obsoletedBys>
       <crossRefs>
          <crossRef>http://www.gnu.org/licenses/gpl-faq.html#FontException</crossRef>
       </crossRefs>

diff --git a/src/GPL-2.0.xml b/src/GPL-2.0.xml
@@ -3,8 +3,10 @@
   <license licenseId="GPL-2.0" isOsiApproved="true"
   name="GNU General Public License v2.0 only"
   isDeprecated="true" deprecatedVersion="3.0">
-    <obsoletedBy>GPL-2.0-only</obsoletedBy>
-    <obsoletedBy expression="GPL-2.0+">GPL-2.0-or-later</obsoletedBy>
+    <obsoletedBys>
+      <obsoletedBy>GPL-2.0-only</obsoletedBy>
+      <obsoletedBy expression="GPL-2.0+">GPL-2.0-or-later</obsoletedBy>
+    </obsoletedBys>
     <crossRefs>
       <crossRef>http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html</crossRef>
       <crossRef>http://www.opensource.org/licenses/GPL-2.0</crossRef>

diff --git a/src/GPL-3.0+.xml b/src/GPL-3.0+.xml
@@ -2,7 +2,9 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
    <license isOsiApproved="true" licenseId="GPL-3.0+" isDeprecated="true" deprecatedVersion="2.0rc2"
             name="GNU General Public License v3.0 or later">
-      <obsoletedBy>GPL-3.0-or-later</obsoletedBy>
+      <obsoletedBys>
+         <obsoletedBy>GPL-3.0-or-later</obsoletedBy>
+      </obsoletedBys>
       <crossRefs>
          <crossRef>http://www.gnu.org/licenses/gpl-3.0-standalone.html</crossRef>
          <crossRef>http://www.opensource.org/licenses/GPL-3.0</crossRef>

diff --git a/src/GPL-3.0-with-GCC-exception.xml b/src/GPL-3.0-with-GCC-exception.xml
@@ -2,8 +2,10 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
    <license isOsiApproved="true" licenseId="GPL-3.0-with-GCC-exception" isDeprecated="true" deprecatedVersion="2.0rc2"
             name="GNU General Public License v3.0 w/GCC Runtime Library exception">
-      <obsoletedBy>GPL-3.0 WITH GCC-exception-3.1</obsoletedBy>
-      <obsoletedBy expression="GPL-3.0-with-GCC-exception+">GPL-3.0-or-later WITH GCC-exception-3.1</obsoletedBy>
+      <obsoletedBys>
+         <obsoletedBy>GPL-3.0 WITH GCC-exception-3.1</obsoletedBy>
+         <obsoletedBy expression="GPL-3.0-with-GCC-exception+">GPL-3.0-or-later WITH GCC-exception-3.1</obsoletedBy>
+      </obsoletedBys>
       <crossRefs>
          <crossRef>http://www.gnu.org/licenses/gcc-exception-3.1.html</crossRef>
       </crossRefs>

diff --git a/src/GPL-3.0-with-autoconf-exception.xml b/src/GPL-3.0-with-autoconf-exception.xml
@@ -2,8 +2,10 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
    <license isDeprecated="true" deprecatedVersion="2.0rc2" licenseId="GPL-3.0-with-autoconf-exception"
             name="GNU General Public License v3.0 w/Autoconf exception">
-      <obsoletedBy>GPL-3.0 WITH Autoconf-exception-3.0</obsoletedBy>
-      <obsoletedBy expression="GPL-3.0-with-autoconf-exception+">GPL-3.0-or-later WITH Autoconf-exception-3.0</obsoletedBy>
+      <obsoletedBys>
+         <obsoletedBy>GPL-3.0 WITH Autoconf-exception-3.0</obsoletedBy>
+         <obsoletedBy expression="GPL-3.0-with-autoconf-exception+">GPL-3.0-or-later WITH Autoconf-exception-3.0</obsoletedBy>
+      </obsoletedBys>
       <crossRefs>
          <crossRef>http://www.gnu.org/licenses/autoconf-exception-3.0.html</crossRef>
       </crossRefs>

diff --git a/src/GPL-3.0.xml b/src/GPL-3.0.xml
@@ -3,8 +3,10 @@
   <license licenseId="GPL-3.0" isOsiApproved="true"
   name="GNU General Public License v3.0 only"
   isDeprecated="true" deprecatedVersion="3.0">
-    <obsoletedBy>GPL-3.0-only</obsoletedBy>
-    <obsoletedBy expression="GPL-3.0+">GPL-3.0-or-later</obsoletedBy>
+    <obsoletedBys>
+      <obsoletedBy>GPL-3.0-only</obsoletedBy>
+      <obsoletedBy expression="GPL-3.0+">GPL-3.0-or-later</obsoletedBy>
+    </obsoletedBys>
     <crossRefs>
       <crossRef>http://www.gnu.org/licenses/gpl-3.0-standalone.html</crossRef>
       <crossRef>http://www.opensource.org/licenses/GPL-3.0</crossRef>

diff --git a/src/LGPL-2.0+.xml b/src/LGPL-2.0+.xml
@@ -2,7 +2,9 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
    <license isOsiApproved="true" licenseId="LGPL-2.0+" isDeprecated="true" deprecatedVersion="2.0rc2"
             name="GNU Library General Public License v2 or later">
-      <obsoletedBy>LGPL-2.0-or-later</obsoletedBy>
+      <obsoletedBys>
+         <obsoletedBy>LGPL-2.0-or-later</obsoletedBy>
+      </obsoletedBys>
       <crossRefs>
          <crossRef>http://www.gnu.org/licenses/old-licenses/lgpl-2.0-standalone.html</crossRef>
       </crossRefs>

diff --git a/src/LGPL-2.0.xml b/src/LGPL-2.0.xml
@@ -3,8 +3,10 @@
   <license licenseId="LGPL-2.0" isOsiApproved="true"
   name="GNU Library General Public License v2 only"
   isDeprecated="true" deprecatedVersion="3.0">
-    <obsoletedBy>LGPL-2.0-only</obsoletedBy>
-    <obsoletedBy expression="LGPL-2.0+">LGPL-2.0-or-later</obsoletedBy>
+    <obsoletedBys>
+      <obsoletedBy>LGPL-2.0-only</obsoletedBy>
+      <obsoletedBy expression="LGPL-2.0+">LGPL-2.0-or-later</obsoletedBy>
+    </obsoletedBys>
     <crossRefs>
       <crossRef>http://www.gnu.org/licenses/old-licenses/lgpl-2.0-standalone.html</crossRef>
     </crossRefs>

diff --git a/src/LGPL-2.1+.xml b/src/LGPL-2.1+.xml
@@ -2,7 +2,9 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
    <license isOsiApproved="true" licenseId="LGPL-2.1+"  isDeprecated="true" deprecatedVersion="2.0rc2"
             name="GNU Library General Public License v2.1 or later">
-      <obsoletedBy>LGPL-2.1-or-later</obsoletedBy>
+      <obsoletedBys>
+         <obsoletedBy>LGPL-2.1-or-later</obsoletedBy>
+      </obsoletedBys>
       <crossRefs>
          <crossRef>http://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html</crossRef>
          <crossRef>http://www.opensource.org/licenses/LGPL-2.1</crossRef>

diff --git a/src/LGPL-2.1.xml b/src/LGPL-2.1.xml
@@ -3,8 +3,10 @@
   <license licenseId="LGPL-2.1" isOsiApproved="true"
   name="GNU Lesser General Public License v2.1 only"
   isDeprecated="true" deprecatedVersion="3.0">
-    <obsoletedBy>LGPL-2.1-only</obsoletedBy>
-    <obsoletedBy expression="LGPL-2.1+">LGPL-2.1-or-later</obsoletedBy>
+    <obsoletedBys>
+      <obsoletedBy>LGPL-2.1-only</obsoletedBy>
+      <obsoletedBy expression="LGPL-2.1+">LGPL-2.1-or-later</obsoletedBy>
+    </obsoletedBys>
     <crossRefs>
       <crossRef>http://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html</crossRef>
       <crossRef>http://www.opensource.org/licenses/LGPL-2.1</crossRef>

diff --git a/src/LGPL-3.0+.xml b/src/LGPL-3.0+.xml
@@ -2,7 +2,9 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
    <license isOsiApproved="true" licenseId="LGPL-3.0+"  isDeprecated="true" deprecatedVersion="2.0rc2"
             name="GNU Lesser General Public License v3.0 or later">
-      <obsoletedBy>LGPL-3.0-or-later</obsoletedBy>
+      <obsoletedBys>
+         <obsoletedBy>LGPL-3.0-or-later</obsoletedBy>
+      </obsoletedBys>
       <crossRefs>
          <crossRef>http://www.gnu.org/licenses/lgpl-3.0-standalone.html</crossRef>
          <crossRef>http://www.opensource.org/licenses/LGPL-3.0</crossRef>

diff --git a/src/LGPL-3.0.xml b/src/LGPL-3.0.xml
@@ -3,8 +3,10 @@
   <license licenseId="LGPL-3.0" isOsiApproved="true"
   name="GNU Lesser General Public License v3.0 only"
   isDeprecated="true" deprecatedVersion="3.0">
-    <obsoletedBy>LGPL-3.0-only</obsoletedBy>
-    <obsoletedBy expression="LGPL-3.0+">LGPL-3.0-or-later</obsoletedBy>
+    <obsoletedBys>
+      <obsoletedBy>LGPL-3.0-only</obsoletedBy>
+      <obsoletedBy expression="LGPL-3.0+">LGPL-3.0-or-later</obsoletedBy>
+    </obsoletedBys>
     <crossRefs>
       <crossRef>http://www.gnu.org/licenses/lgpl-3.0-standalone.html</crossRef>
       <crossRef>http://www.opensource.org/licenses/LGPL-3.0</crossRef>

diff --git a/src/Nunit.xml b/src/Nunit.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
    <license isDeprecated="true" deprecatedVersion="3.0" licenseId="Nunit" name="Nunit License">
-      <obsoletedBy>zlib-acknowledgement</obsoletedBy>
+      <obsoletedBys>
+         <obsoletedBy>zlib-acknowledgement</obsoletedBy>
+      </obsoletedBys>
       <crossRefs>
          <crossRef>https://fedoraproject.org/wiki/Licensing/Nunit</crossRef>
       </crossRefs>

diff --git a/src/StandardML-NJ.xml b/src/StandardML-NJ.xml
@@ -2,7 +2,9 @@
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
    <license isOsiApproved="false" licenseId="StandardML-NJ" isDeprecated="true" deprecatedVersion="2.0rc2"
             name="Standard ML of New Jersey License">
-      <obsoletedBy>SMLNJ</obsoletedBy>
+      <obsoletedBys>
+         <obsoletedBy>SMLNJ</obsoletedBy>
+      </obsoletedBys>
       <crossRefs>
          <crossRef>http://www.smlnj.org//license.html</crossRef>
       </crossRefs>

diff --git a/src/eCos-2.0.xml b/src/eCos-2.0.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
    <license isDeprecated="true" deprecatedVersion="2.0rc2" licenseId="eCos-2.0" name="eCos license version 2.0">
-      <obsoletedBy>GPL-2.0-or-later WITH eCos-exception-2.0</obsoletedBy>
+      <obsoletedBys>
+          <obsoletedBy>GPL-2.0-or-later WITH eCos-exception-2.0</obsoletedBy>
+      </obsoletedBys>
       <crossRefs>
          <crossRef>http://www.gnu.org/licenses/ecos-license.html</crossRef>
       </crossRefs>

diff --git a/src/wxWindows.xml b/src/wxWindows.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SPDXLicenseCollection xmlns="http://www.spdx.org/license">
    <license licenseId="wxWindows" name="wxWindows Library License"  isDeprecated="true" deprecatedVersion="2.0rc2">
-      <obsoletedBy>GPL-2.0-or-later WITH WxWindows-exception-3.1</obsoletedBy>
+      <obsoletedBys>
+         <obsoletedBy>GPL-2.0-or-later WITH WxWindows-exception-3.1</obsoletedBy>
+      </obsoletedBys>
       <crossRefs>
          <crossRef>http://www.opensource.org/licenses/WXwindows</crossRef>
       </crossRefs>