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 e5224b2653247d9985450f23b619b16c60cc85ab Merge: 635557540d 5505f7bada Author: Andi Huber <[email protected]> AuthorDate: Thu Sep 28 17:50:15 2023 +0200 Merge remote-tracking branch 'origin/master' into spring6 ...anticsProvider_configureDecimalFormat_Test.java | 22 +++---- .../applib/CausewayModuleExtCommandLogApplib.java | 4 ++ .../applib/job/BackgroundCommandsJobControl.java | 70 ++++++++++++++++++++++ .../applib/job/RunBackgroundCommandsJob.java | 32 ++++------ .../ui/CausewayModuleExtExcelDownloadWicketUi.java | 4 +- .../wkt/ui/viewer}/CellStyleProvider.java | 2 +- .../viewer}/CollectionContentsAsExcelFactory.java | 2 +- .../wkt/ui/viewer}/ExcelFileDownloadLink.java | 2 +- .../wkt/ui/viewer}/ExcelFileModel.java | 2 +- .../wkt/ui/viewer}/_TimeConversion.java | 2 +- persistence/commons/src/main/java/module-info.java | 2 +- .../commons/CausewayModulePersistenceCommons.java | 4 +- .../changetracking/EntityChangeTrackerDefault.java | 2 +- .../PreAndPostValueEvaluatorService.java | 2 +- .../PreAndPostValueEvaluatorServiceDefault.java | 2 +- .../changetracking/_ChangingEntitiesFactory.java | 2 +- .../changetracking/_SimpleChangingEntities.java | 2 +- .../integration/changetracking/_Xray.java | 2 +- .../ROOT/pages/setup-and-configuration.adoc | 9 ++- .../PreAndPostValueEvaluatorServiceJdo.java | 2 +- 20 files changed, 113 insertions(+), 58 deletions(-) diff --cc extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/job/RunBackgroundCommandsJob.java index c3c214baba,2d39ee1881..e61bc0c19b --- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/job/RunBackgroundCommandsJob.java +++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/job/RunBackgroundCommandsJob.java @@@ -23,10 -23,8 +23,8 @@@ import java.util.Optional import java.util.UUID; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; - import org.apache.causeway.applib.annotation.Programmatic; - import org.quartz.DisallowConcurrentExecution; import org.quartz.Job; import org.quartz.JobExecutionContext; diff --cc persistence/commons/src/main/java/module-info.java index e12d2873e5,ddc1bccd1e..f726ad46bd --- a/persistence/commons/src/main/java/module-info.java +++ b/persistence/commons/src/main/java/module-info.java @@@ -17,13 -17,13 +17,13 @@@ * under the License. */ module org.apache.causeway.persistence.commons { - exports org.apache.causeway.persistence.jpa.integration.changetracking; exports org.apache.causeway.persistence.commons; exports org.apache.causeway.persistence.commons.metamodel.facets.prop.column; + 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/PreAndPostValueEvaluatorServiceDefault.java index 5a3df04dee,211c828368..756d359d76 --- 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 @@@ -17,11 -17,11 +17,11 @@@ * under the License. * */ - package org.apache.causeway.persistence.jpa.integration.changetracking; + 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.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service;
