[isis-app-simpleapp] branch jdo-SNAPSHOT updated (b4d2ef8 -> 9408357)

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a change to branch jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git.


    from b4d2ef8  reverts config for h2 to be compatible with jdo
     add 23cb0f9  removes commented out line
     add fff9323  backports jdo branch's config for h2
     add dbee8fd  Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
     add 0b306de  removes secman action from menubars.layout
     new 9408357  Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 webapp/src/main/resources/application.yml               | 6 +++---
 webapp/src/main/resources/config/application.properties | 1 -
 webapp/src/main/resources/menubars.layout.xml           | 7 +------
 3 files changed, 4 insertions(+), 10 deletions(-)

[isis-app-simpleapp] 01/01: Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git

commit 9408357c593616ff0288aeb5091c145a0742b6d5
Merge: dbee8fd 0b306de
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Aug 16 22:25:04 2021 +0100

    Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT

 webapp/src/main/resources/application.yml     | 6 +++---
 webapp/src/main/resources/menubars.layout.xml | 7 +------
 2 files changed, 4 insertions(+), 9 deletions(-)