[midPoint-git] [Evolveum/midpoint] f57120: Add yet another capability merge test

[mederly]

  Branch: refs/heads/tmp/capabilities
  Home:   https://github.com/Evolveum/midpoint
  Commit: f57120c3b1de7b116a0e66c37a28228e13d5550b
      https://github.com/Evolveum/midpoint/commit/f57120c3b1de7b116a0e66c37a28228e13d5550b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2022-05-12 (Thu, 12 May 2022)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectDefinition.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/resources/TestResourceTemplateMerge.java
    M provisioning/provisioning-impl/src/test/resources/merge/resource-object-types-1.xml
    M provisioning/provisioning-impl/src/test/resources/merge/resource-object-types-template.xml

  Log Message:
  -----------
  Add yet another capability merge test


  Commit: fa14c8e4deb3546e801f9551b0d63b38f7f328c4
      https://github.com/Evolveum/midpoint/commit/fa14c8e4deb3546e801f9551b0d63b38f7f328c4
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2022-05-12 (Thu, 12 May 2022)

  Changed paths:
    M model/model-intest/src/test/resources/manual/resource-manual-capabilities.xml
    M model/model-intest/src/test/resources/manual/resource-semi-manual-disable.xml
    M testing/conntest/src/test/resources/ad-ldap-multidomain/resource-chimera-strange.xml
    M testing/story/src/test/resources/configured-capabilities-activation/resource-dummy-activation-simulated.xml

  Log Message:
  -----------
  Adapt test resources to recent changes

INCOMPATIBLE CHANGE (to release notes):

If you explicitly mention CapabilityCollectionType in your configuration
(typically as xsi:type="c:CapabilityCollectionType"), you have to change
this to "cap:CapabilityCollectionType".

This change was introduced in c91029fb651cea808aa72658900d4533de152686.
Here we just adapt a couple of test resources that refer to the legacy
name.


Compare: https://github.com/Evolveum/midpoint/compare/815394c6a0ce...fa14c8e4deb3