(causeway-app-referenceapp) 03/14: Merge remote-tracking branch 'origin/master' into spring6

[ah...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch v3
in repository https://gitbox.apache.org/repos/asf/causeway-app-referenceapp.git

commit 436440a35d1cdb2f4e1a120f25ef54ba393375b4
Merge: ce06a51 901e5bf
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Jun 22 14:21:17 2023 +0200

    Merge remote-tracking branch 'origin/master' into spring6

 .../CollectionLayoutTableDecoratorPage-description.adoc   |  4 ----
 .../optionality/PropertyOptionalityPage-description.adoc  |  6 +-----
 .../cal/persistence/CausewayCalendarEventEntity.java      | 15 +++++++++++++--
 .../causewayval/vegas/CausewayVegas-description.adoc      |  6 ++----
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --cc domain/src/main/java/demoapp/dom/featured/causewayext/cal/persistence/CausewayCalendarEventEntity.java
index fd6f5ea,075cf29..b10d33d
--- a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/persistence/CausewayCalendarEventEntity.java
+++ b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/persistence/CausewayCalendarEventEntity.java
@@@ -18,9 -18,11 +18,11 @@@
   */
  package demoapp.dom.featured.causewayext.cal.persistence;
  
 -import javax.inject.Named;
 +import jakarta.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;
  
  import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
  import demoapp.dom._infra.values.ValueHolder;