aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Scherzinger <info@andy-scherzinger.de>2025-01-08 19:02:21 +0100
committerGitHub <noreply@github.com>2025-01-08 19:02:21 +0100
commitf9b062d4e7385e33b497b9bd49fb2ef486dcdd71 (patch)
tree351cd484988421dbb57cca2e5973d3dc721ec8e1
parentdd0f7f0bbfb9c176fe4845458bdc62ec7b388d8f (diff)
parent4d3fbc60914d51ad3c585a07f2315688ac9781ce (diff)
downloadnextcloud-server-f9b062d4e7385e33b497b9bd49fb2ef486dcdd71.tar.gz
nextcloud-server-f9b062d4e7385e33b497b9bd49fb2ef486dcdd71.zip
Merge pull request #50085 from nextcloud/feat/noid/info-xml-spdx-license-ids
Add licenses by SPDX identifier, mark shorthand aliases as deprecated
-rw-r--r--resources/app-info-shipped.xsd9
-rw-r--r--resources/app-info.xsd9
2 files changed, 18 insertions, 0 deletions
diff --git a/resources/app-info-shipped.xsd b/resources/app-info-shipped.xsd
index a340dde30bd..7a139e50bc5 100644
--- a/resources/app-info-shipped.xsd
+++ b/resources/app-info-shipped.xsd
@@ -374,6 +374,15 @@
<xs:simpleType name="licence">
<xs:restriction base="xs:string">
+ <xs:enumeration value="AGPL-3.0-only"/>
+ <xs:enumeration value="AGPL-3.0-or-later"/>
+ <xs:enumeration value="Apache-2.0"/>
+ <xs:enumeration value="GPL-3.0-only"/>
+ <xs:enumeration value="GPL-3.0-or-later"/>
+ <xs:enumeration value="MIT"/>
+ <xs:enumeration value="MPL-2.0"/>
+
+ <!-- Deprecated -->
<xs:enumeration value="agpl"/>
<xs:enumeration value="mpl"/>
<xs:enumeration value="apache"/>
diff --git a/resources/app-info.xsd b/resources/app-info.xsd
index 76cc02a8431..9b491fd6a05 100644
--- a/resources/app-info.xsd
+++ b/resources/app-info.xsd
@@ -370,6 +370,15 @@
<xs:simpleType name="licence">
<xs:restriction base="xs:string">
+ <xs:enumeration value="AGPL-3.0-only"/>
+ <xs:enumeration value="AGPL-3.0-or-later"/>
+ <xs:enumeration value="Apache-2.0"/>
+ <xs:enumeration value="GPL-3.0-only"/>
+ <xs:enumeration value="GPL-3.0-or-later"/>
+ <xs:enumeration value="MIT"/>
+ <xs:enumeration value="MPL-2.0"/>
+
+ <!-- Deprecated -->
<xs:enumeration value="agpl"/>
<xs:enumeration value="mpl"/>
<xs:enumeration value="apache"/>