[midPoint-git] [Evolveum/midpoint] cd40b3: Do some cosmetic improvements

[virgo47]

  Branch: refs/heads/feature/repo-ng
  Home:   https://github.com/Evolveum/midpoint
  Commit: cd40b3aed2fe486e902bd15a9d7718142db0d74c
      https://github.com/Evolveum/midpoint/commit/cd40b3aed2fe486e902bd15a9d7718142db0d74c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-03 (Fri, 03 Jul 2020)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/AssignmentEvaluator.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/TemplateMappingsEvaluation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/consolidation/DeltaSetTripleMapConsolidation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingSetEvaluator.java

  Log Message:
  -----------
  Do some cosmetic improvements

Related to MID-6275.


  Commit: 69c7d36815e37b27cf9c894d0288978126d1d4e8
      https://github.com/Evolveum/midpoint/commit/69c7d36815e37b27cf9c894d0288978126d1d4e8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-03 (Fri, 03 Jul 2020)

  Changed paths:
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/ModelCommonBeans.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/AbstractMappingBuilder.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/AbstractMappingImpl.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingImpl.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingParser.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingValueMetadataComputerImpl.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MetadataMappingBuilder.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MetadataMappingEvaluator.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MetadataMappingImpl.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/TimeConstraintsEvaluation.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/ValueMetadataComputation.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/ValueMetadataProcessingSpec.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/builtin/BaseBuiltinMetadataMapping.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/builtin/BuiltinMetadataMapping.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/builtin/BuiltinMetadataMappingsRegistry.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/builtin/CreateTimestampBuiltinMapping.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/MappingValueMetadataComputerImpl.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/MetadataMappingBuilder.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/MetadataMappingEvaluator.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/MetadataMappingImpl.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/ValueMetadataComputation.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/ValueMetadataProcessingSpec.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/BaseBuiltinMetadataMapping.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/BuiltinMetadataMapping.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/BuiltinMetadataMappingsRegistry.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/CreateTimestampBuiltinMapping.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/MappingTestEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelBeans.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/EvaluatedOutboundConstructionImpl.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ValueMetadataComputer.java

  Log Message:
  -----------
  Prepare for adding consolidation metadata mappings

Some code simplifications and generalizations.

Related to MID-6275.


  Commit: 5a26c389e3b8b28bc90ab41860fbac63f0d4ef3e
      https://github.com/Evolveum/midpoint/commit/5a26c389e3b8b28bc90ab41860fbac63f0d4ef3e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-03 (Fri, 03 Jul 2020)

  Changed paths:
    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/consolidation/DeltaSetTripleConsolidation.java
    M model/model-intest/src/test/resources/common/user-template-complex.xml

  Log Message:
  -----------
  Remove non-tolerant focus item setting

This was an experimental feature that is obsolete for a long time
(mapping range has to be used instead). So it is gone now.

Related to MID-6275.


  Commit: 79a8f581a40e8524dac9d1439221716b1249abef
      https://github.com/Evolveum/midpoint/commit/79a8f581a40e8524dac9d1439221716b1249abef
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-03 (Fri, 03 Jul 2020)

  Changed paths:
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingEvaluationEnvironment.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/TemplateMappingsEvaluation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/consolidation/DeltaSetTripleConsolidation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/consolidation/DeltaSetTripleMapConsolidation.java

  Log Message:
  -----------
  Introduce MappingEvaluationEnvironment

This is to avoid copying contextDescription + now + task
information all over the code.

Related to MID-6275.


  Commit: d58615616b2b7b4501a31e3176c0a58c9c3ab524
      https://github.com/Evolveum/midpoint/commit/d58615616b2b7b4501a31e3176c0a58c9c3ab524
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-03 (Fri, 03 Jul 2020)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidatorBuilder.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/ConsolidationProcessor.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/TemplateMappingsEvaluation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/consolidation/DeltaSetTripleConsolidation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/consolidation/DeltaSetTripleMapConsolidation.java

  Log Message:
  -----------
  Further simplify the consolidation

"Reconciliation" part of DeltaSetTripleConsolidation was moved
into IvwoConsolidator. Some dubious parts of the consolidator
were marked as such.

