Merge branch 'release-1.13.2-RC1'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4ca4a029 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4ca4a029 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4ca4a029 Branch: refs/heads/master Commit: 4ca4a0294da6fc038410da5d41809f72d937387a Parents: f0c7eaa 43a7fc2 Author: Dan Haywood <d...@haywood-associates.co.uk> Authored: Wed Dec 21 11:16:14 2016 +0000 Committer: Dan Haywood <d...@haywood-associates.co.uk> Committed: Wed Dec 21 11:16:14 2016 +0000 ---------------------------------------------------------------------- .../IsisConfigurationDefault_safe_Test.java | 18 + example/application/simpleapp/pom.xml | 6 +- .../webapp/src/main/webapp/about/index.html | 22 +- example/archetype/simpleapp/pom.xml | 11 +- .../META-INF/maven/archetype-metadata.xml | 19 + .../archetype-resources/.gitattributes | 51 +++ .../resources/archetype-resources/.gitignore | 41 ++ .../application/lib/.gitignore | 5 + .../application/translations.pot | 421 ------------------ .../module-simple/.gitignore | 5 + .../module-simple/translations.pot | 435 ------------------- .../main/resources/archetype-resources/pom.xml | 6 +- .../archetype-resources/webapp/lib/.gitignore | 5 + .../webapp/src/main/webapp/about/index.html | 22 +- 14 files changed, 180 insertions(+), 887 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/4ca4a029/example/application/simpleapp/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/4ca4a029/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml ----------------------------------------------------------------------
