Merge pull request #60294 from nextcloud/backport/60212/stable31

[stable31] feat(app-licenses): Add further compatible licenses for apps to use

Author: AndyScherzinger

resources/app-info-shipped.xsd

@@ -374,13 +374,31 @@
 
     <xs:simpleType name="licence">
         <xs:restriction base="xs:string">
+            <!-- Requires Nextcloud minVersion >= 31 -->
+            <xs:enumeration value="0BSD"/>
             <xs:enumeration value="AGPL-3.0-only"/>
             <xs:enumeration value="AGPL-3.0-or-later"/>
             <xs:enumeration value="Apache-2.0"/>
+            <xs:enumeration value="BSD-2-Clause"/>
+            <xs:enumeration value="BSD-3-Clause"/>
+            <xs:enumeration value="BSD-3-Clause-Clear"/>
+            <xs:enumeration value="CC0-1.0"/>
+            <xs:enumeration value="EUPL-1.2"/>
+            <xs:enumeration value="FSFAP"/>
+            <xs:enumeration value="GPL-2.0-or-later"/>
             <xs:enumeration value="GPL-3.0-only"/>
             <xs:enumeration value="GPL-3.0-or-later"/>
+            <xs:enumeration value="LGPL-2.1-only"/>
+            <xs:enumeration value="LGPL-2.1-or-later"/>
+            <xs:enumeration value="LGPL-3.0-only"/>
+            <xs:enumeration value="LGPL-3.0-or-later"/>
             <xs:enumeration value="MIT"/>
             <xs:enumeration value="MPL-2.0"/>
+            <xs:enumeration value="OLDAP-2.7"/>
+            <xs:enumeration value="PDDL-1.0"/>
+            <xs:enumeration value="SAX-PD"/>
+            <xs:enumeration value="Unlicense"/>
+            <xs:enumeration value="X11"/>
 
             <!-- Deprecated -->
             <xs:enumeration value="agpl"/>
@@ -408,7 +426,7 @@
 
     <xs:complexType name="settings">
         <xs:sequence>
-			<xs:element name="admin" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="admin" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element name="admin-section" type="php-class" minOccurs="0"
                         maxOccurs="unbounded"/>
             <xs:element name="personal" type="php-class" minOccurs="0"

resources/app-info.xsd

@@ -370,13 +370,31 @@
 
     <xs:simpleType name="licence">
         <xs:restriction base="xs:string">
+            <!-- Requires Nextcloud minVersion >= 31 -->
+            <xs:enumeration value="0BSD"/>
             <xs:enumeration value="AGPL-3.0-only"/>
             <xs:enumeration value="AGPL-3.0-or-later"/>
             <xs:enumeration value="Apache-2.0"/>
+            <xs:enumeration value="BSD-2-Clause"/>
+            <xs:enumeration value="BSD-3-Clause"/>
+            <xs:enumeration value="BSD-3-Clause-Clear"/>
+            <xs:enumeration value="CC0-1.0"/>
+            <xs:enumeration value="EUPL-1.2"/>
+            <xs:enumeration value="FSFAP"/>
+            <xs:enumeration value="GPL-2.0-or-later"/>
             <xs:enumeration value="GPL-3.0-only"/>
             <xs:enumeration value="GPL-3.0-or-later"/>
+            <xs:enumeration value="LGPL-2.1-only"/>
+            <xs:enumeration value="LGPL-2.1-or-later"/>
+            <xs:enumeration value="LGPL-3.0-only"/>
+            <xs:enumeration value="LGPL-3.0-or-later"/>
             <xs:enumeration value="MIT"/>
             <xs:enumeration value="MPL-2.0"/>
+            <xs:enumeration value="OLDAP-2.7"/>
+            <xs:enumeration value="PDDL-1.0"/>
+            <xs:enumeration value="SAX-PD"/>
+            <xs:enumeration value="Unlicense"/>
+            <xs:enumeration value="X11"/>
 
             <!-- Deprecated -->
             <xs:enumeration value="agpl"/>