[midPoint-git] [Evolveum/midpoint] 91add6: MID-7976 conflict items, wip

[Viliam Repan]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 91add6233b8a32ee1ffd897765d72f600285b0cf
      https://github.com/Evolveum/midpoint/commit/91add6233b8a32ee1ffd897765d72f600285b0cf
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2022-06-20 (Mon, 20 Jun 2022)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/wizard/WizardHeader.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/wizard/WizardPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/Conflict.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ConflictItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ConflictSolverPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ConflictState.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RequestAccess.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ShoppingCartPanel.java

  Log Message:
  -----------
  MID-7976 conflict items, wip


  Commit: 9e8529f0f5846e61314b14e161dea083b32f8d1b
      https://github.com/Evolveum/midpoint/commit/9e8529f0f5846e61314b14e161dea083b32f8d1b
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2022-06-20 (Mon, 20 Jun 2022)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/Conflict.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ConflictItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ConflictItemPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ConflictSolverPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RequestAccess.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ShoppingCartPanel.java

  Log Message:
  -----------
  MID-7976 correct conflict count, removed obsolete counters


  Commit: f0be5a76bbe73416dd885b12e4130b368bfa38c9
      https://github.com/Evolveum/midpoint/commit/f0be5a76bbe73416dd885b12e4130b368bfa38c9
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2022-06-20 (Mon, 20 Jun 2022)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/assignment/GenericAbstractRoleAssignmentPanel.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectTypeDefinitionImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/SynchronizationReactionDefinition.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-provisioning-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/action/DeleteResourceObjectAction.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/action/DeleteShadowAction.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/action/InactivateResourceObjectAction.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/action/InactivateShadowAction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/action/StandardActionsRegistrar.java
    M model/model-impl/src/test/resources/common/resource-dummy.xml
    M model/model-intest/src/test/resources/sync/resource-dummy-archetyped.xml
    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

  Log Message:
  -----------
  Merge branch 'master' of github.com:Evolveum/midpoint


Compare: https://github.com/Evolveum/midpoint/compare/e92c7314b042...f0be5a76bbe7