Related to MID-6275.


  Commit: 9e74ac1c8e1bdf40ff6a94b49ab56ebea6f7f93c
      https://github.com/Evolveum/midpoint/commit/9e74ac1c8e1bdf40ff6a94b49ab56ebea6f7f93c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-06 (Mon, 06 Jul 2020)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/AuditedLogoutHandler.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/filter/MidpointRequestHeaderAuthenticationFilter.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/module/HttpHeaderModuleWebSecurityConfig.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/module/LoginFormModuleWebSecurityConfig.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/TaskTypeUtil.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 4c681ddc603bd58365446fa80379b28494be3b9c
      https://github.com/Evolveum/midpoint/commit/4c681ddc603bd58365446fa80379b28494be3b9c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-06 (Mon, 06 Jul 2020)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ObjectDeltaWaves.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConsolidationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingSetEvaluator.java

  Log Message:
  -----------
  Do yet another consolidation simplification

Some (seemingly) redundant functionality was removed.

Related to MID-6275.


  Commit: 3c3794671f383ac2a227eb753a4755e57d50239f
      https://github.com/Evolveum/midpoint/commit/3c3794671f383ac2a227eb753a4755e57d50239f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-06 (Mon, 06 Jul 2020)

  Changed paths:
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/PrismValueDeltaSetTripleProducer.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ItemValueWithOrigin.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidatorBuilder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConsolidationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/consolidation/DeltaSetTripleConsolidation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingSetEvaluator.java

  Log Message:
  -----------
  Do next wave of consolidation simplifications

1. "Special zero-set processing" was renamed to "add unchanged
values except for normal mappings" and integrated into value
consolidation algorithm. The behavior will be a little bit different
(e.g. wrt weak mapping handling) but IMHO more correct than before.

2. Sanity check for deletion of strongly-enforced values was put
into one place. Now it always checks plus and zero sets, which should
be more correct than before.

3. Gradual selection of weak values by origin (assignments, outbound,
all) was removed, because all values should have the same origin
in the current implementation.

Related to MID-6275.


  Commit: e1bbf2fda08ad10b15f597885d76a329957c8e60
      https://github.com/Evolveum/midpoint/commit/e1bbf2fda08ad10b15f597885d76a329957c8e60
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-06 (Mon, 06 Jul 2020)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidatorBuilder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConsolidationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/consolidation/DeltaSetTripleConsolidation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingSetEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/resources/common/user-template-complex.xml

  Log Message:
  -----------
  Put some consolidation features back

1. Gradual selection of weak values by origin (assignments, outbound,
all) is back. It is necessary when reconciling resource object
attributes/associations.

2. Check for presence of zero mappings is back. It is necessary
when reconciling resource object attributes/associations. But it is
now engaged only when we do not have existing item (i.e. full
projection).

Also, renamed "filterExistingValues" to "hasExistingItem".

Related to MID-6275.


  Commit: 1429acb88b8bb2adaef01241743bed50de148277
      https://github.com/Evolveum/midpoint/commit/1429acb88b8bb2adaef01241743bed50de148277
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-07 (Tue, 07 Jul 2020)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidatorBuilder.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/ConsolidationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/consolidation/DeltaSetTripleConsolidation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingSetEvaluator.java

  Log Message:
  -----------
  Polish consolidation algorithm

This is hopefully the final version of consolidation algorithm
before introducing metadata mappings.

