Merge branch '3.0.x'

See gh-35554
This commit is contained in:
Andy Wilkinson
2023-05-18 09:32:06 +01:00

View File

@@ -16,8 +16,8 @@
package org.springframework.boot.autoconfigure.web.servlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProviders;
import org.springframework.context.ApplicationContext;