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/isis.git
commit 5a68b5a4eb01fbdaf0ffcb04833814860321e064 Merge: 007f1aad4f b3dee83595 Author: Andi Huber <[email protected]> AuthorDate: Wed Dec 14 07:01:06 2022 +0100 ISIS-3275: [Incubating] Migrate from Spring Framework 5.x to 6.x bom/pom.xml | 2 +- .../apache/causeway/commons/collections/Can.java | 4 +-- .../commons/collections/Can_Singleton.java | 2 +- .../commons/internal/ioc/_IocContainer.java | 2 +- .../org/apache/causeway/commons/io/DataSink.java | 2 +- .../org/apache/causeway/commons/io/DtoMapper.java | 22 +++++----------- .../_testing/MetaModelContext_forTesting.java | 2 +- .../_testing/ServiceRegistry_forTesting.java | 2 +- .../core/metamodel/facetapi/FacetRanking.java | 2 +- .../core/metamodel/facets/ImperativeAspect.java | 2 +- ...ctionInvocationFacetForDomainEventAbstract.java | 4 +-- .../ActionParameterValidationFacetViaMethod.java | 2 +- .../method/ActionValidationFacetViaMethod.java | 2 +- .../CollectionAccessorFacetViaAccessor.java | 2 +- .../method/DisableForContextFacetViaMethod.java | 2 +- .../method/HideForContextFacetViaMethod.java | 2 +- .../ActionParameterAutoCompleteFacetViaMethod.java | 2 +- .../ActionParameterChoicesFacetViaMethod.java | 2 +- .../ActionParameterDefaultsFacetViaMethod.java | 2 +- .../ActionParameterDisabledFacetViaMethod.java | 2 +- .../ActionParameterHiddenFacetViaMethod.java | 2 +- .../ActionParameterValidationFacetViaMethod.java | 2 +- .../accessor/PropertyAccessorFacetViaAccessor.java | 2 +- .../method/PropertyAutoCompleteFacetMethod.java | 2 +- .../method/PropertyChoicesFacetViaMethod.java | 2 +- .../method/PropertyDefaultFacetViaMethod.java | 2 +- .../clear/PropertyClearFacetViaClearMethod.java | 2 +- .../clear/PropertyClearFacetViaSetterMethod.java | 2 +- ...PropertyInitializationFacetViaSetterMethod.java | 2 +- .../modify/PropertySetterFacetViaSetterMethod.java | 2 +- .../services/layout/LayoutServiceDefault.java | 2 +- .../services/metamodel/DomainMemberDefault.java | 2 +- ...etaModelValidatorForConflictingOptionality.java | 2 +- .../actions/ActionMethodsFacetFactoryTest.java | 16 ++++++------ ...nnotationFacetFactoryTest_ActionInvocation.java | 8 +++--- .../CollectionFieldMethodsFacetFactoryTest.java | 12 ++++----- .../title/TitleFacetViaMethodsFactoryTest.java | 2 +- .../PropertyMethodsFacetFactoryTest.java | 30 +++++++++++----------- .../metamodel/services/grid/GridLoadingTest.java | 2 +- .../core/runtimeservices/executor/_Xray.java | 8 +++--- .../core/runtimeservices/publish/_Xray.java | 10 ++++---- .../menubars/bootstrap/MenuBarsServiceBSTest.java | 2 +- .../CausewayModuleIncViewerVaadinViewer.java | 10 +++++--- .../jpa/integration/changetracking/_Xray.java | 4 +-- .../DomainModelTest_usingGoodDomain.java | 6 ++--- .../actionresponse/ActionResultResponseType.java | 2 +- 46 files changed, 98 insertions(+), 104 deletions(-) diff --cc bom/pom.xml index c074500c4a,daca831801..6a358fcd2b --- a/bom/pom.xml +++ b/bom/pom.xml @@@ -188,10 -182,9 +188,10 @@@ It is therefore a copy of org.apache:ap <togglz.version>3.3.2</togglz.version> - <vaadin.version>23.2.11</vaadin.version> + <vaadin.version>23.3.0</vaadin.version> - <wicket.version>9.12.0</wicket.version> <!-- 9.4.0 is last known good, before wicket put jupiter-api on the module graph --> + <wicket.version>936167650a</wicket.version> <!-- 9.4.0 is last known good, before wicket put jupiter-api on the module graph --> + <wicket-bootstrap.version>6.0.0-M8</wicket-bootstrap.version> <!-- de.agilecoders.wicket:wicket-bootstrap... --> <wicket-webjars.version>3.0.6</wicket-webjars.version> <wicket-viewer-jquery.version>3.6.1</wicket-viewer-jquery.version> <!-- as served by wicket via webjars --> diff --cc incubator/viewers/vaadin/viewer/src/main/java/org/apache/causeway/incubator/viewer/vaadin/viewer/CausewayModuleIncViewerVaadinViewer.java index 894e44d465,21690cf3ee..2b24c44993 --- a/incubator/viewers/vaadin/viewer/src/main/java/org/apache/causeway/incubator/viewer/vaadin/viewer/CausewayModuleIncViewerVaadinViewer.java +++ b/incubator/viewers/vaadin/viewer/src/main/java/org/apache/causeway/incubator/viewer/vaadin/viewer/CausewayModuleIncViewerVaadinViewer.java @@@ -18,7 -18,13 +18,10 @@@ */ package org.apache.causeway.incubator.viewer.vaadin.viewer; -import java.util.HashMap; + -import javax.inject.Inject; ++import jakarta.inject.Inject; + -import com.vaadin.flow.spring.RootMappedCondition; import com.vaadin.flow.spring.SpringBootAutoConfiguration; -import com.vaadin.flow.spring.SpringServlet; import com.vaadin.flow.spring.VaadinConfigurationProperties; import com.vaadin.flow.spring.VaadinServletContextInitializer; import com.vaadin.flow.spring.VaadinWebsocketEndpointExporter; @@@ -35,8 -43,8 +38,6 @@@ import org.springframework.web.socket.s import org.apache.causeway.applib.services.iactnlayer.InteractionService; import org.apache.causeway.incubator.viewer.vaadin.ui.CausewayModuleIncViewerVaadinUi; - import jakarta.inject.Inject; -import lombok.val; -- /** * * @since 2.0
