diff options
author | Vitaly Takmazov | 2020-11-24 08:56:22 +0300 |
---|---|---|
committer | Vitaly Takmazov | 2020-11-24 08:56:49 +0300 |
commit | 0ac4d1c73a5d664de2feb677699da37f3a3307de (patch) | |
tree | 006a0887160040339e2e55ee972a8d72073bf350 | |
parent | c875bace233c958562557faefab14733e62cbca4 (diff) |
Bump pebble-spring to 3.1.4
-rw-r--r-- | build.gradle | 2 | ||||
-rw-r--r-- | src/main/java/com/juick/config/WebConfig.java | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/build.gradle b/build.gradle index 66d8f66c..24220c62 100644 --- a/build.gradle +++ b/build.gradle @@ -156,7 +156,7 @@ dependencies { runtime 'net.java.dev.jna:jna-platform:5.6.0' runtime 'com.h2database:h2' - compile 'io.pebbletemplates:pebble-spring5:3.1.3' + compile 'io.pebbletemplates:pebble-spring5:3.1.4' compile 'com.atlassian.commonmark:commonmark:0.15.2' compile 'com.atlassian.commonmark:commonmark-ext-autolink:0.15.2' compile 'org.tomitribe:tomitribe-http-signatures:1.7' diff --git a/src/main/java/com/juick/config/WebConfig.java b/src/main/java/com/juick/config/WebConfig.java index b4f79d2b..ccfa5f1e 100644 --- a/src/main/java/com/juick/config/WebConfig.java +++ b/src/main/java/com/juick/config/WebConfig.java @@ -98,7 +98,7 @@ public class WebConfig implements WebMvcConfigurer { @Bean public SpringExtension springExtension() { - return new SpringExtension(); + return new SpringExtension(null); } @Bean @@ -157,10 +157,9 @@ public class WebConfig implements WebMvcConfigurer { @Bean public ViewResolver viewResolver() { - PebbleViewResolver viewResolver = new PebbleViewResolver(); + PebbleViewResolver viewResolver = new PebbleViewResolver(pebbleEngine()); viewResolver.setPrefix("templates"); viewResolver.setSuffix(".html"); - viewResolver.setPebbleEngine(pebbleEngine()); viewResolver.setCharacterEncoding(CharEncoding.UTF_8); return viewResolver; } |