[midPoint-git] [Evolveum/midpoint] dd7dd7: fix fo MID-6009 - ITSM Manual connector shadow con...

[Katarina Valalikova]

  Branch: refs/heads/support-4.0
  Home:   https://github.com/Evolveum/midpoint
  Commit: dd7dd75d06d5bd27327589ae9c00172d12c27b0b
      https://github.com/Evolveum/midpoint/commit/dd7dd75d06d5bd27327589ae9c00172d12c27b0b
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2020-03-16 (Mon, 16 Mar 2020)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java

  Log Message:
  -----------
  fix fo MID-6009 - ITSM Manual connector shadow conflict

(cherry picked from commit e911c7ae681f52c7286d499ec885b57fa66117df)


  Commit: ad05c4cdb9074a39e812750aa8f9aa7f2a28f4cd
      https://github.com/Evolveum/midpoint/commit/ad05c4cdb9074a39e812750aa8f9aa7f2a28f4cd
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2020-03-16 (Mon, 16 Mar 2020)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismPropertyPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismPropertyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/FeedbackAlerts.html
    M infra/common/src/main/java/com/evolveum/midpoint/common/ActivationComputer.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ApprovalContextUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-case-management-3.xsd
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/complex/TestPolicyDrivenRoleLifecycle.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentTripleEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingEvaluator.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/StageComputeHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/AssignmentPolicyAspectPart.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/assignments/AbstractTestAssignmentApproval.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/assignments/TestAssignmentApprovalGlobal.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/assignments/TestAssignmentApprovalMetaroleExplicit.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/assignments/TestAssignmentApprovalPlainImplicit.java
    A model/workflow-impl/src/test/resources/assignments/user-draft.xml
    M model/workflow-impl/src/test/resources/assignments/user-lead1.xml
    M model/workflow-impl/src/test/resources/assignments/user-lead2.xml
    M model/workflow-impl/src/test/resources/assignments/user-lead3.xml

  Log Message:
  -----------
  Merge branch 'support-4.0' of https://github.com/Evolveum/midpoint into support-4.0


  Commit: 9abb6b78a080d250b9f9a201a037da2230b455c1
      https://github.com/Evolveum/midpoint/commit/9abb6b78a080d250b9f9a201a037da2230b455c1
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2020-03-16 (Mon, 16 Mar 2020)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/FocusTabVisibleBehavior.java

  Log Message:
  -----------
  fix for MID-4118 AdminGuiConfiguration object type declaration works only with c: prefix (c:UserType), not without (UserType)

(cherry picked from commit 0d393953bf557628af27ec5d8224cc1b4b384ef2)


Compare: https://github.com/Evolveum/midpoint/compare/d62f0e95eb36...9abb6b78a080