diff --git a/booking-faces/pom.xml b/booking-faces/pom.xml
index b2156b1..768ff16 100644
--- a/booking-faces/pom.xml
+++ b/booking-faces/pom.xml
@@ -36,12 +36,10 @@
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-web</artifactId>
-			<version>${spring-security.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-config</artifactId>
-			<version>${spring-security.version}</version>
         </dependency>
 		<!-- Servlet -->
 		<dependency>
diff --git a/booking-faces/src/main/java/org/springframework/webflow/samples/booking/HotelLazyDataModel.java b/booking-faces/src/main/java/org/springframework/webflow/samples/booking/HotelLazyDataModel.java
index 03b94c0..7c07ddc 100644
--- a/booking-faces/src/main/java/org/springframework/webflow/samples/booking/HotelLazyDataModel.java
+++ b/booking-faces/src/main/java/org/springframework/webflow/samples/booking/HotelLazyDataModel.java
@@ -3,8 +3,10 @@ package org.springframework.webflow.samples.booking;
 import java.util.List;
 import java.util.Map;
 
+import org.primefaces.model.FilterMeta;
 import org.primefaces.model.LazyDataModel;
 import org.primefaces.model.SortOrder;
+
 import org.springframework.beans.factory.annotation.Autowired;
 
 public class HotelLazyDataModel extends LazyDataModel<Hotel> {
@@ -30,7 +32,7 @@ public class HotelLazyDataModel extends LazyDataModel<Hotel> {
 	}
 
 	@Override
-	public List<Hotel> load(int first, int pageSize, String sortField, SortOrder order, Map<String, Object> filters) {
+	public List<Hotel> load(int first, int pageSize, String sortField, SortOrder order, Map<String, FilterMeta> filterBy) {
 		this.searchCriteria.setCurrentPage(first / pageSize + 1);
 		this.hotels = bookingService.findHotels(searchCriteria, first, sortField, order.equals(SortOrder.ASCENDING));
 		return hotels;
@@ -39,7 +41,7 @@ public class HotelLazyDataModel extends LazyDataModel<Hotel> {
 	@Override
 	public Hotel getRowData(String rowKey) {
 		for (Hotel hotel : this.hotels){
-			if (hotel.getId().equals(rowKey)) {
+			if (hotel.getId().equals(Long.valueOf(rowKey))) {
 				return hotel;
 			}
  		}
diff --git a/booking-faces/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.xhtml b/booking-faces/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.xhtml
index b439c83..10ef102 100644
--- a/booking-faces/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.xhtml
+++ b/booking-faces/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.xhtml
@@ -42,7 +42,7 @@
 				<div class="span-5">
 					<p>
 						<p:calendar id="checkinDate" label="Check in date" 
-							value="#{booking.checkinDate}" pattern="MM-dd-yyyy" timeZone="EST" required="true" />
+							value="#{booking.checkinDate}" pattern="MM-dd-yyyy" required="true" />
 	               	</p>
 				</div>
 				<div class="span-4">
@@ -51,7 +51,7 @@
 				<div class="span-5 last">
 					<p>
 						<p:calendar id="checkoutDate" label="Check out date" 
-							value="#{booking.checkoutDate}" pattern="MM-dd-yyyy" timeZone="EST" required="true" />
+							value="#{booking.checkoutDate}" pattern="MM-dd-yyyy" required="true" />
 					</p>
 				</div>
 			</div>
diff --git a/booking-mvc/pom.xml b/booking-mvc/pom.xml
index 9c92a65..23b34aa 100644
--- a/booking-mvc/pom.xml
+++ b/booking-mvc/pom.xml
@@ -41,17 +41,14 @@
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-web</artifactId>
-			<version>${spring-security.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-taglibs</artifactId>
-			<version>${spring-security.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-config</artifactId>
-			<version>${spring-security.version}</version>
         </dependency>
 		<!-- Servlet -->
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 6d86770..00e0c97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,18 +17,17 @@
 
 	<properties>
 		<easymock.version>3.4</easymock.version>
-		<hsqldb.version>2.4.0</hsqldb.version>
-		<hibernate.version>5.2.12.Final</hibernate.version>
-		<hibernate-validator.version>6.0.7.Final</hibernate-validator.version>
+		<hsqldb.version>2.5.1</hsqldb.version>
+		<hibernate.version>5.4.28.Final</hibernate.version>
+		<hibernate-validator.version>6.2.0.Final</hibernate-validator.version>
 		<jaxb.version>2.2.3</jaxb.version>
-		<jetty-maven-plugin.version>9.4.8.v20171121</jetty-maven-plugin.version>
-		<junit.version>4.12</junit.version>
-		<log4j.version>2.10.0</log4j.version>
-		<mojarra.version>2.2.16</mojarra.version>
-		<myfaces.version>2.2.12</myfaces.version>
-		<primefaces.version>6.1</primefaces.version>
+		<jetty-maven-plugin.version>9.4.38.v20210224</jetty-maven-plugin.version>
+		<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>
-		<spring-security.version>5.1.5.RELEASE</spring-security.version>
 		<tiles.version>3.0.8</tiles.version>
 		<webflow.version>2.5.1.RELEASE</webflow.version>
 	</properties>
@@ -38,14 +37,21 @@
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-framework-bom</artifactId>
-				<version>5.1.7.RELEASE</version>
+				<version>5.3.4</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.security</groupId>
+				<artifactId>spring-security-bom</artifactId>
+				<type>pom</type>
+				<scope>import</scope>
+				<version>5.4.2</version>
+			</dependency>
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-api</artifactId>
-				<version>1.7.25</version>
+				<version>1.7.30</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
diff --git a/primefaces-showcase/pom.xml b/primefaces-showcase/pom.xml
index a71a88b..5cdf1a9 100644
--- a/primefaces-showcase/pom.xml
+++ b/primefaces-showcase/pom.xml
@@ -28,17 +28,14 @@
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-config</artifactId>
-			<version>${spring-security.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-web</artifactId>
-			<version>${spring-security.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-taglibs</artifactId>
-			<version>${spring-security.version}</version>
 		</dependency>
 		<!-- Servlet -->
 		<dependency>