[midPoint-git] [Evolveum/midpoint] 263222: Add a test for explicit type inheritance

[mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 2632227841b994a6afddbb91d122c3964282a458
      https://github.com/Evolveum/midpoint/commit/2632227841b994a6afddbb91d122c3964282a458
  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/AbstractResourceObjectDefinitionImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinitionImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectClassDefinitionImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectTypeDefinitionImpl.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-additional-connectors-1.xml
    M provisioning/provisioning-impl/src/test/resources/merge/resource-additional-connectors-template.xml
    M provisioning/provisioning-impl/src/test/resources/merge/resource-basic-1.xml
    M provisioning/provisioning-impl/src/test/resources/merge/resource-basic-2.xml
    M provisioning/provisioning-impl/src/test/resources/merge/resource-basic-template.xml
    A provisioning/provisioning-impl/src/test/resources/merge/resource-explicit-type-inheritance.xml
    M provisioning/provisioning-impl/src/test/resources/merge/resource-object-types-1.xml
    M provisioning/provisioning-impl/testng-integration.xml

  Log Message:
  -----------
  Add a test for explicit type inheritance

Also adding TestResourceTemplateMerge to provisioning test suite.
And fixing minor bugs related to attribute/type documentation property.


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

  Changed paths:
    M tools/ninja/src/test/java/com/evolveum/midpoint/ninja/BaseTest.java
    M tools/ninja/src/test/java/com/evolveum/midpoint/ninja/ImportRepositoryTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


Compare: https://github.com/Evolveum/midpoint/compare/d68204174a88...a5f5aa67bc09