[midPoint-git] [Evolveum/midpoint] 0663ee: Add model test for concurrent assignment creation

[mederly]

  Branch: refs/heads/support-4.8
  Home:   https://github.com/Evolveum/midpoint
  Commit: 0663eea7c18320588c7477dcc115e79804285f5a
      https://github.com/Evolveum/midpoint/commit/0663eea7c18320588c7477dcc115e79804285f5a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2026-05-22 (Fri, 22 May 2026)

  Changed paths:
    A infra/test-util/src/main/java/com/evolveum/midpoint/test/util/AbstractMultithreadCycleRunner.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MultithreadRunner.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/ParallelTestThread.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRaceConditions.java

  Log Message:
  -----------
  Add model test for concurrent assignment creation

Here we test adding the same assignment by multiple threads
simultaneously, at the model level. There should be only one
assignment present afterwards.

The test is disabled because it fails.

Also, slightly improved parallel threading mechanisms for tests.

See #10714.

(cherry picked from commit c1374e0451433acff487d894224477b09f26380f)


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

  Changed paths:
    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/ClockworkConflictResolver.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

  Log Message:
  -----------
  Fix #10714 using conflict detection (PoC)

What

This commit proves that the existing mechanism of clockwork
conflict resolution can prevent creating duplicate assignments
in a focus object. The mechanism had to be improved, though.
See the specific fixes.

