[midPoint-git] [Evolveum/midpoint] 8f0902: Add merging of additional connectors

[mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 8f090238aa1f92aac347e156a95e05434017daad
      https://github.com/Evolveum/midpoint/commit/8f090238aa1f92aac347e156a95e05434017daad
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2022-05-06 (Fri, 06 May 2022)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resources/ResourceExpansionOperation.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resources/ResourceManager.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/resources/TestResourceTemplateMerge.java
    A provisioning/provisioning-impl/src/test/resources/merge/resource-additional-connectors-1.xml
    M provisioning/provisioning-impl/src/test/resources/merge/resource-basic-1.xml
    A provisioning/provisioning-impl/src/test/resources/merge/resource-basic-2.xml
    A provisioning/provisioning-impl/src/test/resources/merge/resource-template-additional-connectors.xml
    M provisioning/provisioning-impl/src/test/resources/merge/resource-template-basic.xml
    A provisioning/provisioning-impl/src/test/resources/merge/resource-template-single-type.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/ResourceAsserter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/prism/PrismContainerValueAsserter.java

  Log Message:
  -----------
  Add merging of additional connectors


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/CheckFormGroup.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/CheckFormGroup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.html
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/OperationResultAssert.java
    M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoModifyObjectTest.java
    M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoSmokeTest.java
    M tools/jenkins/midpoint-main-pipeline

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


Compare: https://github.com/Evolveum/midpoint/compare/6d576ca4bb38...ae301be98725