Merge remote-tracking branch 'origin/prepare/isis-1.8.0'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/841608d9 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/841608d9 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/841608d9 Branch: refs/heads/master Commit: 841608d92b69cb34d4538dd313417ad56fcceee3 Parents: 6fa1b5a bd4eeb1 Author: Dan Haywood <[email protected]> Authored: Tue Feb 24 08:08:08 2015 +0000 Committer: Dan Haywood <[email protected]> Committed: Tue Feb 24 08:08:08 2015 +0000 ---------------------------------------------------------------------- .gitignore | 1 - core/applib/pom.xml | 7 +- core/integtestsupport/pom.xml | 2 +- core/log4j/pom.xml | 2 +- core/maven-plugin/pom.xml | 5 +- core/metamodel/pom.xml | 2 +- core/pom.xml | 60 +++---- core/runtime/pom.xml | 2 +- core/security-noop/pom.xml | 2 +- core/security-shiro/pom.xml | 6 +- 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/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 | 8 +- example/archetype/simpleapp/pom.xml | 6 +- .../main/resources/archetype-resources/pom.xml | 8 +- .../main/webapp/WEB-INF/translations-en-GB.po | 155 ------------------- .../main/webapp/WEB-INF/translations-en_GB.po | 155 +++++++++++++++++++ .../projects/basic/archetype.properties | 2 +- recreate_archetype_RELEASE.sh | 25 +++ recreate_archetype_SNAPSHOT.sh | 24 +++ 30 files changed, 273 insertions(+), 223 deletions(-) ----------------------------------------------------------------------
