[midPoint-git] [Evolveum/midpoint] 190f7c: Implement correlation definition inheritance

[mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 190f7c10931c6692676a69c062267f7361f872d3
      https://github.com/Evolveum/midpoint/commit/190f7c10931c6692676a69c062267f7361f872d3
  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/merger/GenericItemMerger.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestBrokenResources.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/AbstractBasicScriptingTest.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.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
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Implement correlation definition inheritance

(Some parts of the definition were migrated from prism properties
to prism containers.)

Unrelated: assertResource with a message no longer displays
the resource. It is in line with e.g. asserting on users.