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 92f9b4af9eccc8f165f33378a7ef41831f3f9702 Merge: ba3e04fceb 7a9f63fa7a Author: Andi Huber <[email protected]> AuthorDate: Tue Nov 29 16:22:07 2022 +0100 ISIS-3275: [Incubating] Migrate from Spring Framework 5.x to 6.x bom/pom.xml | 71 +++++++++++++++++++----- commons/pom.xml | 9 +-- core/NOTICE | 7 --- core/pom.xml | 138 +--------------------------------------------- viewers/wicket/pom.xml | 77 ++++++++++++++++++++++++++ viewers/wicket/ui/pom.xml | 1 + 6 files changed, 139 insertions(+), 164 deletions(-) diff --cc commons/pom.xml index a479b43caf,4e84adcce8..e5f2ea03af --- a/commons/pom.xml +++ b/commons/pom.xml @@@ -83,13 -77,7 +77,12 @@@ <groupId>com.fasterxml.jackson.module</groupId> <artifactId>jackson-module-jaxb-annotations</artifactId> </dependency> - --> - + + <dependency> + <groupId>com.fasterxml.jackson.jakarta.rs</groupId> + <artifactId>jackson-jakarta-rs-json-provider</artifactId> + </dependency> + <dependency> <groupId>org.jsoup</groupId> <artifactId>jsoup</artifactId> diff --cc viewers/wicket/pom.xml index 0e2c048242,7cf278ee54..f8c3440409 --- a/viewers/wicket/pom.xml +++ b/viewers/wicket/pom.xml @@@ -31,8 -31,85 +31,85 @@@ <groupId>org.apache.causeway.viewer</groupId> <artifactId>causeway-viewer-wicket</artifactId> <name>Apache Causeway Viewer - Wicket</name> - + <packaging>pom</packaging> + + <dependencies> + <dependency> + <groupId>de.agilecoders.wicket</groupId> + <artifactId>wicket-bootstrap-extensions</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-util</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-request</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-extensions</artifactId> + </exclusion> + <exclusion> + <groupId>org.webjars</groupId> + <artifactId>bootstrap</artifactId> + </exclusion> + <exclusion> + <groupId>org.webjars</groupId> + <artifactId>font-awesome</artifactId> + </exclusion> + <exclusion> + <groupId>org.webjars</groupId> + <artifactId>jquery</artifactId> + </exclusion> + <exclusion> + <groupId>org.webjars</groupId> + <artifactId>jquerypp</artifactId> + </exclusion> + <exclusion> + <groupId>org.webjars</groupId> + <artifactId>jquery-ui</artifactId> + </exclusion> + <exclusion> + <groupId>org.webjars</groupId> + <artifactId>typeaheadjs</artifactId> + </exclusion> + <exclusion> + <groupId>org.webjars</groupId> + <artifactId>x-editable-bootstrap</artifactId> + </exclusion> + <exclusion> + <groupId>org.webjars</groupId> + <artifactId>spin-js</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.javascript</groupId> + <artifactId>closure-compiler</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.javascript</groupId> + <artifactId>closure-compiler-unshaded</artifactId> + </exclusion> + <exclusion> + <groupId>org.webjars.bower</groupId> + <artifactId>summernote</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + <exclusion> + <groupId>org.webjars.bower</groupId> + <artifactId>momentjs</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> <modules> <module>applib</module>
