[midPoint-git] [Evolveum/midpoint] 1777fd: merge: merge annotation split into two -> merger, ...

[Viliam Repan]

  Branch: refs/heads/feature/merge
  Home:   https://github.com/Evolveum/midpoint
  Commit: 1777fd3d8888eb7ec74172b8b64f475c1f597478
      https://github.com/Evolveum/midpoint/commit/1777fd3d8888eb7ec74172b8b64f475c1f597478
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2024-03-14 (Thu, 14 Mar 2024)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ItemWrapperImpl.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ValueMetadataWrapperImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/GenericItemMerger.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/MergeStrategy.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/key/NaturalKeyImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/AbstractResourceObjectDefinitionImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/CompositeObjectDefinitionImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/NormalizationAwareResourceAttributeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinitionImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectClassDefinitionImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ShadowAssociationDefinition.java
    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-correlation-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-gui-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-model-context-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-provisioning-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-security-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/schema/transform/PartiallyMutableComplexTypeDefinition.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/schema/transform/TransformableItemDefinition.java

  Log Message:
  -----------
  merge: merge annotation split into two -> merger, naturalKey. updated annotations in xsd. Implemented new natural key delegator



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