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:07:54 UTC

[isis-app-helloworld] 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-helloworld.git

commit 5a1dc2b99e5f4936889fb9cd1b9e16d7718cfa2d
Merge: 0db7abf 9e9b3e9
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jun 1 08:07:13 2021 +0100

    Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT

 pom.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --cc pom.xml
index a339825,8d055b1..075597a
--- a/pom.xml
+++ b/pom.xml
@@@ -61,8 -61,13 +61,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>