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/causeway.git

commit b725b324a20510581176f2b1fb4d9477f7248395
Merge: 48dd3ec731 144ee908bd
Author: Andi Huber <[email protected]>
AuthorDate: Fri Jan 27 16:18:52 2023 +0100

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

 .../topics/domainobjects/EntityDiagramPage.java    |  18 +-
 .../docgen/topics/domainobjects/ObjectGraph.java   | 287 +++++++++++++++++++++
 .../docgen/topics/domainobjects/_DiagramUtils.java |  37 ++-
 3 files changed, 317 insertions(+), 25 deletions(-)

diff --cc 
extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/topics/domainobjects/EntityDiagramPage.java
index c23cedd595,e9ec6c1924..43a80480bb
--- 
a/extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/topics/domainobjects/EntityDiagramPage.java
+++ 
b/extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/topics/domainobjects/EntityDiagramPage.java
@@@ -19,11 -19,10 +19,10 @@@
  package org.apache.causeway.extensions.docgen.topics.domainobjects;
  
  import java.util.Optional;
- import java.util.stream.Collectors;
  import java.util.stream.Stream;
  
 -import javax.inject.Inject;
 -import javax.inject.Named;
 +import jakarta.inject.Inject;
 +import jakarta.inject.Named;
  
  import org.springframework.stereotype.Component;
  

Reply via email to