Merge branch 'release-1.12.0-RC2'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b2d1312c Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b2d1312c Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b2d1312c Branch: refs/heads/master Commit: b2d1312c55cc87b44fbe418c43c23f3ae0aedc89 Parents: 6bc7a3d 26ec36c Author: Dan Haywood <d...@haywood-associates.co.uk> Authored: Tue Mar 29 18:45:51 2016 +0100 Committer: Dan Haywood <d...@haywood-associates.co.uk> Committed: Tue Mar 29 18:45:51 2016 +0100 ---------------------------------------------------------------------- core/applib/pom.xml | 2 +- core/integtestsupport/pom.xml | 2 +- core/log4j/pom.xml | 2 +- core/maven-plugin/pom.xml | 2 +- core/metamodel/pom.xml | 2 +- core/pom.xml | 64 ++++++++++---------- core/runtime/pom.xml | 2 +- core/schema/pom.xml | 2 +- core/security-shiro/pom.xml | 6 +- core/security/pom.xml | 2 +- core/specsupport/pom.xml | 2 +- core/unittestsupport/pom.xml | 2 +- core/viewer-restfulobjects-applib/pom.xml | 2 +- core/viewer-restfulobjects-rendering/pom.xml | 2 +- core/viewer-restfulobjects-server/pom.xml | 2 +- core/viewer-wicket-applib/pom.xml | 2 +- core/viewer-wicket-impl/pom.xml | 2 +- core/viewer-wicket-model/pom.xml | 2 +- core/viewer-wicket-ui/pom.xml | 2 +- core/webserver/pom.xml | 2 +- core/wrapper/pom.xml | 2 +- example/application/simpleapp/pom.xml | 2 +- example/archetype/simpleapp/pom.xml | 6 +- .../homepage/HomePageViewModel.layout.xml | 5 ++ .../prototyping/HideMixinsForHomePage.java | 56 ----------------- .../resources/archetype-resources/dom/pom.xml | 7 ++- .../java/domainapp/dom/simple/SimpleObject.java | 4 ++ .../dom/simple/SimpleObject.layout.xml | 4 +- .../archetype-resources/integtests/pom.xml | 3 - .../main/resources/archetype-resources/pom.xml | 4 +- .../projects/basic/archetype.properties | 2 +- master | 0 32 files changed, 77 insertions(+), 124 deletions(-) ----------------------------------------------------------------------
