Switch to Web Flow 3.0

Upgrade to Spring Framework 6 and change package imports from servlet
to jakarta.

Not yet working as there is no Tiles anymore.
This commit is contained in:
rstoyanchev
2022-07-15 12:49:25 +01:00
parent 65a16fe70b
commit 2b42fa3736
14 changed files with 75 additions and 101 deletions

21
pom.xml
View File

@@ -10,26 +10,29 @@
<modules>
<module>booking-mvc</module>
<!--
<module>booking-faces</module>
<module>primefaces-showcase</module>
<module>webflow-showcase</module>
-->
</modules>
<properties>
<easymock.version>3.4</easymock.version>
<hsqldb.version>2.5.1</hsqldb.version>
<hibernate.version>5.4.33.Final</hibernate.version>
<hibernate-validator.version>6.2.3.Final</hibernate-validator.version>
<hibernate.version>5.6.10.Final</hibernate.version>
<hibernate-validator.version>7.0.4.Final</hibernate-validator.version>
<jaxb.version>2.2.3</jaxb.version>
<jetty-maven-plugin.version>9.4.48.v20220622</jetty-maven-plugin.version>
<jetty-maven-plugin.version>11.0.11</jetty-maven-plugin.version>
<jsp-api.version>3.0.0</jsp-api.version>
<jstl-api>2.0.0</jstl-api>
<junit.version>4.13.2</junit.version>
<log4j.version>2.14.0</log4j.version>
<mojarra.version>2.2.20</mojarra.version>
<myfaces.version>2.3.8</myfaces.version>
<primefaces.version>8.0</primefaces.version>
<servlet.version>3.1.0</servlet.version>
<tiles.version>3.0.8</tiles.version>
<webflow.version>2.5.1.RELEASE</webflow.version>
<servlet.version>5.0.0</servlet.version>
<webflow.version>3.0.0-SNAPSHOT</webflow.version>
</properties>
<dependencyManagement>
@@ -37,7 +40,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.22</version>
<version>6.0.0-M5</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -46,7 +49,7 @@
<artifactId>spring-security-bom</artifactId>
<type>pom</type>
<scope>import</scope>
<version>5.6.6</version>
<version>6.0.0-M5</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -56,7 +59,6 @@
</dependencies>
</dependencyManagement>
<!--
<repositories>
<repository>
<id>spring-snapshot</id>
@@ -69,6 +71,5 @@
<url>https://repo.spring.io/milestone</url>
</repository>
</repositories>
-->
</project>