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/08/22 21:35:28 UTC

[isis-app-helloworld] branch release-2.0.0-M6-RC1-jdo updated (b7acced -> 335acc3)

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

danhaywood pushed a change to branch release-2.0.0-M6-RC1-jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-helloworld.git.


    from b7acced  Merge branch 'release-2.0.0-M6-RC1-jpa' into release-2.0.0-M6-RC1-jdo
     add 998da32  fixes mavendeps
     new 335acc3  Merge branch 'release-2.0.0-M6-RC1-jpa' into release-2.0.0-M6-RC1-jdo

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:
 pom.xml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

[isis-app-helloworld] 01/01: Merge branch 'release-2.0.0-M6-RC1-jpa' into release-2.0.0-M6-RC1-jdo

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch release-2.0.0-M6-RC1-jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-helloworld.git

commit 335acc3006fb5a32f8a45612ba47ce32aaae4b1e
Merge: b7acced 998da32
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Aug 22 22:35:19 2021 +0100

    Merge branch 'release-2.0.0-M6-RC1-jpa' into release-2.0.0-M6-RC1-jdo

 pom.xml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --cc pom.xml
index 8d90767,7408363..ed3f109
--- a/pom.xml
+++ b/pom.xml
@@@ -66,15 -66,8 +66,8 @@@
          </dependency>
  
          <dependency>
-             <groupId>org.apache.isis.mavendeps</groupId>
-             <artifactId>isis-mavendeps-jdo</artifactId>
-             <type>pom</type>
-         </dependency>
- 
-         <dependency>
-             <groupId>org.apache.isis.mavendeps</groupId>
-             <artifactId>isis-mavendeps-jdk11</artifactId>
-             <type>pom</type>
+             <groupId>org.apache.isis.persistence</groupId>
 -            <artifactId>isis-persistence-jpa-eclipselink</artifactId>
++            <artifactId>isis-persistence-jdo-datanucleus5</artifactId>
          </dependency>
  
          <dependency>