[midPoint-git] [Evolveum/midpoint] 4a2957: Fixed MID-4247/MID-4220: (re)added resolution of g...

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 4a295721baf2121320957c840494df414c18614e
      https://github.com/Evolveum/midpoint/commit/4a295721baf2121320957c840494df414c18614e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-11-22 (Wed, 22 Nov 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinitionImpl.java

  Log Message:
  -----------
  Fixed MID-4247/MID-4220: (re)added resolution of global items in some situations


  Commit: 56fcef4f1feda206f581c00da35be64dec9d37cd
      https://github.com/Evolveum/midpoint/commit/56fcef4f1feda206f581c00da35be64dec9d37cd
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-11-22 (Wed, 22 Nov 2017)

  Changed paths:
    M gui/admin-gui/pom.xml
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/report-impl/src/test/resources/reports/report-user-list-script.xml
    A tools/midpoint-war-layout/pom.xml
    A tools/midpoint-war-layout/src/main/java/com/evolveum/midpoint/tools/layout/MidPointWarLauncher.java
    A tools/midpoint-war-layout/src/main/java/com/evolveum/midpoint/tools/layout/MidPointWarLayout.java
    A tools/midpoint-war-layout/src/main/java/com/evolveum/midpoint/tools/layout/MidPointWarLayoutFactory.java
    A tools/midpoint-war-layout/src/main/resources/META-INF/spring.factories
    M tools/pom.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/415e22c83e2c...56fcef4f1fed