You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/09/25 05:28:38 UTC
[isis] 02/02: Merge branch 'release-1.15.1-RC1'
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f3ae2fa29337534736008394a1dde4a61ff19f12
Merge: 6c23546 75be611
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Sep 25 06:27:17 2017 +0100
Merge branch 'release-1.15.1-RC1'
.../DomainServiceMenuOrder_UnitTest.java | 18 +++++
example/application/helloworld/pom.xml | 4 +-
example/application/simpleapp/pom.xml | 4 +-
example/archetype/helloworld/pom.xml | 2 +-
.../META-INF/maven/archetype-metadata.xml | 1 +
.../resources/archetype-resources/enhance-all.sh | 2 +
.../src/main/resources/archetype-resources/pom.xml | 4 +-
.../java/domainapp/dom/impl/HelloWorldObject.java | 16 ++--
.../java/domainapp/dom/impl/HelloWorldObjects.java | 5 +-
.../dom/impl/HelloWorldObjectTest_delete.java | 2 +-
.../dom/impl/HelloWorldObjectTest_updateName.java | 2 +-
.../resources/projects/basic/archetype.properties | 2 +-
example/archetype/simpleapp/pom.xml | 2 +-
.../META-INF/maven/archetype-metadata.xml | 7 +-
.../domainapp/application/manifest/isis.properties | 12 ++-
.../resources/archetype-resources/enhance-all.sh | 2 +
.../archetype-resources/module-simple/pom.xml | 5 ++
.../modules/simple/dom/impl/SimpleObject.java | 17 ++--
.../simple/dom/impl/SimpleObjectRepository.java | 5 +-
.../dom/impl/SimpleObjectRepository_Test.java | 8 +-
.../modules/simple/dom/impl/SimpleObject_Test.java | 2 +-
.../archetype-resources/pom-jdo-enhance-all.xml | 92 ----------------------
.../src/main/resources/archetype-resources/pom.xml | 4 +-
.../webapp/src/main/webapp/WEB-INF/shiro.ini | 10 +--
.../resources/projects/basic/archetype.properties | 2 +-
25 files changed, 84 insertions(+), 146 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.