[midPoint-git] [Evolveum/midpoint] abc965: Added support for setting conflict resolution conf...

[Viliam Repan]

  Branch: refs/heads/fix/10714-4.8
  Home:   https://github.com/Evolveum/midpoint
  Commit: abc9657884514a00baca1fc05d7176800c97b8e6
      https://github.com/Evolveum/midpoint/commit/abc9657884514a00baca1fc05d7176800c97b8e6
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2026-05-25 (Mon, 25 May 2026)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-tasks-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/executor/FocusChangeExecution.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/ModelImplUtils.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRaceConditions.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/Task.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/test/NullTaskImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java

  Log Message:
  -----------
  Added support for setting conflict resolution configuration per task + tests



To unsubscribe from these emails, change your notification settings at https://github.com/Evolveum/midpoint/settings/notifications