[midPoint-git] [Evolveum/midpoint] 89b092: Add skeleton of resource merge algorithm

mederly noreply at github.com
Tue May 3 09:03:53 CEST 2022 

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 89b092311f1b5cbccd5a227be57f5ff4557ffa34
      https://github.com/Evolveum/midpoint/commit/89b092311f1b5cbccd5a227be57f5ff4557ffa34
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2022-05-03 (Tue, 03 May 2022)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resources/ResourceCompletionOperation.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resources/ResourceExpansionOperation.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resources/ResourceSchemaHelper.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resources/merger/GenericItemMerger.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resources/merger/ItemMerger.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resources/merger/RequiredItemMerger.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resources/merger/ResourceMergeOperation.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/AbstractProvisioningIntegrationTest.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/resources/TestResourceTemplateMerge.java
    A provisioning/provisioning-impl/src/test/resources/merge/resource-basic-1.xml
    A provisioning/provisioning-impl/src/test/resources/merge/resource-template-basic.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Add skeleton of resource merge algorithm

Work in progress.


  Commit: f10ffde7f32a8846d0fe2e73268899e310ac51a3
      https://github.com/Evolveum/midpoint/commit/f10ffde7f32a8846d0fe2e73268899e310ac51a3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2022-05-03 (Tue, 03 May 2022)

  Changed paths:
    M gui/admin-gui/package-lock.json
    M gui/admin-gui/package.json
    M gui/admin-gui/src/frontend/js/ace-editor.js
    M gui/admin-gui/src/frontend/js/vendors.js
    M gui/admin-gui/src/frontend/scss/midpoint-theme-variables.scss
    M gui/admin-gui/src/frontend/scss/vendors.scss
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageAdminLTE.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ObjectTypeGuiDescriptor.java
    M gui/admin-gui/src/main/resources/initial-objects/060-archetype-report-dashboard.xml
    R gui/admin-gui/src/main/resources/static/css/fonts.css
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-300.eot
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-300.svg
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-300.ttf
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-300.woff
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-300.woff2
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-300italic.eot
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-300italic.svg
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-300italic.ttf
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-300italic.woff
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-300italic.woff2
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-600.eot
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-600.svg
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-600.ttf
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-600.woff
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-600.woff2
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-600italic.eot
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-600italic.svg
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-600italic.ttf
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-600italic.woff
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-600italic.woff2
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-700.eot
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-700.svg
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-700.ttf
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-700.woff
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-700.woff2
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-italic.eot
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-italic.svg
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-italic.ttf
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-italic.woff
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-italic.woff2
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-regular.eot
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-regular.svg
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-regular.ttf
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-regular.woff
    R gui/admin-gui/src/main/resources/static/fonts/source-sans-pro-v9-latin_latin-ext-regular.woff2
    M gui/admin-gui/webpack.common.js
    M gui/admin-gui/webpack.development.js

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


Compare: https://github.com/Evolveum/midpoint/compare/2b89ec68e857...f10ffde7f32a

More information about the midPoint-svn mailing list