Merge branch 'master' of github.com:Evolveum/midpoint

* 'master' of github.com:Evolveum/midpoint: fixed typo in xml (disableInsteadOfDelete), hopefully fixing jenkins
Evolveum · Jul 18, 2023 · dd67038 · dd67038
2 parents e6f138e + fa2e69b
commit dd67038
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/model/model-intest/src/test/resources/mapping/predefined/resource-dummy-predefine-all.xml b/model/model-intest/src/test/resources/mapping/predefined/resource-dummy-predefine-all.xml
@@ -106,9 +106,9 @@
                         </expression>
                     </outbound>
                 </administrativeStatus>
-                <disableInsteadDelete>
+                <disableInsteadOfDelete>
                     <lifecycleState>active</lifecycleState>
-                </disableInsteadDelete>
+                </disableInsteadOfDelete>
                 <delayedDelete>
                     <deleteAfter>P1M</deleteAfter>
                 </delayedDelete>

diff --git a/...-intest/src/test/resources/mapping/predefined/resource-dummy-predefine-delayed-delete.xml b/...-intest/src/test/resources/mapping/predefined/resource-dummy-predefine-delayed-delete.xml
@@ -106,9 +106,9 @@
                         </expression>
                     </outbound>
                 </administrativeStatus>
-                <disableInsteadDelete>
+                <disableInsteadOfDelete>
                     <lifecycleState>active</lifecycleState>
-                </disableInsteadDelete>
+                </disableInsteadOfDelete>
                 <delayedDelete>
                     <deleteAfter>P5D</deleteAfter>
                 </delayedDelete>

diff --git a/...l-intest/src/test/resources/mapping/predefined/resource-dummy-predefine-pre-provision.xml b/...l-intest/src/test/resources/mapping/predefined/resource-dummy-predefine-pre-provision.xml
@@ -106,9 +106,9 @@
                         </expression>
                     </outbound>
                 </administrativeStatus>
-                <disableInsteadDelete>
+                <disableInsteadOfDelete>
                     <lifecycleState>active</lifecycleState>
-                </disableInsteadDelete>
+                </disableInsteadOfDelete>
                 <preProvision>
                     <createBefore>-P5D</createBefore>
                 </preProvision>