Skip to content

Commit 9bba73a

Browse files
committed
Upgrade to Thymeleaf 3 and drop support for Thymleaf 2
This commit raises the minimum supported version of Thymeleaf to 3.0.x. It also upgrades Spring Social to a version that is compatible with Thymeleaf 3. Closes spring-projectsgh-7450 Closes spring-projectsgh-6258 See spring-projectsgh-7885
1 parent 9c77708 commit 9bba73a

File tree

41 files changed

+171
-11684
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+171
-11684
lines changed

spring-boot-autoconfigure/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,11 @@
526526
<artifactId>spring-social-web</artifactId>
527527
<optional>true</optional>
528528
</dependency>
529+
<dependency>
530+
<groupId>org.springframework.social</groupId>
531+
<artifactId>spring-social-web-thymeleaf3</artifactId>
532+
<optional>true</optional>
533+
</dependency>
529534
<dependency>
530535
<groupId>org.springframework.social</groupId>
531536
<artifactId>spring-social-facebook</artifactId>
@@ -553,7 +558,7 @@
553558
</dependency>
554559
<dependency>
555560
<groupId>org.thymeleaf</groupId>
556-
<artifactId>thymeleaf-spring4</artifactId>
561+
<artifactId>thymeleaf-spring5</artifactId>
557562
<optional>true</optional>
558563
</dependency>
559564
<dependency>
@@ -571,11 +576,6 @@
571576
<artifactId>thymeleaf-extras-data-attribute</artifactId>
572577
<optional>true</optional>
573578
</dependency>
574-
<dependency>
575-
<groupId>org.thymeleaf.extras</groupId>
576-
<artifactId>thymeleaf-extras-conditionalcomments</artifactId>
577-
<optional>true</optional>
578-
</dependency>
579579
<dependency>
580580
<groupId>org.thymeleaf.extras</groupId>
581581
<artifactId>thymeleaf-extras-java8time</artifactId>

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2016 the original author or authors.
2+
* Copyright 2012-2017 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.boot.autoconfigure.mobile;
1818

19-
import org.thymeleaf.spring4.view.ThymeleafViewResolver;
19+
import org.thymeleaf.spring5.view.ThymeleafViewResolver;
2020

2121
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2222
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialWebAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import java.util.List;
2020

21-
import org.thymeleaf.spring4.SpringTemplateEngine;
21+
import org.thymeleaf.spring5.SpringTemplateEngine;
2222

2323
import org.springframework.beans.factory.ObjectProvider;
2424
import org.springframework.boot.autoconfigure.AutoConfigureAfter;

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/AbstractTemplateResolverConfiguration.java

Lines changed: 0 additions & 85 deletions
This file was deleted.

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/AbstractThymeleafViewResolverConfiguration.java

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

Comments
 (0)