[midPoint-git] [Evolveum/midpoint] badff3: Fixing dependency convergence. Again.

[Radovan Semancik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: badff35abe9506e42758c78426d59ef1546ebb75
      https://github.com/Evolveum/midpoint/commit/badff35abe9506e42758c78426d59ef1546ebb75
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2019-04-16 (Tue, 16 Apr 2019)

  Changed paths:
    M provisioning/provisioning-impl/pom.xml

  Log Message:
  -----------
  Fixing dependency convergence. Again.


  Commit: 2e819d24f40cea0b0e2fa47112e1345034a97082
      https://github.com/Evolveum/midpoint/commit/2e819d24f40cea0b0e2fa47112e1345034a97082
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2019-04-16 (Tue, 16 Apr 2019)

  Changed paths:
    A gui/admin-gui/src/main/resources/initial-objects/250-object-collection-resource-all.xml
    A gui/admin-gui/src/main/resources/initial-objects/260-object-collection-task-all.xml
    A gui/admin-gui/src/main/resources/initial-objects/270-object-collection-task-active.xml
    A gui/admin-gui/src/main/resources/initial-objects/280-object-collection-resource-up.xml
    A gui/admin-gui/src/main/resources/initial-objects/290-object-collection-audit-errors.xml
    A gui/admin-gui/src/main/resources/initial-objects/300-object-collection-audit-modifications.xml
    A gui/admin-gui/src/main/resources/initial-objects/310-dashboard-admin.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/988da1870cf3...2e819d24f40c