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 7146d4aefb13832b47780d86273eff01dc63c3cd
Merge: 61280f3b15 fa2d503d78
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Tue Nov 29 10:46:56 2022 +0100
ISIS-3275: [Incubating] Migrate from Spring Framework 5.x to 6.x
bom/pom.xml | 583 ++++++++++++++++++++++++++++++-----------------------------
core/pom.xml | 93 +---------
2 files changed, 297 insertions(+), 379 deletions(-)
diff --cc bom/pom.xml
index a28b754203,6aacb967ab..0a2d474432
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@@ -41,8 -39,7 +39,7 @@@ It is therefore a copy of org.apache:ap
</parent>
<groupId>org.apache.causeway</groupId>
<artifactId>causeway-bom</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
- <!-- APACHE CAUSEWAY customisation 1/21: end -->
<packaging>pom</packaging>
@@@ -300,13 -60,11 +60,11 @@@
<minimalMavenBuildVersion>3.2.5</minimalMavenBuildVersion>
<minimalJavaBuildVersion>1.8</minimalJavaBuildVersion>
- <!-- APACHE CAUSEWAY customisation 5/21: start -->
- <java.version>11</java.version>
+ <java.version>17</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
- <maven.compiler.release>11</maven.compiler.release>
+ <maven.compiler.release>${java.version}</maven.compiler.release>
<surefire.version>3.0.0-M7</surefire.version>
- <!-- APACHE CAUSEWAY customisation 5/21: end -->
<!-- for surefire, failsafe and surefire-report -->
<maven.plugin.tools.version>3.7.0</maven.plugin.tools.version>
@@@ -433,9 -184,39 +192,38 @@@
<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 -->
- <wicketstuff.version>${wicket.version}</wicketstuff.version> <!--
org.wicketstuff:wicketstuff-select2 -->
-
<wicketstuff-gmap3.version>${wicket.version}</wicketstuff-gmap3.version>
+ <wicketstuff.version>9.12.0</wicketstuff.version> <!--
org.wicketstuff:wicketstuff-select2 -->
- <!-- APACHE CAUSEWAY customisation 6/21: end -->
+ <!-- OTHER -->
+
+ <distMgmtSnapshotsName>Apache Development Snapshot
Repository</distMgmtSnapshotsName>
+
<distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
+
<organization.logo>https://www.apache.org/images/asf_logo_wide_2016.png</organization.logo>
+ <license.additional-notes>In addition, Apache Causeway uses some
+ JavaScript libraries:
+
+ * Twitter Bootstrap, licensed under MIT [1]
+ *
+ Bootstrap-Growl (JQuery plugin), licensed under MIT
license [2]
+ *
+ LiveQuery (JQuery plugin), licensed under MIT license
[3]
+ * Wicket
+ Bootstrap, licenced under ASL 2 [4]
+ * Bootstrap Datetimepicker,
+ licensed under MIT licence [5]
+ * Moment.js, licenced under MIT licence
+ [6]
+
+ [1]
https://github.com/twbs/bootstrap/blob/master/LICENSE
+ [2]
+
https://github.com/mouse0270/bootstrap-growl/blob/master/LICENSE
+ [3]
+ https://github.com/brandonaaron/livequery#license
+ [4]
+ https://github.com/l0rdn1kk0n/wicket-bootstrap
+ [5]
+
https://github.com/Eonasdan/bootstrap-datetimepicker/blob/master/LICENSE
+ [6]
https://github.com/moment/moment/blob/develop/LICENSE</license.additional-notes>
</properties>
<dependencyManagement>
<dependencies>
@@@ -447,29 -228,6 +235,28 @@@
</dependencies>
</dependencyManagement>
<repositories>
- <!-- APACHE CAUSEWAY customisation 7/21: start -->
+ <repository>
+ <!-- temporary till release of cxf 4.0.0, shiro 2.0.0
and wicket 10.0.0 -->
+ <id>apache.snapshots</id>
+ <name>Shiro Snapshot Repository</name>
+ <url>https://repository.apache.org/content/groups/snapshots/</url>
+ <snapshots><enabled>true</enabled></snapshots>
+ </repository>
+ <repository>
+ <!-- used for wicket 10.0.0-M1-SNAPSHOT fork at
+
https://jitpack.io/#apache-causeway-committers/wicket
+ temporary till release of wicket 10.0.0 -->
+ <id>jitpack.io</id>
+ <url>https://jitpack.io</url>
+ </repository>
+ <repository>
+ <!-- temporary till release of wicket-stuff 10.0.0 -->
+ <id>wicketstuff-core-snapshots</id>
+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
<!-- breaks dependabot run: timeout due to repo not accessible
<repository>
<id>apache.snapshots</id>
@@@ -1195,9 -965,9 +994,8 @@@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
- <!-- APACHE CAUSEWAY customisation 20/21: start -->
<modules>
<module>../core</module>
<module>../extensions</module>