Related to MID-6275.


  Commit: ec0196f835d918200b9f70b7affc157a25aebdc3
      https://github.com/Evolveum/midpoint/commit/ec0196f835d918200b9f70b7affc157a25aebdc3
  Author: lskublik <lskublik at evolveum.com>
  Date:   2020-07-07 (Tue, 07 Jul 2020)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/MetadataContainerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/MetadataContainerValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerValuePanel.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/AbstractLabTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M3ResourcesAttributesAndMappingsTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M4ProvisioningToResources.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M6ConfiguringMultipleAccountTypes.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M7SynchronizationFlavours.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M8ExtendingMidPointXMLSchema.java
    M testing/schrodingertest/src/test/resources/configuration/schrodinger.properties
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/Search.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/SearchItemField.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/TabPanel.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/PreviewPage.java

  Log Message:
  -----------
  fix for schrodinger test for lab 101


  Commit: 4018ce81d22560726f7fff59e29e662aabd43817
      https://github.com/Evolveum/midpoint/commit/4018ce81d22560726f7fff59e29e662aabd43817
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2020-07-07 (Tue, 07 Jul 2020)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  Report-related schema comments


  Commit: 2ffc6164b1b132e1e9163b0b53ac63293abc6005
      https://github.com/Evolveum/midpoint/commit/2ffc6164b1b132e1e9163b0b53ac63293abc6005
  Author: lskublik <lskublik at evolveum.com>
  Date:   2020-07-07 (Tue, 07 Jul 2020)

  Changed paths:
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/SynchronizationTests.java
    M testing/schrodingertest/src/test/resources/configuration/schrodinger.properties

  Log Message:
  -----------
  fix for SynchronizationTests


  Commit: 311ea8eb430a0de0c8a9ba55289aff9e84bebcbd
      https://github.com/Evolveum/midpoint/commit/311ea8eb430a0de0c8a9ba55289aff9e84bebcbd
  Author: lskublik <lskublik at evolveum.com>
  Date:   2020-07-07 (Tue, 07 Jul 2020)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPropertiesConfigPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SwitchablePropertyValuePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SwitchablePropertyValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/filter/ValueSearchFilterItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/SearchFilterConfigurationPanel.java
    M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
    M gui/admin-gui/src/main/resources/static/less/midpoint/midpoint.less
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/QueryConverterImpl.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-metadata-3.xsd

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/origin/master'


  Commit: af13eb604916d910492f9acde9bb55507e107a1d
      https://github.com/Evolveum/midpoint/commit/af13eb604916d910492f9acde9bb55507e107a1d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-07 (Tue, 07 Jul 2020)

  Changed paths:
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ItemDeltaImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidatorBuilder.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/ConsolidationProcessor.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/TemplateMappingsEvaluation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/consolidation/DeltaSetTripleConsolidation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/consolidation/DeltaSetTripleMapConsolidation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingSetEvaluator.java

  Log Message:
  -----------
  Add support for value metadata to IvwoConsolidator

What is still missing is establishing the context
for metadata computation.

Related to MID-6275.


  Commit: dde0fb90382378b8aaaff144f295cb9926302357
      https://github.com/Evolveum/midpoint/commit/dde0fb90382378b8aaaff144f295cb9926302357
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-07 (Tue, 07 Jul 2020)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/MetadataContainerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/MetadataContainerValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPropertiesConfigPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SwitchablePropertyValuePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SwitchablePropertyValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/filter/ValueSearchFilterItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/SearchFilterConfigurationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/AuditedLogoutHandler.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/filter/MidpointRequestHeaderAuthenticationFilter.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/module/HttpHeaderModuleWebSecurityConfig.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/module/LoginFormModuleWebSecurityConfig.java
    M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
    M gui/admin-gui/src/main/resources/static/less/midpoint/midpoint.less
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/QueryConverterImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/TaskTypeUtil.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-metadata-3.xsd
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/AbstractLabTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M3ResourcesAttributesAndMappingsTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M4ProvisioningToResources.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M6ConfiguringMultipleAccountTypes.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M7SynchronizationFlavours.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M8ExtendingMidPointXMLSchema.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/SynchronizationTests.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/Search.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/SearchItemField.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/TabPanel.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/AssignmentHolderDetailsPage.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into tmp/consolidation-metadata-processing


  Commit: 514bd164c2a47f679829bd4ffb7e90bd633e2b06
      https://github.com/Evolveum/midpoint/commit/514bd164c2a47f679829bd4ffb7e90bd633e2b06
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-07 (Tue, 07 Jul 2020)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-metadata-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingImpl.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/MappingValueMetadataComputerImpl.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/ValueMetadataComputation.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/ValueMetadataProcessingSpec.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/BaseBuiltinMetadataMapping.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/BuiltinMetadataMapping.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/CreateTimestampBuiltinMapping.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelBeans.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConsolidationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentProcessor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/MappingSetEvaluation.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/MappingSetEvaluationBuilder.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/MappingSorter.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/TemplateMappingsEvaluation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/consolidation/DeltaSetTripleConsolidation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/consolidation/DeltaSetTripleMapConsolidation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/FixedTargetSpecification.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingEvaluator.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingSetEvaluator.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/SelfTargetSpecification.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/TargetObjectSpecification.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestValueMetadata.java

  Log Message:
  -----------
  Add support for consolidation metadata mappings

Also refactored MappingSetEvaluator along the way.

