ISIS-1362: merging in changes for 1.12.1 RC1 (ISIS-1357, ISIS-1363)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/805dec4c Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/805dec4c Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/805dec4c Branch: refs/heads/master Commit: 805dec4c6a00a6764cb5f078ee0384cb4ccf8c55 Parents: dcee071 a19f7c2 Author: Dan Haywood <d...@haywood-associates.co.uk> Authored: Sat Apr 9 07:35:37 2016 +0100 Committer: Dan Haywood <d...@haywood-associates.co.uk> Committed: Sat Apr 9 07:35:37 2016 +0100 ---------------------------------------------------------------------- .../services/config/ConfigurationServiceMenu.java | 5 ++--- core/pom.xml | 2 +- .../main/appended-resources/supplemental-models.xml | 14 -------------- example/application/simpleapp/app/pom.xml | 2 +- example/application/simpleapp/dom/pom.xml | 4 ++-- example/application/simpleapp/fixture/pom.xml | 2 +- example/application/simpleapp/integtests/pom.xml | 4 ++-- example/application/simpleapp/pom.xml | 4 ++-- example/application/simpleapp/webapp/pom.xml | 2 +- 9 files changed, 12 insertions(+), 27 deletions(-) ----------------------------------------------------------------------
