"Un-deprecate" legacy correlation definitions

The new schema is still experimental, so let's stick with the old one.
Evolveum · Mar 9, 2022 · a198d60 · a198d60
1 parent d31fbc0
commit a198d60
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 17 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
@@ -8983,13 +8983,7 @@
 
                         <p>The filter in this case is conditional, i.e. there can be specified an expression
                         that denotes a necessary condition for the filter to be applied.</p>
-
-                        <p>Deprecated. Please use "correlationDefinition" instead.</p>
                     </xsd:documentation>
-                    <xsd:appinfo>
-                        <a:deprecated>true</a:deprecated>
-                        <a:deprecatedSince>4.5</a:deprecatedSince>
-                    </xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="confirmation" type="c:ExpressionType" minOccurs="0">
@@ -9005,13 +8999,7 @@
                         The expression variables should be set as follows:
                         $user - the candidate user object (one of the results of correlation expression)
                         $account - the changed account object
-
-                        <p>Deprecated. Please use "correlationDefinition" instead.</p>
                     </xsd:documentation>
-                    <xsd:appinfo>
-                        <a:deprecated>true</a:deprecated>
-                        <a:deprecatedSince>4.5</a:deprecatedSince>
-                    </xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="correlationDefinition" type="tns:CorrelationDefinitionType" minOccurs="0">
@@ -9024,6 +9012,7 @@
                     </xsd:documentation>
                     <xsd:appinfo>
                         <a:since>4.5</a:since>
+                        <a:experimental>true</a:experimental>
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>

diff --git a/model/model-impl/src/test/resources/sync/resource-dummy-limited.xml b/model/model-impl/src/test/resources/sync/resource-dummy-limited.xml
@@ -12,9 +12,7 @@
           xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3"
           xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
           xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"
-          xmlns:piracy="http://midpoint.evolveum.com/xml/ns/samples/piracy"
-          xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+          xmlns:piracy="http://midpoint.evolveum.com/xml/ns/samples/piracy">
 
     <name>Dummy Resource: Limited</name>
     <description>Dummy resource with limited sync propagation (limitPropagation=true)</description>
@@ -362,8 +360,7 @@
                 <q:equal>
                     <q:path>c:name</q:path>
                     <expression>
-                        <path>declare namespace icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3";
-                        $account/attributes/icfs:name</path>
+                        <path>$account/attributes/icfs:name</path>
                     </expression>
                 </q:equal>
             </correlation>