Do minor schema fixes

1. AbstractAuthenticationModuleType.name is no longer required (it is deprecated now). 2. Un-deprecated policySituation in policy rule. It is not completely replaced yet.
Evolveum · Mar 29, 2023 · 5959abf · 5959abf
1 parent 4889c5a
commit 5959abf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
@@ -15081,15 +15081,12 @@
                         triggered. If the situation is not explicitly stated then
                         default situation will be selected instead. The situation
                         is determined by the constraint that triggered the rule.
-                        DEPRECATED. Use markRef instead.
 
-                        TODO specify the time of planned removal
+                        Will be eventually replaced by markRef.
                     </xsd:documentation>
                     <xsd:appinfo>
                         <a:displayName>PolicyRuleType.policySituation</a:displayName>
                         <a:help>PolicyRuleType.policySituation.help</a:help>
-                        <a:deprecated>true</a:deprecated>
-                        <a:deprecatedSince>4.7</a:deprecatedSince>
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-security-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-security-3.xsd
@@ -173,7 +173,7 @@
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:sequence>
-            <xsd:element name="name" type="xsd:string" >
+            <xsd:element name="name" type="xsd:string" minOccurs="0">
                 <xsd:annotation>
                     <xsd:documentation>
                         Unique name of the authentication module. This name is fact a short identifier.