SEC-2651: Update Thymeleaf to Spring 4 variants in samples

Rob Winch · Rob Winch · commit 10c4d8f1af79 · 2014-06-12T16:48:04.000-05:00
diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle
@@ -27,7 +27,7 @@ ext.seleniumVersion = '2.33.0'
 ext.groovyVersion = '2.0.5'
 ext.spockVersion = '0.7-groovy-2.0'
 ext.gebVersion = '0.9.0'
-ext.thymeleafVersion = '2.1.2.RELEASE'
+ext.thymeleafVersion = '2.1.3.RELEASE'
 
 ext.spockDependencies = [
     dependencies.create("org.spockframework:spock-spring:$spockVersion") {
diff --git a/samples/messages-jc/build.gradle b/samples/messages-jc/build.gradle
@@ -19,8 +19,8 @@ dependencies {
             "org.springframework:spring-instrument:$springVersion",
             "org.springframework:spring-core:$springVersion",
             "org.springframework:spring-aspects:$springVersion",
-            "org.thymeleaf:thymeleaf-spring3:$thymeleafVersion",
-            "org.thymeleaf.extras:thymeleaf-extras-tiles2:2.1.0.RELEASE"
+            "org.thymeleaf:thymeleaf-spring4:$thymeleafVersion",
+            "org.thymeleaf.extras:thymeleaf-extras-tiles2-spring4:2.1.1.RELEASE"
       compile('org.hibernate:hibernate-entitymanager:3.6.10.Final') {
             exclude group:'javassist', module: 'javassist'
       }
diff --git a/samples/messages-jc/pom.xml b/samples/messages-jc/pom.xml
@@ -177,14 +177,14 @@
     </dependency>
     <dependency>
       <groupId>org.thymeleaf.extras</groupId>
-      <artifactId>thymeleaf-extras-tiles2</artifactId>
-      <version>2.1.0.RELEASE</version>
+      <artifactId>thymeleaf-extras-tiles2-spring4</artifactId>
+      <version>2.1.1.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.thymeleaf</groupId>
-      <artifactId>thymeleaf-spring3</artifactId>
-      <version>2.1.2.RELEASE</version>
+      <artifactId>thymeleaf-spring4</artifactId>
+      <version>2.1.3.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/samples/messages-jc/src/main/java/org/springframework/security/samples/mvc/config/WebMvcConfiguration.java b/samples/messages-jc/src/main/java/org/springframework/security/samples/mvc/config/WebMvcConfiguration.java
@@ -11,10 +11,10 @@
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 import org.thymeleaf.extras.tiles2.dialect.TilesDialect;
-import org.thymeleaf.extras.tiles2.spring.web.configurer.ThymeleafTilesConfigurer;
-import org.thymeleaf.extras.tiles2.spring.web.view.ThymeleafTilesView;
-import org.thymeleaf.spring3.SpringTemplateEngine;
-import org.thymeleaf.spring3.view.ThymeleafViewResolver;
+import org.thymeleaf.extras.tiles2.spring4.web.configurer.ThymeleafTilesConfigurer;
+import org.thymeleaf.extras.tiles2.spring4.web.view.ThymeleafTilesView;
+import org.thymeleaf.spring4.SpringTemplateEngine;
+import org.thymeleaf.spring4.view.ThymeleafViewResolver;
 import org.thymeleaf.templateresolver.ClassLoaderTemplateResolver;
 
 @EnableWebMvc
diff --git a/samples/messages-jc/src/main/resources/views/layout.html b/samples/messages-jc/src/main/resources/views/layout.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring3-3.dtd">
+<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-3.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:th="http://www.thymeleaf.org"
       xmlns:tiles="http://www.thymeleaf.org">

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring3-3.dtd">`
	`1`	`+<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-3.dtd">`
`2`	`2`	`<html xmlns="http://www.w3.org/1999/xhtml"`
`3`	`3`	`xmlns:th="http://www.thymeleaf.org"`
`4`	`4`	`xmlns:tiles="http://www.thymeleaf.org">`