diff --git a/pom.xml b/pom.xml index 5ade51c..0d8a1b4 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ org.thymeleaf - thymeleaf-spring4 + thymeleaf-spring5 3.0.9.RELEASE diff --git a/src/main/java/ru/dmitriymx/skeleton/springmvc/SpringConfigMVC.java b/src/main/java/ru/dmitriymx/skeleton/springmvc/SpringConfigMVC.java index c92972d..68eaab2 100644 --- a/src/main/java/ru/dmitriymx/skeleton/springmvc/SpringConfigMVC.java +++ b/src/main/java/ru/dmitriymx/skeleton/springmvc/SpringConfigMVC.java @@ -7,10 +7,10 @@ import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.ViewResolver; import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import org.thymeleaf.TemplateEngine; -import org.thymeleaf.spring4.SpringTemplateEngine; -import org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver; -import org.thymeleaf.spring4.view.ThymeleafViewResolver; +import org.thymeleaf.spring5.ISpringTemplateEngine; +import org.thymeleaf.spring5.SpringTemplateEngine; +import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver; +import org.thymeleaf.spring5.view.ThymeleafViewResolver; import org.thymeleaf.templatemode.TemplateMode; import org.thymeleaf.templateresolver.ITemplateResolver; @@ -34,7 +34,7 @@ public class SpringConfigMVC implements WebMvcConfigurer { @Bean @Autowired - public TemplateEngine templateEngine(ITemplateResolver templateResolver){ + public ISpringTemplateEngine templateEngine(ITemplateResolver templateResolver){ SpringTemplateEngine engine = new SpringTemplateEngine(); engine.setTemplateResolver(templateResolver); return engine; @@ -47,7 +47,7 @@ public class SpringConfigMVC implements WebMvcConfigurer { */ @Bean @Autowired - public ViewResolver viewResolver(TemplateEngine templateEngine) { + public ViewResolver viewResolver(ISpringTemplateEngine templateEngine) { ThymeleafViewResolver viewResolver = new ThymeleafViewResolver(); viewResolver.setTemplateEngine(templateEngine); viewResolver.setContentType("text/html;charset=UTF-8");