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:44:10 UTC
[isis-app-simpleapp] branch release-2.0.0-M6-RC2-jdo created (now
1ea34ed)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch release-2.0.0-M6-RC2-jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git.
at 1ea34ed merges jpa
This branch includes the following new commits:
new e2c6edf fixes mavendeps
new ab9fa3e Merge branch 'release-2.0.0-M6-RC1-jpa' into release-2.0.0-M6-RC1-jdo
new fccb706 more sorting out of mavendeps
new 1ea34ed merges jpa
The 4 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.
[isis-app-simpleapp] 02/04: 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-RC2-jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit ab9fa3e284ff607eb1f6dc4f3ca2fb869f3a9503
Merge: f637c81 e2c6edf
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Aug 22 22:42:06 2021 +0100
Merge branch 'release-2.0.0-M6-RC1-jpa' into release-2.0.0-M6-RC1-jdo
module-simple/pom.xml | 5 ++---
webapp/pom.xml | 11 ++---------
2 files changed, 4 insertions(+), 12 deletions(-)
diff --cc module-simple/pom.xml
index 27717f3,3849126..55b4e09
--- a/module-simple/pom.xml
+++ b/module-simple/pom.xml
@@@ -41,9 -41,8 +41,8 @@@
</dependency>
<dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-jdo</artifactId>
- <type>pom</type>
+ <groupId>org.apache.isis.persistence</groupId>
- <artifactId>isis-persistence-jpa-eclipselink</artifactId>
++ <artifactId>isis-persistence-jdo-datanucleus5</artifactId>
</dependency>
<dependency>
diff --cc webapp/pom.xml
index f83324a,63f82d4..606d38b
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@@ -74,15 -74,14 +74,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>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-jdk11</artifactId>
- <type>pom</type>
++ <artifactId>isis-persistence-jdo-datanucleus</artifactId>
</dependency>
<dependency>
[isis-app-simpleapp] 01/04: fixes mavendeps
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-RC2-jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit e2c6edf6151a33056634d4fe92a44dfe539e926f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Aug 22 22:35:40 2021 +0100
fixes mavendeps
---
module-simple/pom.xml | 5 ++---
webapp/pom.xml | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/module-simple/pom.xml b/module-simple/pom.xml
index 565bc8d..3849126 100644
--- a/module-simple/pom.xml
+++ b/module-simple/pom.xml
@@ -41,9 +41,8 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-jpa</artifactId>
- <type>pom</type>
+ <groupId>org.apache.isis.persistence</groupId>
+ <artifactId>isis-persistence-jpa-eclipselink</artifactId>
</dependency>
<dependency>
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 7e6bdb1..63f82d4 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -74,9 +74,8 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-jpa</artifactId>
- <type>pom</type>
+ <groupId>org.apache.isis.persistence</groupId>
+ <artifactId>isis-persistence-jpa-eclipselink</artifactId>
</dependency>
<dependency>
[isis-app-simpleapp] 03/04: more sorting out of mavendeps
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-RC2-jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit fccb706adf683dfa6fbeb4f8a3f1052d0196a3fa
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Aug 22 22:42:25 2021 +0100
more sorting out of mavendeps
---
module-simple-tests/pom.xml | 7 -------
webapp/pom.xml | 6 ------
2 files changed, 13 deletions(-)
diff --git a/module-simple-tests/pom.xml b/module-simple-tests/pom.xml
index 974b2b2..9ac2a86 100644
--- a/module-simple-tests/pom.xml
+++ b/module-simple-tests/pom.xml
@@ -64,13 +64,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-jdk11</artifactId>
- <type>pom</type>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 63f82d4..e2b1d8c 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -79,12 +79,6 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-jdk11</artifactId>
- <type>pom</type>
- </dependency>
-
- <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-actuator-autoconfigure</artifactId>
</dependency>
[isis-app-simpleapp] 04/04: merges jpa
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-RC2-jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 1ea34ed0d7707bc5f6f4f0374468484f8faadc6c
Merge: ab9fa3e fccb706
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Aug 22 22:43:36 2021 +0100
merges jpa
module-simple-tests/pom.xml | 7 -------
module-simple/pom.xml | 2 +-
webapp/pom.xml | 2 +-
3 files changed, 2 insertions(+), 9 deletions(-)
diff --cc module-simple/pom.xml
index 55b4e09,3849126..a9cd7a3
--- a/module-simple/pom.xml
+++ b/module-simple/pom.xml
@@@ -42,7 -42,7 +42,7 @@@
<dependency>
<groupId>org.apache.isis.persistence</groupId>
- <artifactId>isis-persistence-jdo-datanucleus5</artifactId>
- <artifactId>isis-persistence-jpa-eclipselink</artifactId>
++ <artifactId>isis-persistence-jdo-datanucleus</artifactId>
</dependency>
<dependency>
diff --cc webapp/pom.xml
index 606d38b,e2b1d8c..fbf79e0
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@@ -13,7 -13,7 +13,7 @@@
<description>
Assembles and runs both the Wicket viewer and the Restfulobjects viewer
-- in a single webapp configured to run using the JPA/EclipseLink object store.
++ in a single webapp configured to run using the JDO/DataNucleus object store.
</description>
<packaging>jar</packaging>