You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/11/14 18:33:17 UTC
[isis-app-simpleapp] branch jdo-SNAPSHOT updated (0d04ba8 -> dac4f85)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
from 0d04ba8 Merge remote-tracking branch 'origin/jpa-SNAPSHOT' into jdo-SNAPSHOT
add ffe33c7 resteasy artifact was renamed
new dac4f85 config was restructured (framework)
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:
.../webapp/integtests/metamodel/SwaggerExport_IntegTest.java | 7 +++----
webapp/src/main/java/domainapp/webapp/AppManifest.java | 7 ++++++-
2 files changed, 9 insertions(+), 5 deletions(-)
[isis-app-simpleapp] 01/01: config was restructured (framework)
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit dac4f85753ae3b32e46210589897e81f2b561377
Merge: 0d04ba8 ffe33c7
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Nov 14 19:33:09 2022 +0100
config was restructured (framework)
.../webapp/integtests/metamodel/SwaggerExport_IntegTest.java | 7 +++----
webapp/src/main/java/domainapp/webapp/AppManifest.java | 7 ++++++-
2 files changed, 9 insertions(+), 5 deletions(-)
diff --cc webapp/src/main/java/domainapp/webapp/AppManifest.java
index e773816,f1ef920..2cd3c88
--- a/webapp/src/main/java/domainapp/webapp/AppManifest.java
+++ b/webapp/src/main/java/domainapp/webapp/AppManifest.java
@@@ -41,9 -40,8 +41,14 @@@ import domainapp.webapp.quartz.QuartzMo
CausewayModuleApplibChangeAndExecutionLoggers.class,
CausewayModuleCoreRuntimeServices.class,
++<<<<<<< HEAD
+ CausewayModulePersistenceJdoDatanucleus.class,
+ CausewayModulePersistenceJdoDatanucleusMixins.class,
+ CausewayModuleViewerRestfulObjectsJaxrsResteasy4.class,
++=======
+ CausewayModulePersistenceJpaEclipselink.class,
+ CausewayModuleViewerRestfulObjectsJaxrsResteasy.class,
++>>>>>>> refs/remotes/origin/jpa-SNAPSHOT
CausewayModuleViewerWicketApplibMixins.class,
CausewayModuleViewerWicketViewer.class,