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 2021/06/01 07:05:57 UTC

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

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

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

commit 03c0d06c0f057f552453334b1eaa210e1dd0ef4a
Merge: 47f3b99 3b63894
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jun 1 08:05:22 2021 +0100

    Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT

 pom.xml        | 2 +-
 webapp/pom.xml | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --cc webapp/pom.xml
index c0cc3fb,6e8ac39..1540bbf
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@@ -69,8 -69,13 +69,13 @@@
          </dependency>
  
          <dependency>
+             <groupId>org.apache.isis.security</groupId>
+             <artifactId>isis-security-shiro</artifactId>
+         </dependency>
+ 
+         <dependency>
              <groupId>org.apache.isis.mavendeps</groupId>
 -            <artifactId>isis-mavendeps-jdo</artifactId>
 +            <artifactId>isis-mavendeps-jpa</artifactId>
              <type>pom</type>
          </dependency>