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 3984bec1d6a0f9ee0ddd00eda1ba748ece5830cd Merge: 595251227b ae08941861 Author: Andi Huber <[email protected]> AuthorDate: Thu Jan 18 08:30:17 2024 +0100 Merge remote-tracking branch 'origin/master' into spring6 .../workflows/ci-build-artifacts-no-push-maven.yml | 2 +- .../workflows/ci-build-artifacts-push-maven.yml | 2 +- .../ROOT/pages/2024/2.0.0-RC5/mignotes.adoc | 23 +- antora/supplemental-ui/css/docsearch.min.css | 4 + .../supplemental-ui/css/fonts-googleapis-com.css | 862 +++++++++++++++++++++ antora/supplemental-ui/index.html | 33 +- antora/supplemental-ui/js/docsearch.min.js | 4 + .../core/config/CausewayConfiguration.java | 63 +- core/metamodel/src/main/java/module-info.java | 1 + core/runtime/src/main/java/module-info.java | 1 + .../causeway/core/runtime/flushmgmt/FlushMgmt.java | 32 +- .../runtimeservices/src/main/java/module-info.java | 1 - .../CausewayModuleCoreRuntimeServices.java | 4 - .../transaction/TransactionServiceSpring.java | 10 +- .../integtests/ExcelModuleIntegTestAbstract.java | 3 + .../github/menu/LayoutLoadersGitHubMenu.java | 2 +- .../applib/CausewayModuleExtAuditTrailApplib.java | 4 +- .../contributions/Object_createdByCommand.java | 20 - .../dom/ApplicationUserRepositoryAbstract.java | 2 - extensions/vw/pdfjs/metamodel/pom.xml | 7 + .../metamodel/PdfjsViewer_Abstract_IntegTest.java | 3 + .../primary/ui/CommandReplayOnPrimaryService.java | 1 - .../mixins/CommandLogEntry_replayQueue.java | 1 - persistence/commons/src/main/java/module-info.java | 1 + .../commons/CausewayModulePersistenceCommons.java | 7 + .../changetracking/EntityChangeTrackerDefault.java | 100 ++- .../PreAndPostValueEvaluatorServiceDefault.java | 4 +- .../repository/RepositoryServiceDefault.java | 14 +- regressiontests/stable-config/pom.xml | 3 +- regressiontests/stable-domainmodel/pom.xml | 2 +- .../integtest/Layout_Counter_IntegTest.java | 29 +- .../integtest/Layout_SimpleObject_IntegTest.java | 3 + regressiontests/stable/pom.xml | 7 +- .../testdomain/conf/Configuration_headless.java | 22 +- testing/fakedata/applib/pom.xml | 10 +- .../CausewayRestfulObjectsInteractionFilter.java | 10 +- 36 files changed, 1134 insertions(+), 163 deletions(-) diff --cc core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java index 456ac2e288,7f05a9e4e1..22b1e7e0b7 --- 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 @@@ -43,22 -43,25 +43,25 @@@ 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.query.Query; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationProperties; + import org.springframework.boot.context.properties.DeprecatedConfigurationProperty; import org.springframework.boot.info.BuildProperties; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.EnumerablePropertySource; diff --cc core/runtime/src/main/java/module-info.java index 66629262c8,31d8867eb3..faad94f47b --- a/core/runtime/src/main/java/module-info.java +++ b/core/runtime/src/main/java/module-info.java @@@ -18,11 -18,12 +18,12 @@@ */ module org.apache.causeway.core.runtime { exports org.apache.causeway.core.runtime; + exports org.apache.causeway.core.runtime.flushmgmt; exports org.apache.causeway.core.runtime.events; - requires java.annotation; + requires jakarta.annotation; requires java.desktop; - requires java.inject; + requires jakarta.inject; requires lombok; requires org.apache.causeway.applib; requires org.apache.causeway.commons; diff --cc core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/transaction/TransactionServiceSpring.java index 64cc390b57,78e4156a73..75042bce28 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/transaction/TransactionServiceSpring.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/transaction/TransactionServiceSpring.java @@@ -23,11 -23,13 +23,13 @@@ import java.util.Optional import java.util.concurrent.Callable; import java.util.concurrent.atomic.LongAdder; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Provider; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Provider; + import org.apache.causeway.core.runtime.flushmgmt.FlushMgmt; + import org.springframework.aop.support.AopUtils; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; diff --cc extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/contributions/Object_createdByCommand.java index 692fe58cff,7728c3cbdc..8f3773bb0b --- a/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/contributions/Object_createdByCommand.java +++ b/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/contributions/Object_createdByCommand.java @@@ -19,13 -19,10 +19,10 @@@ */ package org.apache.causeway.extensions.audittrail.applib.contributions; - import java.util.Collections; import java.util.Comparator; - import java.util.List; import java.util.Optional; - import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.ActionLayout; diff --cc extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_Abstract_IntegTest.java index bc9ce241ea,235e17c24a..b3933d1ea3 --- a/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_Abstract_IntegTest.java +++ b/extensions/vw/pdfjs/metamodel/src/test/java/org/apache/causeway/extensions/pdfjs/metamodel/PdfjsViewer_Abstract_IntegTest.java @@@ -20,9 -20,11 +20,11 @@@ package org.apache.causeway.extensions. import java.util.Collections; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import org.apache.causeway.persistence.commons.CausewayModulePersistenceCommons; + import org.approvaltests.Approvals; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; diff --cc persistence/commons/src/main/java/module-info.java index 589cbf03e2,76f5cf1358..42f2a4d9fc --- a/persistence/commons/src/main/java/module-info.java +++ b/persistence/commons/src/main/java/module-info.java @@@ -19,11 -19,12 +19,12 @@@ module org.apache.causeway.persistence.commons { exports org.apache.causeway.persistence.commons; exports org.apache.causeway.persistence.commons.metamodel.facets.prop.column; + exports org.apache.causeway.persistence.commons.integration.repository; exports org.apache.causeway.persistence.commons.integration.changetracking; - requires java.annotation; + requires jakarta.annotation; requires java.desktop; - requires java.inject; + requires jakarta.inject; requires java.sql; requires java.xml; requires lombok; diff --cc persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/EntityChangeTrackerDefault.java index 48c7ba392b,88a5cd49d5..1cb41d1757 --- a/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/EntityChangeTrackerDefault.java +++ b/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/EntityChangeTrackerDefault.java @@@ -27,9 -27,10 +27,10 @@@ import java.util.concurrent.atomic.Atom import java.util.concurrent.atomic.LongAdder; import java.util.function.Function; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Provider; ++import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.inject.Provider; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.core.Ordered; diff --cc persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/PreAndPostValueEvaluatorServiceDefault.java index 756d359d76,cac2e76d5b..221176c1f6 --- a/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/PreAndPostValueEvaluatorServiceDefault.java +++ b/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/PreAndPostValueEvaluatorServiceDefault.java @@@ -19,10 -19,12 +19,12 @@@ */ package org.apache.causeway.persistence.commons.integration.changetracking; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; + import org.apache.causeway.persistence.commons.CausewayModulePersistenceCommons; + import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --cc regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java index f4dc660985,cf630f5db8..262fd7b3db --- a/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java +++ b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java @@@ -23,9 -23,11 +23,11 @@@ import java.util.List import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + import org.apache.causeway.persistence.commons.CausewayModulePersistenceCommons; + import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; diff --cc regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java index 6d086d4ed1,f65812af32..8def05c74a --- a/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java +++ b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java @@@ -22,8 -22,10 +22,10 @@@ package org.apache.causeway.regressiont import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; + import org.apache.causeway.persistence.commons.CausewayModulePersistenceCommons; + import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test;
