[midPoint-git] [Evolveum/midpoint] 6a9cef: Dependency convergence fix after LDAP connector ch...

[Radovan Semancik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 6a9cef8afcf049e6e20f89ef3c27d27448570410
      https://github.com/Evolveum/midpoint/commit/6a9cef8afcf049e6e20f89ef3c27d27448570410
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-02-13 (Mon, 13 Feb 2017)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/pom.xml

  Log Message:
  -----------
  Dependency convergence fix after LDAP connector changes.


  Commit: a4503ee5ae4202a5e36fdc96a24754b83bb49a94
      https://github.com/Evolveum/midpoint/commit/a4503ee5ae4202a5e36fdc96a24754b83bb49a94
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-02-13 (Mon, 13 Feb 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentConflict.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentConflicts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/AssignmentConflictPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/AssignmentConflictPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java

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


Compare: https://github.com/Evolveum/midpoint/compare/7bf641e60dd7...a4503ee5ae42