Related to MID-6275.


  Commit: 20121d888e2b216cbde2844850ded9f2148b17cc
      https://github.com/Evolveum/midpoint/commit/20121d888e2b216cbde2844850ded9f2148b17cc
  Author: kate <honchar at evolveum.com>
  Date:   2020-07-07 (Tue, 07 Jul 2020)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/AbstractSearchConfigurationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPropertiesConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SwitchablePropertyValuePanel.java

  Log Message:
  -----------
  cancel button for filter config popup


  Commit: baed75170b8f0a8d7b6b980e7be9c51de39bedc8
      https://github.com/Evolveum/midpoint/commit/baed75170b8f0a8d7b6b980e7be9c51de39bedc8
  Author: kate <honchar at evolveum.com>
  Date:   2020-07-07 (Tue, 07 Jul 2020)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/MetadataContainerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/MetadataContainerValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerValuePanel.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/AbstractLabTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M3ResourcesAttributesAndMappingsTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M4ProvisioningToResources.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M6ConfiguringMultipleAccountTypes.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M7SynchronizationFlavours.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M8ExtendingMidPointXMLSchema.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/SynchronizationTests.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/Search.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/SearchItemField.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/TabPanel.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/PreviewPage.java

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


  Commit: 7cc845a919dc69971733aca1a44fd6f36e80416d
      https://github.com/Evolveum/midpoint/commit/7cc845a919dc69971733aca1a44fd6f36e80416d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-07 (Tue, 07 Jul 2020)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/MetadataContainerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/MetadataContainerValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPropertiesConfigPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SwitchablePropertyValuePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SwitchablePropertyValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/filter/ValueSearchFilterItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/SearchFilterConfigurationPanel.java
    M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
    M gui/admin-gui/src/main/resources/static/less/midpoint/midpoint.less
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/QueryConverterImpl.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-metadata-3.xsd
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/AbstractLabTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M3ResourcesAttributesAndMappingsTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M4ProvisioningToResources.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M6ConfiguringMultipleAccountTypes.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M7SynchronizationFlavours.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M8ExtendingMidPointXMLSchema.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/SynchronizationTests.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/Search.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/SearchItemField.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/TabPanel.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/AssignmentHolderDetailsPage.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 7ce750451e07bfac4e82fb91194995dffc49038a
      https://github.com/Evolveum/midpoint/commit/7ce750451e07bfac4e82fb91194995dffc49038a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-07 (Tue, 07 Jul 2020)

  Changed paths:
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ItemDeltaImpl.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-metadata-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingEvaluationEnvironment.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingImpl.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/PrismValueDeltaSetTripleProducer.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/MappingValueMetadataComputerImpl.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/ValueMetadataComputation.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/ValueMetadataProcessingSpec.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/BaseBuiltinMetadataMapping.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/BuiltinMetadataMapping.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/CreateTimestampBuiltinMapping.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelBeans.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ItemValueWithOrigin.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidatorBuilder.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/ObjectDeltaWaves.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConsolidationProcessor.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/InboundProcessor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/MappingSetEvaluation.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/MappingSetEvaluationBuilder.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/MappingSorter.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/TemplateMappingsEvaluation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/consolidation/DeltaSetTripleConsolidation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/consolidation/DeltaSetTripleMapConsolidation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/FixedTargetSpecification.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingEvaluator.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingSetEvaluator.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/SelfTargetSpecification.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/TargetObjectSpecification.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestValueMetadata.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/resources/common/user-template-complex.xml

  Log Message:
  -----------
  Merge branch 'tmp/consolidation-metadata-processing'


  Commit: 5529d7f96e0274c6a56b5adf1f18081260844e50
      https://github.com/Evolveum/midpoint/commit/5529d7f96e0274c6a56b5adf1f18081260844e50
  Author: kate <honchar at evolveum.com>
  Date:   2020-07-07 (Tue, 07 Jul 2020)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPropertiesConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SwitchablePropertyValuePanel.html
    M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less

  Log Message:
  -----------
  style fixes


  Commit: 64b56f75e1ae72286398d19f946c2bd6dbb3005e
      https://github.com/Evolveum/midpoint/commit/64b56f75e1ae72286398d19f946c2bd6dbb3005e
  Author: kate <honchar at evolveum.com>
  Date:   2020-07-08 (Wed, 08 Jul 2020)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPropertiesConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/filter/BasicSearchFilter.java

  Log Message:
  -----------
  delete menu item for filter config


  Commit: 58c1e90af11ccf005f6b8b8fa95138a92ddb55cf
      https://github.com/Evolveum/midpoint/commit/58c1e90af11ccf005f6b8b8fa95138a92ddb55cf
  Author: kate <honchar at evolveum.com>
  Date:   2020-07-08 (Wed, 08 Jul 2020)

  Changed paths:
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ItemDeltaImpl.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-metadata-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/ModelCommonBeans.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/AbstractMappingBuilder.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/AbstractMappingImpl.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingEvaluationEnvironment.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingImpl.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingParser.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingValueMetadataComputerImpl.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MetadataMappingBuilder.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MetadataMappingEvaluator.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MetadataMappingImpl.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/PrismValueDeltaSetTripleProducer.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/TimeConstraintsEvaluation.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/ValueMetadataComputation.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/ValueMetadataProcessingSpec.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/builtin/BaseBuiltinMetadataMapping.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/builtin/BuiltinMetadataMapping.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/builtin/BuiltinMetadataMappingsRegistry.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/builtin/CreateTimestampBuiltinMapping.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/MetadataMappingBuilder.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/MetadataMappingEvaluator.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/MetadataMappingImpl.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/ValueMetadataComputation.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/ValueMetadataProcessingSpec.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/BaseBuiltinMetadataMapping.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/BuiltinMetadataMapping.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/BuiltinMetadataMappingsRegistry.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/CreateTimestampBuiltinMapping.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/MappingTestEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelBeans.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ItemValueWithOrigin.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidatorBuilder.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/ObjectDeltaWaves.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/EvaluatedOutboundConstructionImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConsolidationProcessor.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/InboundProcessor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/MappingSetEvaluation.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/MappingSetEvaluationBuilder.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/MappingSorter.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/TemplateMappingsEvaluation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/consolidation/DeltaSetTripleConsolidation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/consolidation/DeltaSetTripleMapConsolidation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/FixedTargetSpecification.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingEvaluator.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingSetEvaluator.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/SelfTargetSpecification.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/TargetObjectSpecification.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestValueMetadata.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ValueMetadataComputer.java

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


  Commit: 425701d65847399412f7d7518ac0f9f97ebe41c4
      https://github.com/Evolveum/midpoint/commit/425701d65847399412f7d7518ac0f9f97ebe41c4
  Author: lskublik <lskublik at evolveum.com>
  Date:   2020-07-08 (Wed, 08 Jul 2020)

  Changed paths:
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M8ExtendingMidPointXMLSchema.java

  Log Message:
  -----------
  fix schrodinger test for lab 101


  Commit: 6d51987c33e9ae60be0da935d3b32ee33363ca99
      https://github.com/Evolveum/midpoint/commit/6d51987c33e9ae60be0da935d3b32ee33363ca99
  Author: lskublik <lskublik at evolveum.com>
  Date:   2020-07-08 (Wed, 08 Jul 2020)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/AbstractSearchConfigurationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPropertiesConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SwitchablePropertyValuePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SwitchablePropertyValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/filter/BasicSearchFilter.java
    M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ItemDeltaImpl.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-metadata-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/ModelCommonBeans.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/AbstractMappingBuilder.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/AbstractMappingImpl.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingEvaluationEnvironment.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingImpl.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingParser.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingValueMetadataComputerImpl.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MetadataMappingBuilder.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MetadataMappingEvaluator.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MetadataMappingImpl.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/PrismValueDeltaSetTripleProducer.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/TimeConstraintsEvaluation.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/ValueMetadataComputation.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/ValueMetadataProcessingSpec.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/builtin/BaseBuiltinMetadataMapping.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/builtin/BuiltinMetadataMapping.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/builtin/BuiltinMetadataMappingsRegistry.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/builtin/CreateTimestampBuiltinMapping.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/MetadataMappingBuilder.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/MetadataMappingEvaluator.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/MetadataMappingImpl.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/ValueMetadataComputation.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/ValueMetadataProcessingSpec.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/BaseBuiltinMetadataMapping.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/BuiltinMetadataMapping.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/BuiltinMetadataMappingsRegistry.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/CreateTimestampBuiltinMapping.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/MappingTestEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelBeans.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ItemValueWithOrigin.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidatorBuilder.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/ObjectDeltaWaves.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/EvaluatedOutboundConstructionImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConsolidationProcessor.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/InboundProcessor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/MappingSetEvaluation.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/MappingSetEvaluationBuilder.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/MappingSorter.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/TemplateMappingsEvaluation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/consolidation/DeltaSetTripleConsolidation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/consolidation/DeltaSetTripleMapConsolidation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/FixedTargetSpecification.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingEvaluator.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingSetEvaluator.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/SelfTargetSpecification.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/TargetObjectSpecification.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestValueMetadata.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ValueMetadataComputer.java

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/origin/master'


  Commit: e749491f9dd8ae449f73e198b1d29db4cf41fd06
      https://github.com/Evolveum/midpoint/commit/e749491f9dd8ae449f73e198b1d29db4cf41fd06
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-08 (Wed, 08 Jul 2020)

  Changed paths:
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/spec/expressions/TestExpressionSpec.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdate.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestConsistencyMechanism.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLargeGroups.java

  Log Message:
  -----------
  Adapt TestConsistencyMechanism.test511

