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:07 UTC
[isis-app-simpleapp] branch jdo-SNAPSHOT updated (33a41f3 -> e17f5b6)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
from 33a41f3 Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
add 2afbe9d ISIS-2965 - updates to 2.0.0-M8 (jdo)
add 5f70f53 ISIS-2965 - updates to 2.0.0-M8 (jpa)
add 7f98afd adds spring-instrument.jar as a dependency so available if running spring-boot:run
add 0b9a0b0 Merge branch 'release-2.0.0-M8-RC2-jpa' into release-2.0.0-M8-RC2-jdo
add 76e8e2f Revert "ISIS-2965 - updates to 2.0.0-M8 (jdo)"
add 8de7773 Merge branch 'release-2.0.0-M8-RC2-jdo' into jdo-SNAPSHOT
add 581cea1 Revert "ISIS-2965 - updates to 2.0.0-M8 (jpa)"
add 48a8aea Merge branch 'release-2.0.0-M8-RC2-jpa' into jpa-SNAPSHOT
add 2fc6678 Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
add 1ace424 - updates to 2.0.0-M8 (jdo)
add cd84276 ISIS-2965: updates layout.xml for new actions of command log, execution log, audit trail
add 788e7af - updates to 2.0.0-M8 (jpa)
add b0bc607 ISIS-2965: updates layout.xml for new actions of command log, execution log, audit trail
add a6754fa Merge branch 'release-2.0.0-M8-RC3-jpa' into release-2.0.0-M8-RC3-jdo
add f141949 ISIS-2965: inverts groupId and artifactId to reduce conflicts in future
new f1ab91b Merge branch 'release-2.0.0-M8-RC3-jpa' into release-2.0.0-M8-RC3-jdo
new 65534ad reverts back to 2.0.0-SNAPSHOT
add 2ec8d5b reverts back to 2.0.0-SNAPSHOT
new e17f5b6 Merge branch 'release-2.0.0-M8-RC3-jpa' into release-2.0.0-M8-RC3-jdo
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:
module-simple-tests/pom.xml | 2 +-
module-simple/pom.xml | 2 +-
pom.xml | 4 ++--
webapp-tests/pom.xml | 2 +-
webapp/pom.xml | 2 +-
webapp/src/main/resources/menubars.layout.xml | 7 ++++---
6 files changed, 10 insertions(+), 9 deletions(-)
[isis-app-simpleapp] 02/03: reverts back to 2.0.0-SNAPSHOT
Posted by da...@apache.org.
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 65534ade2c7c6afdc9e1381d8f426db5709fe27a
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Oct 2 09:28:06 2022 +0100
reverts back to 2.0.0-SNAPSHOT
---
module-simple-tests/pom.xml | 2 +-
module-simple/pom.xml | 2 +-
pom.xml | 2 +-
webapp-tests/pom.xml | 2 +-
webapp/pom.xml | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/module-simple-tests/pom.xml b/module-simple-tests/pom.xml
index 3bff9b1..a7a48a4 100644
--- a/module-simple-tests/pom.xml
+++ b/module-simple-tests/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.isis.starters</groupId>
<artifactId>simpleapp-jdo</artifactId>
- <version>2.0.0-M8</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-jdo-module-simple-tests</artifactId>
diff --git a/module-simple/pom.xml b/module-simple/pom.xml
index 1a13b64..972a257 100644
--- a/module-simple/pom.xml
+++ b/module-simple/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.isis.starters</groupId>
<artifactId>simpleapp-jdo</artifactId>
- <version>2.0.0-M8</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-jdo-module-simple</artifactId>
diff --git a/pom.xml b/pom.xml
index 7bfad9f..025f747 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
<artifactId>simpleapp-jdo</artifactId>
<groupId>org.apache.isis.starters</groupId>
- <version>2.0.0-M8</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>SimpleApp (JDO) - Parent</name>
diff --git a/webapp-tests/pom.xml b/webapp-tests/pom.xml
index 1290bcc..6642f56 100644
--- a/webapp-tests/pom.xml
+++ b/webapp-tests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.isis.starters</groupId>
<artifactId>simpleapp-jdo</artifactId>
- <version>2.0.0-M8</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-jdo-webapp-tests</artifactId>
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 834cdee..a74f573 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.isis.starters</groupId>
<artifactId>simpleapp-jdo</artifactId>
- <version>2.0.0-M8</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-jdo-webapp</artifactId>
[isis-app-simpleapp] 01/03: Merge branch 'release-2.0.0-M8-RC3-jpa' into release-2.0.0-M8-RC3-jdo
Posted by da...@apache.org.
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 f1ab91bf3a9db61a3224fedc83b4435f7fea9bb8
Merge: a6754fa f141949
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Oct 2 08:31:23 2022 +0100
Merge branch 'release-2.0.0-M8-RC3-jpa' into release-2.0.0-M8-RC3-jdo
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --cc pom.xml
index 19b48b8,4db2bbf..7bfad9f
--- a/pom.xml
+++ b/pom.xml
@@@ -10,11 -10,11 +10,11 @@@
<relativePath/>
</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-M8</version>
- <name>SimpleApp (JPA) - Parent</name>
+ <name>SimpleApp (JDO) - Parent</name>
<packaging>pom</packaging>
[isis-app-simpleapp] 03/03: Merge branch 'release-2.0.0-M8-RC3-jpa' into release-2.0.0-M8-RC3-jdo
Posted by da...@apache.org.
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>