From ed3e1e076d4ac502c13e66b9105a1767c68a2010 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Fri, 28 Jun 2019 14:13:59 -0700
Subject: [PATCH] Fix AbstractFilterRegistrationBean merge error

Merging 1.5.x accidentally broke `AbstractFilterRegistrationBean`
---
 .../boot/web/servlet/AbstractFilterRegistrationBean.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java
index f91f94882e..1f8b490adf 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java
@@ -43,7 +43,7 @@ import org.springframework.util.StringUtils;
  * @author Phillip Webb
  * @since 1.5.22
  */
-public abstract class AbstractFilterRegistrationBean extends RegistrationBean {
+public abstract class AbstractFilterRegistrationBean<T extends Filter> extends DynamicRegistrationBean<Dynamic> {
 
 	/**
 	 * Filters that wrap the servlet request should be ordered less than or equal to this.