After changing (fixing?) consolidation algorithm this test
started to fail. I think that the test is not correct so
I adapted it. However, this is to be discussed.

Related to MID-6275.


  Commit: ab1d4313e107efce90822883d07d849ffdc98f67
      https://github.com/Evolveum/midpoint/commit/ab1d4313e107efce90822883d07d849ffdc98f67
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-07-08 (Wed, 08 Jul 2020)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/AbstractSearchConfigurationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPropertiesConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SwitchablePropertyValuePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SwitchablePropertyValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/filter/BasicSearchFilter.java
    M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M8ExtendingMidPointXMLSchema.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: b72895b910366323c660f8dad77bc49a4f8fe150
      https://github.com/Evolveum/midpoint/commit/b72895b910366323c660f8dad77bc49a4f8fe150
  Author: Richard Richter <richard.richter at evolveum.com>
  Date:   2020-07-08 (Wed, 08 Jul 2020)

  Changed paths:
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventRecord.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AuditSearchTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditEventRecord.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/AuditEventRecordSqlTransformer.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/SqlTransformerBase.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/mapping/QAuditEventRecordMapping.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/pure/querymodel/beans/MAuditEventRecord.java

  Log Message:
  -----------
  MID-6319: all basic attributes of audit record mapped + filter tested


  Commit: 336cce5b7f59c1b81b970166ded3d5d805ad3479
      https://github.com/Evolveum/midpoint/commit/336cce5b7f59c1b81b970166ded3d5d805ad3479
  Author: Richard Richter <richard.richter at evolveum.com>
  Date:   2020-07-08 (Wed, 08 Jul 2020)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/MetadataContainerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/MetadataContainerValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/AbstractSearchConfigurationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPropertiesConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SwitchablePropertyValuePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SwitchablePropertyValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/filter/BasicSearchFilter.java
    M gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ItemDeltaImpl.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-metadata-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/ModelCommonBeans.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/AbstractMappingBuilder.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/AbstractMappingImpl.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingEvaluationEnvironment.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingImpl.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingParser.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingValueMetadataComputerImpl.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MetadataMappingBuilder.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MetadataMappingEvaluator.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MetadataMappingImpl.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/PrismValueDeltaSetTripleProducer.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/TimeConstraintsEvaluation.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/ValueMetadataComputation.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/ValueMetadataProcessingSpec.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/builtin/BaseBuiltinMetadataMapping.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/builtin/BuiltinMetadataMapping.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/builtin/BuiltinMetadataMappingsRegistry.java
    R model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/builtin/CreateTimestampBuiltinMapping.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/MetadataMappingBuilder.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/MetadataMappingEvaluator.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/MetadataMappingImpl.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/ValueMetadataComputation.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/ValueMetadataProcessingSpec.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/BaseBuiltinMetadataMapping.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/BuiltinMetadataMapping.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/BuiltinMetadataMappingsRegistry.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/metadata/builtin/CreateTimestampBuiltinMapping.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/MappingTestEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelBeans.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ItemValueWithOrigin.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidatorBuilder.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/ObjectDeltaWaves.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/EvaluatedOutboundConstructionImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConsolidationProcessor.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/InboundProcessor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/MappingSetEvaluation.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/MappingSetEvaluationBuilder.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/MappingSorter.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/TemplateMappingsEvaluation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/consolidation/DeltaSetTripleConsolidation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/consolidation/DeltaSetTripleMapConsolidation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/FixedTargetSpecification.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingEvaluator.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingSetEvaluator.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/SelfTargetSpecification.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/TargetObjectSpecification.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/spec/expressions/TestExpressionSpec.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestValueMetadata.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/async/TestAsyncUpdate.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ValueMetadataComputer.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/AbstractLabTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M3ResourcesAttributesAndMappingsTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M4ProvisioningToResources.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M6ConfiguringMultipleAccountTypes.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M7SynchronizationFlavours.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/SynchronizationTests.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestConsistencyMechanism.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLargeGroups.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/Search.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/SearchItemField.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/TabPanel.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/PreviewPage.java

  Log Message:
  -----------
  Merge branch 'master' into feature/repo-ng

# Conflicts:
#	infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java


Compare: https://github.com/Evolveum/midpoint/compare/22588f6aa284...336cce5b7f59