Spring/spring-webflow-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade dependencies

Browse Source
This commit is contained in:
Rossen Stoyanchev
2021-03-01 16:09:35 +00:00
parent 2e9b7b4987
commit afef4d7028
6 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
booking-faces/pom.xml
View File

@@ -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>

6
booking-faces/src/main/java/org/springframework/webflow/samples/booking/HotelLazyDataModel.java
View File

@@ -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;
}
}

4
booking-faces/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.xhtml
View File

@@ -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>

3
booking-mvc/pom.xml
View File

@@ -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>

30
pom.xml
View File

@@ -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>

3
primefaces-showcase/pom.xml
View File

@@ -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>