You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by jo...@apache.org on 2025/01/09 21:37:45 UTC
(causeway) 02/02: CAUSEWAY-3847 merge origin/master
This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a commit to branch CAUSEWAY-3847
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 789c4071a74cae8ae3c140ad9599faa247c8f5e5
Merge: 1b0db1e1eb2 55886b04e53
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Thu Jan 9 21:55:53 2025 +0100
CAUSEWAY-3847 merge origin/master
.../workflows/ci-build-artifacts-no-push-maven.yml | 2 +-
.github/workflows/ci-build-site-no-push.yml | 2 +-
.../modules/ROOT/pages/landing-page/releases.adoc | 5 +-
antora/components/relnotes/modules/ROOT/nav.adoc | 2 +-
.../modules/ROOT/pages/2024/3.0.0/relnotes.adoc | 15 +-
.../modules/ROOT/pages/2024/3.1.0/relnotes.adoc | 6 +-
.../ROOT/partials/2024/2.0.0/_relnotes.adoc | 7 +-
antora/components/tutorials/antora.yml | 6 +-
.../ui-layout-and-hints/table-columns.adoc | 93 ++-
antora/playbooks/site.NEXT.yml | 308 ---------
antora/playbooks/site.yml | 182 ++---
antora/supplemental-ui/doap_causeway.rdf | 2 +-
.../value/semantics/TemporalValueSemantics.java | 23 +
.../value/semantics/ValueSemanticsAbstract.java | 16 +-
bom/pom.xml | 765 +++++++++++----------
.../org/apache/causeway/commons/io/DataSource.java | 147 +++-
.../org/apache/causeway/commons/io/ZipUtils.java | 40 +-
.../apache/causeway/commons/io/DataSourceTest.java | 86 +++
core/adoc/modules/_overview/pages/about.adoc | 26 +-
.../core/config/CausewayConfiguration.java | 79 +++
.../core/metamodel/context/MetaModelContext.java | 9 +
.../metamodel/tabular/DataTableInteractive.java | 2 +
.../tabular/internal/DataRowInternal.java | 18 +-
.../tabular/internal/DataTableInternal.java | 19 +-
.../core/metamodel/tabular/simple/DataRow.java | 13 +-
.../valuesemantics/BigDecimalValueSemantics.java | 28 +-
.../temporal/LocalDateTimeValueSemantics.java | 8 +-
.../temporal/LocalDateValueSemantics.java | 9 +-
.../temporal/TemporalValueSemanticsProvider.java | 17 +-
...PromptStyleFacetFromPropertyAnnotationTest.java | 155 +++++
...romptStyleFacetFromPropertyAnnotation_Test.java | 160 -----
.../BigDecimalValueSemanticsProviderTest.java | 17 +-
.../JavaSqlDateValueSemanticsProviderTest.java | 2 +-
.../value/JavaTimeValueSemanticsProviderTest.java | 2 +-
.../ValueSemanticsProviderAbstractTestCase.java | 6 +
core/pom.xml | 576 ++++++++--------
.../EntityPropertyChangePublisherDefault.java | 4 +-
.../applib/job/RunBackgroundCommandsJob.java | 3 +-
.../adoc/modules/titlecache/pages/about.adoc | 4 +-
.../extensions/titlecache/applib/event/Cached.java | 14 -
extensions/vw/pdfjs/wicket/integration/pom.xml | 2 +-
.../pdfjs/wkt/integration/PdfJsVersion.java | 2 +-
pom.xml | 6 +-
.../testdomain/value/ValueSemanticsTest.java | 3 +-
starters/adoc/modules/starters/pages/about.adoc | 7 +-
starters/pom.xml | 24 +-
supplemental-model/pom.xml | 4 +-
testing/specsupport/applib/pom.xml | 2 +-
.../asciidoc/applib/src/main/java/module-info.java | 6 +-
.../applib/CausewayModuleValAsciidocApplib.java | 3 +-
.../asciidoc/builder/ast/ContentNodeAbstract.java | 74 --
.../asciidoc/builder/ast/SimpleBlock.java | 12 -
.../asciidoc/builder/ast/SimpleDocument.java | 21 +-
.../asciidoc/builder/ast/SimpleList.java | 7 -
.../asciidoc/builder/ast/SimpleSection.java | 26 +-
.../asciidoc/builder/ast/SimpleStructuralNode.java | 24 -
viewers/graphql/testsupport/pom.xml | 71 +-
.../wicket/model/src/main/java/module-info.java | 2 +-
.../PageActionChoice.java} | 6 +-
.../{pagesize => tableoption}/PagesizeChoice.java | 2 +-
.../scalars/jdkmath/BigDecimalConverterTest.java | 11 +-
.../CollectionContentsAsAjaxTablePanel.css | 7 +-
.../CollectionContentsAsAjaxTablePanel.java | 24 +-
.../CollectionContentsSortableDataProvider.java | 22 +-
.../ui/components/table/CausewayAjaxDataTable.java | 8 +-
.../table/DataTableWithPagesAndFilter.java | 70 +-
.../table/head/HeadersToolbarAbstract.java | 14 +
.../ui/components/table/nav/NavigationToolbar.html | 1 +
.../ui/components/table/nav/NavigationToolbar.java | 10 +-
.../PageActionChooser.html} | 17 +-
.../PageActionChooser.java} | 72 +-
.../table/nav/pagesize/PagesizeChooser.html | 12 +-
.../table/nav/pagesize/PagesizeChooser.java | 20 +-
73 files changed, 1813 insertions(+), 1657 deletions(-)
diff --cc core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
index 9aec38bf400,840f54371e2..9be741c57d7
--- a/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
@@@ -44,20 -44,22 +44,22 @@@ import static java.lang.annotation.Elem
import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import javax.activation.DataSource;
-import javax.inject.Named;
-import javax.persistence.Column;
-import javax.validation.Constraint;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.Payload;
-import javax.validation.Valid;
-import javax.validation.constraints.Digits;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.activation.DataSource;
+import jakarta.inject.Named;
+import jakarta.persistence.Column;
+import jakarta.validation.Constraint;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.Payload;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Digits;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+ import org.apache.causeway.applib.value.semantics.TemporalValueSemantics.TemporalDisplayPattern;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/LocalDateTimeValueSemantics.java
index f508d1b1f2b,30ba34155e3..3c601e55ae3
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/LocalDateTimeValueSemantics.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/LocalDateTimeValueSemantics.java
@@@ -22,8 -22,10 +22,10 @@@ import java.time.Duration
import java.time.LocalDateTime;
import java.util.Optional;
-import javax.inject.Named;
+import jakarta.inject.Named;
+ import org.apache.causeway.core.metamodel.context.MetaModelContext;
+
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Component;
diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/LocalDateValueSemantics.java
index 5b038789e60,114a96138d1..9c78c8de664
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/LocalDateValueSemantics.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/LocalDateValueSemantics.java
@@@ -22,8 -22,10 +22,10 @@@ import java.time.Duration
import java.time.LocalDate;
import java.util.Optional;
-import javax.inject.Named;
+import jakarta.inject.Named;
+ import org.apache.causeway.core.metamodel.context.MetaModelContext;
+
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Component;
diff --cc core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/EntityPropertyChangePublisherDefault.java
index 528260d7f4d,bda76052971..d8bb0971bd8
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/EntityPropertyChangePublisherDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/EntityPropertyChangePublisherDefault.java
@@@ -20,14 -20,12 +20,12 @@@ package org.apache.causeway.core.runtim
import java.util.ArrayList;
import java.util.List;
- import java.util.function.Consumer;
- import java.util.stream.Collectors;
-import javax.annotation.PostConstruct;
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.lang.Nullable;