Work in progress: these fixes have to be improved.
E.g., the restarted operation should be repeated using
the same primary and sync deltas. And the whole thing should
be checked in the context of LiveSync task (see #10714).

Why

The goal is to treat situations where concurrent execution
leads to creation of duplicate assignments.


  Commit: d22c0d7a0e5af033737139ccb92c0f7ea794bca0
      https://github.com/Evolveum/midpoint/commit/d22c0d7a0e5af033737139ccb92c0f7ea794bca0
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2026-05-25 (Mon, 25 May 2026)

  Changed paths:
    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/ClockworkConflictResolver.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ContextFactory.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRaceConditions.java

  Log Message:
  -----------
  Implemented conflict resolver RESTART action

Implemented proper RESTART action for ClockworkConflictResolver. Previously RESTART was handled in the same way as RECOMPUTE. Now primaryDelta is reused when creating new restart context.

Also fixed loading policy configuration from system configuration.


  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


  Commit: 7a35c3ff75011a2e2ae97a9c3a83ad7942c34bf7
      https://github.com/Evolveum/midpoint/commit/7a35c3ff75011a2e2ae97a9c3a83ad7942c34bf7
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2026-05-26 (Tue, 26 May 2026)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/lostusername/PageIdentityRecovery.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/StaticWebServlet.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ShadowUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-provisioning-3.xsd
    M model/authentication-impl/src/main/java/com/evolveum/midpoint/authentication/impl/filter/AuthenticationWrapper.java
    M model/authentication-impl/src/main/java/com/evolveum/midpoint/authentication/impl/filter/SequenceAuditFilter.java
    M model/authentication-impl/src/main/java/com/evolveum/midpoint/authentication/impl/handler/AuditedAccessDeniedHandler.java
    M model/authentication-impl/src/main/java/com/evolveum/midpoint/authentication/impl/handler/AuditedLogoutHandler.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelContext.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingMetadata.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/async/TestNotifyChange.java
    A model/model-intest/src/test/resources/async/notify-change/resource-ad.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ExternalResourceEventListenerImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/ShadowedExternalChange.java
    M release-notes.adoc
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/ConnectionEnvironment.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/HttpConnectionInformation.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityUtil.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditServiceProxy.java

  Log Message:
  -----------
  Merge branch 'support-4.8' into fix/10714-4.8


  Commit: 446ffac16b9baa7c83f24a9b04a792fbf9a12d87
      https://github.com/Evolveum/midpoint/commit/446ffac16b9baa7c83f24a9b04a792fbf9a12d87
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2026-05-27 (Wed, 27 May 2026)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/AsyncWebProcessManagerImpl.java

  Log Message:
  -----------
  improved session identifier handling, few more places

(cherry picked from commit f6352dc8e58a98f4649dee0fe45e01df8a930865)


  Commit: b664149f77a9b568f19099058baa2acc46007a36
      https://github.com/Evolveum/midpoint/commit/b664149f77a9b568f19099058baa2acc46007a36
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2026-05-27 (Wed, 27 May 2026)

  Changed paths:

  Log Message:
  -----------
  Merge branch 'support-4.8' into fix/10714-4.8


  Commit: e060f4e16a8706645b5725284fea29e9d89b4d01
      https://github.com/Evolveum/midpoint/commit/e060f4e16a8706645b5725284fea29e9d89b4d01
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2026-05-27 (Wed, 27 May 2026)

  Changed paths:
    M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/TestWorkerTasks.java
    M repo/repo-common/src/test/resources/tasks/worker-tasks/task-100-single-worker.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/TaskAsserter.java

  Log Message:
  -----------
  more asserts for conflict resolution in task/workers


  Commit: d0269095060d28d8cf1276a1951bc79e995a6948
      https://github.com/Evolveum/midpoint/commit/d0269095060d28d8cf1276a1951bc79e995a6948
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2026-05-27 (Wed, 27 May 2026)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ClockworkConflictResolver.java

  Log Message:
  -----------
  small NPE fixes


  Commit: 8dfef08181a34d3848ef17d2c07f64c29df654c5
      https://github.com/Evolveum/midpoint/commit/8dfef08181a34d3848ef17d2c07f64c29df654c5
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2026-05-27 (Wed, 27 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/ContextFactory.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java

  Log Message:
  -----------
  added annotations, improved thread safety for getConflictResolution()


  Commit: c2b2b7e5bd9ff72d5fd7df53e6a12bd3b06db6f5
      https://github.com/Evolveum/midpoint/commit/c2b2b7e5bd9ff72d5fd7df53e6a12bd3b06db6f5
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2026-05-28 (Thu, 28 May 2026)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRaceConditions.java
    A model/model-intest/src/test/resources/contract/resource-dummy-conflict.xml
    A model/model-intest/src/test/resources/contract/task-live-sync-conflict.xml

  Log Message:
  -----------
  MID-10714 livesync test, not working yet.


  Commit: af74b2a0f5e756b68f3aed92b12f65d81a4cb416
      https://github.com/Evolveum/midpoint/commit/af74b2a0f5e756b68f3aed92b12f65d81a4cb416
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2026-05-28 (Thu, 28 May 2026)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRaceConditions.java
    M model/model-intest/src/test/resources/contract/resource-dummy-conflict.xml
    M model/model-intest/src/test/resources/contract/task-live-sync-conflict.xml

  Log Message:
  -----------
  MID-10714 livesync test, improvements, not enabled yet


  Commit: 17d3ef4a7a8268c105d716dc90028bead315fa6e
      https://github.com/Evolveum/midpoint/commit/17d3ef4a7a8268c105d716dc90028bead315fa6e
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2026-05-29 (Fri, 29 May 2026)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRaceConditions.java
    M model/model-intest/src/test/resources/contract/resource-dummy-conflict.xml
    M model/model-intest/src/test/resources/contract/task-live-sync-conflict.xml

  Log Message:
  -----------
  MID-10714 LS test still failing in some non-relevant error


  Commit: 6093a5ff497ad3429fc56aa76b7317a445c3f915
      https://github.com/Evolveum/midpoint/commit/6093a5ff497ad3429fc56aa76b7317a445c3f915
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2026-05-29 (Fri, 29 May 2026)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRaceConditions.java
    M model/model-intest/src/test/resources/contract/task-live-sync-conflict.xml

  Log Message:
  -----------
  MID-10714 LS test still failing


  Commit: 550db81232745bc4f4715edaf5910e8012eb7f8d
      https://github.com/Evolveum/midpoint/commit/550db81232745bc4f4715edaf5910e8012eb7f8d
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2026-05-29 (Fri, 29 May 2026)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java

  Log Message:
  -----------
  current focus used for getObjectReadVersion


  Commit: 7b715902e4805c114603062b03de1dfea521543d
      https://github.com/Evolveum/midpoint/commit/7b715902e4805c114603062b03de1dfea521543d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2026-05-29 (Fri, 29 May 2026)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-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/ClockworkConflictResolver.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/FocusConflictResolutionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/executor/DeltaExecution.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/lens/executor/ProjectionChangeExecution.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-api/src/main/java/com/evolveum/midpoint/repo/api/ConflictWatcher.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/ModificationPrecondition.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/VersionPrecondition.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/ConflictWatcherImpl.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Clean-up focus conflict resolution mechanism

What

This commit improves the focus conflict resolution mechanism.
Comparing to the state in 4.8.11, the current code:

- Documents how the conflict resolution works.
- Keeps all the state regarding this feature into
  LensContext#focusConflictResolutionContext (it was scattered
  before).
- Simplifies the operation retry attempts. We no longer
  distinguish between conflicts detected by preconditions and
  conflicts detected by watchers.
- Improves determination of expected focus version
  (LensFocusContext#getObjectReadVersion): this fixes failing
  TestUuid and TestMultiResource.
- Fixing assumeConflictResolutionAction test method.

Work in progress. TestRaceConditions still do not work fully.

Why

The conflict resolution algorithm is necessary to fix assignment
duplication problem (#10714).


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

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ConflictDetectedException.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/executor/DeltaExecution.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRaceConditions.java
    M model/model-intest/src/test/resources/contract/resource-dummy-conflict.xml
    M model/model-intest/src/test/resources/contract/task-live-sync-conflict.xml

  Log Message:
  -----------
  Polish TestRaceConditions#test140

This commit just polishes the test + adds minor
error-reporting fixes. It is interesting that the test
does not fail now.


  Commit: 9dd53fbda3bf3e63cf47d63535805fe8b8ce9b70
      https://github.com/Evolveum/midpoint/commit/9dd53fbda3bf3e63cf47d63535805fe8b8ce9b70
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2026-05-30 (Sat, 30 May 2026)

  Changed paths:
    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/ClockworkConflictResolver.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/FocusConflictResolutionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRaceConditions.java
    A model/model-intest/src/test/resources/contract/resource-dummy-conflict-1.xml
    A model/model-intest/src/test/resources/contract/resource-dummy-conflict-2.xml
    A model/model-intest/src/test/resources/contract/resource-dummy-conflict-3.xml
    A model/model-intest/src/test/resources/contract/resource-dummy-conflict-4.xml
    A model/model-intest/src/test/resources/contract/resource-dummy-conflict-abstract.xml
    A model/model-intest/src/test/resources/contract/task-live-sync-conflict-1.xml
    A model/model-intest/src/test/resources/contract/task-live-sync-conflict-2.xml
    A model/model-intest/src/test/resources/contract/task-live-sync-conflict-3.xml
    A model/model-intest/src/test/resources/contract/task-live-sync-conflict-4.xml

  Log Message:
  -----------
  Improve RESTART conflict resolution action

What

1. When restarting the processing after focus update conflict is
detected, we now use a (simplified) copy of the original LensContext,
instead of trying to construct it from scratch.

2. If the operation cannot be succesfully completed after given #
of attempts, we throw an exception - instead of quietly continuing.

These changes are supported by TestRaceConditions#test150 that
checks that ALL conflicting operations are really executed.

Why

1. This is to preserve many settings and options that can be set on the
context by the caller. (Note that the current solution is quite
brittle, and should be improved later - see
FocusConflictResolutionContext#contextCopy).

2. It is to let the user clearly known that there is a problem.
Note that RECOMPUTE/RECONCILE action is completely different.
It leaves the object in more-or-less adequate state, so continuing
a good option there.

Related to: #10714 (duplicate assignments creation)


  Commit: db6ee784665c67867be54dbf247773d1dc092e62
      https://github.com/Evolveum/midpoint/commit/db6ee784665c67867be54dbf247773d1dc092e62
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2026-05-30 (Sat, 30 May 2026)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ClockworkConflictResolver.java

  Log Message:
  -----------
  Improve focus conflict logging message

Related to: #10714 (duplicate assignments creation)


  Commit: 0bdfaedcf6b06d54e325d360df208c31f0d5e747
      https://github.com/Evolveum/midpoint/commit/0bdfaedcf6b06d54e325d360df208c31f0d5e747
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2026-05-30 (Sat, 30 May 2026)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-tasks-3.xsd
    A infra/test-util/src/main/java/com/evolveum/midpoint/test/util/AbstractMultithreadCycleRunner.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MultithreadRunner.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/ParallelTestThread.java
    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/ClockworkConflictResolver.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ConflictDetectedException.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ContextFactory.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/FocusConflictResolutionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/executor/DeltaExecution.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/lens/executor/ProjectionChangeExecution.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
    A model/model-intest/src/test/resources/contract/resource-dummy-conflict-1.xml
    A model/model-intest/src/test/resources/contract/resource-dummy-conflict-2.xml
    A model/model-intest/src/test/resources/contract/resource-dummy-conflict-3.xml
    A model/model-intest/src/test/resources/contract/resource-dummy-conflict-4.xml
    A model/model-intest/src/test/resources/contract/resource-dummy-conflict-abstract.xml
    A model/model-intest/src/test/resources/contract/resource-dummy-conflict.xml
    A model/model-intest/src/test/resources/contract/task-live-sync-conflict-1.xml
    A model/model-intest/src/test/resources/contract/task-live-sync-conflict-2.xml
    A model/model-intest/src/test/resources/contract/task-live-sync-conflict-3.xml
    A model/model-intest/src/test/resources/contract/task-live-sync-conflict-4.xml
    A model/model-intest/src/test/resources/contract/task-live-sync-conflict.xml
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/ConflictWatcher.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/ModificationPrecondition.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/VersionPrecondition.java
    M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/TestWorkerTasks.java
    M repo/repo-common/src/test/resources/tasks/worker-tasks/task-100-single-worker.xml
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/ConflictWatcherImpl.java
    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/TaskAsserter.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:
  -----------
  Merge branch 'fix/10714-4.8' into support-4.8


  Commit: c02cfa4aa063ca9b261864b58fb2a19577e97dc3
      https://github.com/Evolveum/midpoint/commit/c02cfa4aa063ca9b261864b58fb2a19577e97dc3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2026-05-30 (Sat, 30 May 2026)

  Changed paths:
    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/ClockworkConflictResolver.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ContextFactory.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/executor/DeltaExecution.java

  Log Message:
  -----------
  Do cosmetic changes to focus conflict resolver

Final polishing of the code after merging into support-4.8 branch.

Related to: #10714 (duplicate assignments creation)


Compare: https://github.com/Evolveum/midpoint/compare/5d3afaea25d1...c02cfa4aa063

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