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 ef8827c1ff84494926494d54ed49085a961f0c60
Merge: 43596cd489 11cfa58912
Author: Andi Huber <[email protected]>
AuthorDate: Wed Mar 6 14:12:18 2024 +0100

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

 .../core/metamodel/tabular/simple/DataTable.java   | 29 +++++++++++++++++++++-
 .../causeway/tabular/applib/DataTableProvider.java | 12 ++++++---
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --cc 
extensions/vw/tabular/applib/src/main/java/org/apache/causeway/tabular/applib/DataTableProvider.java
index 0e32411f62,cfea544a50..8dd6fae135
--- 
a/extensions/vw/tabular/applib/src/main/java/org/apache/causeway/tabular/applib/DataTableProvider.java
+++ 
b/extensions/vw/tabular/applib/src/main/java/org/apache/causeway/tabular/applib/DataTableProvider.java
@@@ -20,9 -20,8 +20,8 @@@ package org.apache.causeway.tabular.app
  
  import java.util.stream.Stream;
  
 -import javax.inject.Inject;
 +import jakarta.inject.Inject;
  
- import org.apache.causeway.commons.collections.Can;
  import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
  import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
  import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;

Reply via email to