Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bs-173] Upgrade Thymeleaf layout dialect

Browse Source 
[Fixes #52629385]
This commit is contained in:
Dave Syer 2013-07-10 11:10:15 +01:00
parent a119e2388b
commit d260fa6456
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -260,9 +260,9 @@
<version>4.4</version> <version>4.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>nz.net.ultraq.web.thymeleaf</groupId> <groupId>nz.net.ultraq.thymeleaf</groupId>
<artifactId>thymeleaf-layout-dialect</artifactId> <artifactId>thymeleaf-layout-dialect</artifactId>
<version>1.0.6</version> <version>1.1.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.ivy</groupId> <groupId>org.apache.ivy</groupId>

2
spring-autoconfigure/pom.xml
View File

@ -26,7 +26,7 @@
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>nz.net.ultraq.web.thymeleaf</groupId> <groupId>nz.net.ultraq.thymeleaf</groupId>
<artifactId>thymeleaf-layout-dialect</artifactId> <artifactId>thymeleaf-layout-dialect</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>

6
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
View File

@ -23,7 +23,7 @@ import java.util.Collections;
import javax.servlet.Servlet; import javax.servlet.Servlet;
import nz.net.ultraq.web.thymeleaf.LayoutDialect; import nz.net.ultraq.thymeleaf.LayoutDialect;
import org.springframework.autoconfigure.AutoConfigureAfter; import org.springframework.autoconfigure.AutoConfigureAfter;
import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.autoconfigure.EnableAutoConfiguration;
@ -105,7 +105,7 @@ public class ThymeleafAutoConfiguration {
} }
@Configuration @Configuration
@ConditionalOnMissingClass("nz.net.ultraq.web.thymeleaf.LayoutDialect") @ConditionalOnMissingClass("nz.net.ultraq.thymeleaf.LayoutDialect")
@ConditionalOnMissingBean(SpringTemplateEngine.class) @ConditionalOnMissingBean(SpringTemplateEngine.class)
protected static class ThymeleafDefaultConfiguration { protected static class ThymeleafDefaultConfiguration {
@ -124,7 +124,7 @@ public class ThymeleafAutoConfiguration {
} }
@Configuration @Configuration
@ConditionalOnClass(name = "nz.net.ultraq.web.thymeleaf.LayoutDialect") @ConditionalOnClass(name = "nz.net.ultraq.thymeleaf.LayoutDialect")
@ConditionalOnMissingBean(SpringTemplateEngine.class) @ConditionalOnMissingBean(SpringTemplateEngine.class)
protected static class ThymeleafWebLayoutConfiguration { protected static class ThymeleafWebLayoutConfiguration {

2
spring-autoconfigure/src/test/resources/templates/layout.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout"> <html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
<head> <head>
<title layout:fragment="title">Layout</title> <title layout:fragment="title">Layout</title>
</head> </head>

1
spring-launcher/pom.xml
View File

@ -22,6 +22,7 @@
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath> <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<postBuildHookScript>verify</postBuildHookScript> <postBuildHookScript>verify</postBuildHookScript>
<addTestClassPath>true</addTestClassPath> <addTestClassPath>true</addTestClassPath>
<skipInvocation>${skipTests}</skipInvocation>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>