diff --git a/booking-faces/pom.xml b/booking-faces/pom.xml index 7157d32..2a8733b 100644 --- a/booking-faces/pom.xml +++ b/booking-faces/pom.xml @@ -9,19 +9,21 @@ 1.0.0.BUILD-SNAPSHOT - 2.4.0.RC1 - 4.0.3.RELEASE - 3.2.0.RELEASE + 2.4.0.RELEASE + 4.0.5.RELEASE + 3.2.4.RELEASE 1.6.1 2.2.5 - 4.0 + 5.0 - spring-repository - SpringSource Repository - http://repo.springsource.org/milestone + spring + Spring Repository + http://repo.spring.io/milestone + true + true primefaces-repository @@ -29,11 +31,6 @@ http://repository.primefaces.org default - - spring-snapshots - SpringSource Repository - http://repo.springsource.org/snapshot - 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 6093396..96e7ca3 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 @@ -33,7 +33,7 @@ public class HotelLazyDataModel extends LazyDataModel { } @Override - public List load(int first, int pageSize, String sortField, SortOrder order, Map filters) { + public List load(int first, int pageSize, String sortField, SortOrder order, Map filters) { this.searchCriteria.setCurrentPage(first / pageSize + 1); this.hotels = bookingService.findHotels(searchCriteria, first, sortField, order.equals(SortOrder.ASCENDING)); return hotels; diff --git a/booking-mvc/pom.xml b/booking-mvc/pom.xml index 3263e28..caa7892 100644 --- a/booking-mvc/pom.xml +++ b/booking-mvc/pom.xml @@ -9,27 +9,24 @@ 1.0.0.BUILD-SNAPSHOT - 2.4.0.RC1 - 4.0.3.RELEASE - 3.2.0.RELEASE + 2.4.0.RELEASE + 4.0.5.RELEASE + 3.2.4.RELEASE 1.7.5 - 2.1.2.RELEASE + 2.1.3.RELEASE 2.1.1.RELEASE 2.1.1.RELEASE - 2.1.0.RELEASE + 2.1.1.RELEASE 2.2.2 - spring-milestones - SpringSource Repository - http://repo.springsource.org/milestone - - - spring-snapshots - SpringSource Repository - http://repo.springsource.org/snapshot + spring + Spring Repository + http://repo.spring.io/milestone + true + true diff --git a/booking-portlet-faces/pom.xml b/booking-portlet-faces/pom.xml index 66f5cbb..99b0bc0 100644 --- a/booking-portlet-faces/pom.xml +++ b/booking-portlet-faces/pom.xml @@ -9,17 +9,19 @@ 1.0.0.BUILD-SNAPSHOT - 2.4.0.RC1 - 4.0.3.RELEASE - 1.5.10 + 2.4.0.RELEASE + 4.0.5.RELEASE + 1.7.5 2.1.6 - spring-repository - SpringSource Repository - http://repo.springsource.org/milestone + spring + Spring Repository + http://repo.spring.io/milestone + true + true diff --git a/booking-portlet-faces/src/main/resources/log4j.xml b/booking-portlet-faces/src/main/resources/log4j.xml index 4c3ff1c..ee75d5d 100644 --- a/booking-portlet-faces/src/main/resources/log4j.xml +++ b/booking-portlet-faces/src/main/resources/log4j.xml @@ -32,15 +32,15 @@ - + - + - + diff --git a/booking-portlet-mvc/pom.xml b/booking-portlet-mvc/pom.xml index 08fcc70..41abe7e 100644 --- a/booking-portlet-mvc/pom.xml +++ b/booking-portlet-mvc/pom.xml @@ -9,16 +9,18 @@ 1.0.0.BUILD-SNAPSHOT - 2.4.0.RC1 - 4.0.3.RELEASE - 1.5.10 + 2.4.0.RELEASE + 4.0.5.RELEASE + 1.7.5 - spring-repository - SpringSource Repository - http://repo.springsource.org/milestone + spring + Spring Repository + http://repo.spring.io/milestone + true + true @@ -146,7 +148,7 @@ org.hibernate hibernate-validator - 4.1.0.Beta1 + 4.3.0.Final @@ -184,9 +184,9 @@ - springsource - SpringSource Repository - http://repo.springsource.org/milestone + spring + Spring Repository + http://repo.spring.io/milestone true true diff --git a/primefaces-showcase/src/main/webapp/WEB-INF/views/home.xhtml b/primefaces-showcase/src/main/webapp/WEB-INF/views/home.xhtml index 6522621..de21c94 100644 --- a/primefaces-showcase/src/main/webapp/WEB-INF/views/home.xhtml +++ b/primefaces-showcase/src/main/webapp/WEB-INF/views/home.xhtml @@ -115,7 +115,7 @@ - springsource - SpringSource Repository - http://repo.springsource.org/milestone + spring-milestone + Spring Repository + http://repo.spring.io/milestone true true - org.jboss.repository.releases + jboss JBoss Maven Release Repository https://repository.jboss.org/nexus/content/repositories/releases false