update from upstream

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>
@@ -166,7 +164,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-                <version>2.20.1</version>
+				<version>${maven-surefire-plugin.version}</version>
 				<configuration>
 					<junitArtifactName>junit:junit</junitArtifactName>
 					<includes>

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

@@ -3,8 +3,10 @@
 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 void setSearchCriteria(SearchCriteria searchCriteria) {
 	}
 
 	@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 List<Hotel> load(int first, int pageSize, String sortField, SortOrder ord
 	@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;
 			}
  		}

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>

booking-mvc/pom.xml

@@ -41,103 +41,82 @@
 		<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>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
 			<version>${servlet.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet.jsp</groupId>
-			<artifactId>jsp-api</artifactId>
-			<version>2.1</version>
+			<groupId>jakarta.servlet.jsp</groupId>
+			<artifactId>jakarta.servlet.jsp-api</artifactId>
+			<version>${jsp-api.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jstl</artifactId>
-			<version>1.2</version>
+			<groupId>jakarta.servlet.jsp.jstl</groupId>
+			<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+			<version>${jstl-api}</version>
 		</dependency>
 		<!-- Thymeleaf -->
 		<dependency>
 			<groupId>org.thymeleaf</groupId>
 			<artifactId>thymeleaf</artifactId>
-			<version>2.1.5.RELEASE</version>
+			<version>3.1.0.M1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.thymeleaf</groupId>
-			<artifactId>thymeleaf-spring4</artifactId>
-			<version>2.1.5.RELEASE</version>
+			<artifactId>thymeleaf-spring6</artifactId>
+			<version>3.1.0.M1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.thymeleaf.extras</groupId>
-			<artifactId>thymeleaf-extras-tiles2-spring4</artifactId>
-			<version>2.1.1.RELEASE</version>
-		</dependency>
-		<dependency>
-			<groupId>org.thymeleaf.extras</groupId>
-			<artifactId>thymeleaf-extras-springsecurity4</artifactId>
-			<version>2.1.2.RELEASE</version>
+			<artifactId>thymeleaf-extras-springsecurity6</artifactId>
+			<version>3.1.0.M1</version>
 		</dependency>
+		<!--
 		<dependency>
 			<groupId>org.thymeleaf.extras</groupId>
 			<artifactId>thymeleaf-extras-conditionalcomments</artifactId>
 			<version>2.1.2.RELEASE</version>
 		</dependency>
-		<!-- Apache Tiles -->
-		<dependency>
-			<groupId>org.apache.tiles</groupId>
-			<artifactId>tiles-core</artifactId>
-			<version>${tiles.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tiles</groupId>
-			<artifactId>tiles-api</artifactId>
-			<version>${tiles.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tiles</groupId>
-			<artifactId>tiles-template</artifactId>
-			<version>${tiles.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tiles</groupId>
-			<artifactId>tiles-servlet</artifactId>
-			<version>${tiles.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tiles</groupId>
-			<artifactId>tiles-jsp</artifactId>
-			<version>${tiles.version}</version>
-		</dependency>
+		-->
 		<!-- Database, JPA -->
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
 			<version>${hsqldb.version}</version>
 			<scope>runtime</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-core-jakarta</artifactId>
+			<version>${hibernate.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-entitymanager</artifactId>
 			<version>${hibernate.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.hibernate</groupId>
+					<artifactId>hibernate-core</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<!-- JSR 303 with Hibernate Validator -->
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.validator</groupId>
 			<artifactId>hibernate-validator</artifactId>
 			<version>${hibernate-validator.version}</version>
 		</dependency>
@@ -215,16 +194,16 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.7.0</version>
+				<version>3.10.1</version>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<source>17</source>
+					<target>17</target>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.20.1</version>
+				<version>${maven-surefire-plugin.version}</version>
 				<configuration>
 					<junitArtifactName>junit:junit</junitArtifactName>
 					<includes>

booking-mvc/src/main/java/org/springframework/webflow/samples/booking/Booking.java

@@ -7,17 +7,17 @@
 import java.util.Date;
 import java.util.Set;
 
-import javax.persistence.Basic;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.persistence.Transient;
-import javax.validation.constraints.Future;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.Transient;
+import jakarta.validation.constraints.Future;
+import jakarta.validation.constraints.NotNull;
 
 import org.hibernate.validator.constraints.NotEmpty;
 import org.springframework.format.annotation.DateTimeFormat;

booking-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingDateRange.java

@@ -5,8 +5,8 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 @Constraint(validatedBy = BookingDateRangeValidator.class)
 @Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER })

booking-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingDateRangeValidator.java

@@ -1,7 +1,7 @@
 package org.springframework.webflow.samples.booking;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 
 public class BookingDateRangeValidator implements ConstraintValidator<BookingDateRange, Booking> {
 

booking-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingFlowHandler.java

@@ -1,7 +1,7 @@
 package org.springframework.webflow.samples.booking;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.webflow.core.FlowException;
 import org.springframework.webflow.execution.FlowExecutionOutcome;

booking-mvc/src/main/java/org/springframework/webflow/samples/booking/Hotel.java

@@ -3,10 +3,10 @@
 import java.io.Serializable;
 import java.math.BigDecimal;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
 
 /**
  * A hotel where users may book stays.

booking-mvc/src/main/java/org/springframework/webflow/samples/booking/HotelsController.java

@@ -21,7 +21,7 @@ public HotelsController(BookingService bookingService) {
 	}
 
 	@GetMapping("/hotels/search")
-	public void search(SearchCriteria searchCriteria, Principal currentUser, Model model) {
+	public void search(@SuppressWarnings("unused") SearchCriteria searchCriteria, Principal currentUser, Model model) {
 		if (currentUser != null) {
 			List<Booking> booking = bookingService.findBookings(currentUser.getName());
 			model.addAttribute(booking);

booking-mvc/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java

@@ -2,8 +2,8 @@
 
 import java.util.List;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Service;

booking-mvc/src/main/java/org/springframework/webflow/samples/booking/User.java

@@ -2,9 +2,9 @@
 
 import java.io.Serializable;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 /**
  * A user who can book hotels.

booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/DataAccessConfig.java

@@ -2,7 +2,7 @@
 
 import java.util.Collections;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 
 import org.springframework.context.annotation.Bean;

booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/DispatcherServletInitializer.java

@@ -1,6 +1,6 @@
 package org.springframework.webflow.samples.booking.config;
 
-import javax.servlet.Filter;
+import jakarta.servlet.Filter;
 
 import org.springframework.web.filter.HiddenHttpMethodFilter;
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;

booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/SecurityConfig.java

@@ -5,6 +5,7 @@
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
 @Configuration
 @EnableWebSecurity
@@ -20,7 +21,7 @@ protected void configure(HttpSecurity http) throws Exception {
 				.failureUrl("/login?login_error=1")
 				.and()
 			.logout()
-				.logoutUrl("/logout")
+				.logoutRequestMatcher(new AntPathRequestMatcher("/logout", "GET"))
 				.logoutSuccessUrl("/logoutSuccess");
 	}
 

booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/SecurityWebApplicationInitializer.java

@@ -7,4 +7,5 @@
  * the chain of Spring Security filters.
  */
 public class SecurityWebApplicationInitializer extends AbstractSecurityWebApplicationInitializer {
+
 }

booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/WebFlowConfig.java

@@ -45,7 +45,7 @@ public FlowBuilderServices flowBuilderServices() {
 	@Bean
 	public MvcViewFactoryCreator mvcViewFactoryCreator() {
 		MvcViewFactoryCreator factoryCreator = new MvcViewFactoryCreator();
-		factoryCreator.setViewResolvers(Collections.singletonList(this.webMvcConfig.viewResolver()));
+		factoryCreator.setViewResolvers(Collections.singletonList(this.webMvcConfig.thymeleafViewResolver()));
 		factoryCreator.setUseSpringBeanBinding(true);
 		return factoryCreator;
 	}