Browse Source

Upgrade to Thymeleaf 3.0.6.RELEASE

Closes gh-9207
pull/9066/merge
Andy Wilkinson 9 years ago
parent
commit
f24b55a236
  1. 2
      spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java
  2. 4
      spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java
  3. 0
      spring-boot-autoconfigure/src/test/resources/templates/template.html
  4. 2
      spring-boot-dependencies/pom.xml

2
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java

@ -68,7 +68,7 @@ public class ThymeleafReactiveAutoConfigurationTests { @@ -68,7 +68,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
@Test
public void createFromConfigClass() throws Exception {
load(BaseConfiguration.class, "spring.thymeleaf.suffix:.txt");
load(BaseConfiguration.class, "spring.thymeleaf.suffix:.html");
TemplateEngine engine = this.context.getBean(TemplateEngine.class);
Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
String result = engine.process("template", attrs);

4
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java

@ -76,11 +76,11 @@ public class ThymeleafServletAutoConfigurationTests { @@ -76,11 +76,11 @@ public class ThymeleafServletAutoConfigurationTests {
@Test
public void createFromConfigClass() throws Exception {
load(BaseConfiguration.class, "spring.thymeleaf.mode:XHTML",
load(BaseConfiguration.class, "spring.thymeleaf.mode:HTML",
"spring.thymeleaf.suffix:");
TemplateEngine engine = this.context.getBean(TemplateEngine.class);
Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
String result = engine.process("template.txt", attrs);
String result = engine.process("template.html", attrs);
assertThat(result).isEqualTo("<html>bar</html>");
}

0
spring-boot-autoconfigure/src/test/resources/templates/template.txt → spring-boot-autoconfigure/src/test/resources/templates/template.html

2
spring-boot-dependencies/pom.xml

@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
<sqlite-jdbc.version>3.16.1</sqlite-jdbc.version>
<statsd-client.version>3.1.0</statsd-client.version>
<sun-mail.version>${javax-mail.version}</sun-mail.version>
<thymeleaf.version>3.0.5.RELEASE</thymeleaf.version>
<thymeleaf.version>3.0.6.RELEASE</thymeleaf.version>
<thymeleaf-spring5.version>3.0.5.M3</thymeleaf-spring5.version>
<thymeleaf-extras-springsecurity4.version>3.0.2.RELEASE</thymeleaf-extras-springsecurity4.version>
<thymeleaf-layout-dialect.version>2.2.1</thymeleaf-layout-dialect.version>

Loading…
Cancel
Save