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 2022/10/02 09:53:10 UTC
[isis-app-simpleapp] 03/03: Merge branch 'release-2.0.0-M8-RC3-jpa' into release-2.0.0-M8-RC3-jdo
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 e17f5b6424c01e0d01194af3fb9b74fc4c19ca7d
Merge: 65534ad 2ec8d5b
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Oct 2 09:29:21 2022 +0100
Merge branch 'release-2.0.0-M8-RC3-jpa' into release-2.0.0-M8-RC3-jdo
module-simple-tests/pom.xml | 2 +-
module-simple/pom.xml | 2 +-
webapp-tests/pom.xml | 2 +-
webapp/pom.xml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --cc module-simple-tests/pom.xml
index a7a48a4,52cff26..1ebb218
--- a/module-simple-tests/pom.xml
+++ b/module-simple-tests/pom.xml
@@@ -5,8 -5,8 +5,8 @@@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.starters</groupId>
- <artifactId>simpleapp-jpa</artifactId>
+ <artifactId>simpleapp-jdo</artifactId>
+ <groupId>org.apache.isis.starters</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
diff --cc module-simple/pom.xml
index 972a257,58daec6..ce676f4
--- a/module-simple/pom.xml
+++ b/module-simple/pom.xml
@@@ -5,8 -5,8 +5,8 @@@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.starters</groupId>
- <artifactId>simpleapp-jpa</artifactId>
+ <artifactId>simpleapp-jdo</artifactId>
+ <groupId>org.apache.isis.starters</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
diff --cc webapp-tests/pom.xml
index 6642f56,9e27a28..83607bb
--- a/webapp-tests/pom.xml
+++ b/webapp-tests/pom.xml
@@@ -3,8 -3,8 +3,8 @@@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.starters</groupId>
- <artifactId>simpleapp-jpa</artifactId>
+ <artifactId>simpleapp-jdo</artifactId>
+ <groupId>org.apache.isis.starters</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
diff --cc webapp/pom.xml
index a74f573,4c10adb..58606bc
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@@ -3,8 -3,8 +3,8 @@@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.starters</groupId>
- <artifactId>simpleapp-jpa</artifactId>
+ <artifactId>simpleapp-jdo</artifactId>
+ <groupId>org.apache.isis.starters</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>