Skip to content

Commit f9b062d

Browse files
Merge pull request #50085 from nextcloud/feat/noid/info-xml-spdx-license-ids
Add licenses by SPDX identifier, mark shorthand aliases as deprecated
2 parents dd0f7f0 + 4d3fbc6 commit f9b062d

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

resources/app-info-shipped.xsd

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,15 @@
374374

375375
<xs:simpleType name="licence">
376376
<xs:restriction base="xs:string">
377+
<xs:enumeration value="AGPL-3.0-only"/>
378+
<xs:enumeration value="AGPL-3.0-or-later"/>
379+
<xs:enumeration value="Apache-2.0"/>
380+
<xs:enumeration value="GPL-3.0-only"/>
381+
<xs:enumeration value="GPL-3.0-or-later"/>
382+
<xs:enumeration value="MIT"/>
383+
<xs:enumeration value="MPL-2.0"/>
384+
385+
<!-- Deprecated -->
377386
<xs:enumeration value="agpl"/>
378387
<xs:enumeration value="mpl"/>
379388
<xs:enumeration value="apache"/>

resources/app-info.xsd

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,15 @@
370370

371371
<xs:simpleType name="licence">
372372
<xs:restriction base="xs:string">
373+
<xs:enumeration value="AGPL-3.0-only"/>
374+
<xs:enumeration value="AGPL-3.0-or-later"/>
375+
<xs:enumeration value="Apache-2.0"/>
376+
<xs:enumeration value="GPL-3.0-only"/>
377+
<xs:enumeration value="GPL-3.0-or-later"/>
378+
<xs:enumeration value="MIT"/>
379+
<xs:enumeration value="MPL-2.0"/>
380+
381+
<!-- Deprecated -->
373382
<xs:enumeration value="agpl"/>
374383
<xs:enumeration value="mpl"/>
375384
<xs:enumeration value="apache"/>

0 commit comments

Comments
 (0)