Skip to content

S
spring-boot
Commit 6aa57e8f authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge branch '1.5.x'

parents ed75ed3d 2b8801a6
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
spring-boot-docs/src/main/asciidoc/howto.adoc
View file @ 6aa57e8f
...@@ -1435,7 +1435,7 @@ By default, `spring-boot-starter-thymeleaf` uses Thymeleaf 2.1. If you are using ...@@ -1435,7 +1435,7 @@ By default, `spring-boot-starter-thymeleaf` uses Thymeleaf 2.1. If you are using
---- ----
<properties> <properties>
<thymeleaf.version>3.0.2.RELEASE</thymeleaf.version> <thymeleaf.version>3.0.2.RELEASE</thymeleaf.version>
<thymeleaf-layout-dialect.version>2.0.4</thymeleaf-layout-dialect.version> <thymeleaf-layout-dialect.version>2.1.1</thymeleaf-layout-dialect.version>
</properties> </properties>
---- ----
......
spring-boot-samples/spring-boot-sample-web-thymeleaf3/pom.xml
View file @ 6aa57e8f
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<properties> <properties>
<main.basedir>${basedir}/../..</main.basedir> <main.basedir>${basedir}/../..</main.basedir>
<thymeleaf.version>3.0.2.RELEASE</thymeleaf.version> <thymeleaf.version>3.0.2.RELEASE</thymeleaf.version>
<thymeleaf-layout-dialect.version>2.0.4</thymeleaf-layout-dialect.version> <thymeleaf-layout-dialect.version>2.1.1</thymeleaf-layout-dialect.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
......
spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/layout.html
View file @ 6aa57e8f
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" <html xmlns:th="http://www.thymeleaf.org"
xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout"> xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
<head> <head>
<title>Layout</title> <title>Layout</title>
<link rel="stylesheet" th:href="@{/css/bootstrap.min.css}" <link rel="stylesheet" th:href="@{/css/bootstrap.min.css}"
......
spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/messages/form.html
View file @ 6aa57e8f
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" <html xmlns:th="http://www.thymeleaf.org"
xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="layout"> layout:decorate="layout">
<head> <head>
<title>Messages : Create</title> <title>Messages : Create</title>
......
spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/messages/list.html
View file @ 6aa57e8f
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" <html xmlns:th="http://www.thymeleaf.org"
xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="layout"> layout:decorate="layout">
<head> <head>
<title>Messages : View all</title> <title>Messages : View all</title>
......
spring-boot-samples/spring-boot-sample-web-thymeleaf3/src/main/resources/templates/messages/view.html
View file @ 6aa57e8f
<html xmlns:th="http://www.thymeleaf.org" <html xmlns:th="http://www.thymeleaf.org"
xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="layout"> layout:decorate="layout">
<head> <head>
<title>Messages : View</title> <title>Messages : View</title>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment