[midPoint-git] [Evolveum/midpoint] 57386c: support for import object with oid and overwrite o...

[Lukas Skublik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 57386c5fa8c22aad7beddc03e165c6b3d36d2d48
      https://github.com/Evolveum/midpoint/commit/57386c5fa8c22aad7beddc03e165c6b3d36d2d48
  Author: lskublik <lskublik at evolveum.com>
  Date:   2020-03-26 (Thu, 26 Mar 2020)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ObjectImporter.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/AbstractImportTest.java
    M model/model-intest/src/test/resources/importer/import-users-overwrite.json
    M model/model-intest/src/test/resources/importer/import-users-overwrite.xml
    M model/model-intest/src/test/resources/importer/import-users-overwrite.yaml
    M model/model-intest/src/test/resources/importer/import-users.json
    M model/model-intest/src/test/resources/importer/import-users.xml
    M model/model-intest/src/test/resources/importer/import-users.yaml

  Log Message:
  -----------
  support for import object with oid and overwrite option (MID-5730)


  Commit: d1f78021b7a83c631c329e86f7ab06c819c99c53
      https://github.com/Evolveum/midpoint/commit/d1f78021b7a83c631c329e86f7ab06c819c99c53
  Author: lskublik <lskublik at evolveum.com>
  Date:   2020-03-26 (Thu, 26 Mar 2020)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ExecuteChangeOptionsPanel.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/path/ItemPathCollectionsUtil.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerValueImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ObjectDeltaImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismMarshaller.java
    M infra/schema-pure-jaxb/pom.xml
    M infra/schema/src/main/resources/xml/ns/public/common/common-model-context-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/scripting/extension-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseTaskBulkAction.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelAuthorizationAction.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingImpl.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/Construction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/OutboundProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/ProjectionCredentialsProcessor.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/mappings/MappingEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationExpressionsEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestCorrelationConfirmationEvaluator.java
    A model/model-impl/src/test/resources/sync/correlation-with-condition-name.xml
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportManagerImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/tracing/TracerImpl.java

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


Compare: https://github.com/Evolveum/midpoint/compare/f5cb871d9c2f...d1f78021b7a8