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/05/23 11:44:48 UTC

[isis-app-helloworld] branch jpa-SNAPSHOT updated (5da3fea -> 3558e85)

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

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


    from 5da3fea  Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT
     add 56cb03c  updates parent pom to 2.0.0-M5.20210522-0434-fb17f373
     new 6645727  Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT
     add d7ad27a  ISIS-2660: removes persistence.xml, as is not required by default
     add 6d78a8b  Merge branch 'jdo' into jpa
     new 93106fe  Merge branch 'jpa' into jpa-SNAPSHOT
     add 7836cf6  Merge branch 'jdo' into jdo-SNAPSHOT
     new 3558e85  Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT

The 3 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                                | 5 +----
 src/main/java/META-INF/persistence.xml | 8 --------
 2 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 src/main/java/META-INF/persistence.xml

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

Posted by da...@apache.org.
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 664572744de2d2df779d598282c76276f0d0293c
Merge: 5da3fea 56cb03c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat May 22 09:13:19 2021 +0100

    Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT

 pom.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

[isis-app-helloworld] 02/03: Merge branch 'jpa' into jpa-SNAPSHOT

Posted by da...@apache.org.
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 93106fecb7c1973139bfdd4d61499106a84ecfea
Merge: 6645727 6d78a8b
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun May 23 12:43:53 2021 +0100

    Merge branch 'jpa' into jpa-SNAPSHOT

 src/main/java/META-INF/persistence.xml | 8 --------
 1 file changed, 8 deletions(-)

[isis-app-helloworld] 03/03: Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT

Posted by da...@apache.org.
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 3558e85149a8c0384bf5f8cd9e1e08cc7ef37ee0
Merge: 93106fe 7836cf6
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun May 23 12:44:09 2021 +0100

    Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT