This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git
commit b726694c28686b25279bf3df8afdc4dfd55617c2
Merge: f2fc227216 125a0e9497
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Mon Nov 21 19:23:35 2022 +0100
ISIS-3275: Merge remote-tracking branch 'origin/master' into spring6
.../java/org/apache/causeway/applib/annotation/DomainObject.java | 5 +++++
.../main/java/org/apache/causeway/applib/annotation/HomePage.java | 6 +++++-
.../config/metamodel/facets/CollectionLayoutConfigOptions.java | 7 +++++--
.../causewayext/cal/persistence/CausewayCalendarEventEntity.java | 7 +++++--
4 files changed, 20 insertions(+), 5 deletions(-)
diff --cc
examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/persistence/CausewayCalendarEventEntity.java
index cfb25987a3,238bef577a..be7cb49f66
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/persistence/CausewayCalendarEventEntity.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/persistence/CausewayCalendarEventEntity.java
@@@ -18,8 -18,10 +18,8 @@@
*/
package demoapp.dom.types.causewayext.cal.persistence;
- import jakarta.inject.Named;
+ import java.util.Optional;
-import javax.inject.Named;
-
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.extensions.fullcalendar.applib.CalendarEventable;
import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEvent;
@@@ -27,6 -29,6 +27,7 @@@
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolder;
import demoapp.dom.types.causewayext.cal.holder.CausewayCalendarEventHolder2;
++import jakarta.inject.Named;
@Named("demo.CalendarEventEntity") // shared permissions with concrete sub
class
@DomainObject
