[bs-173] Upgrade Thymeleaf layout dialect

[Fixes #52629385]
13 years ago · d260fa6456
5 changed files with 9 additions and 8 deletions
--- a/pom.xml
+++ b/pom.xml
@ -260,9 +260,9 @@
				@@ -260,9 +260,9 @@
 				<version>4.4</version>
 			</dependency>
 			<dependency>
-				<groupId>nz.net.ultraq.web.thymeleaf</groupId>
-				<artifactId>thymeleaf-layout-dialect</artifactId>
-				<version>1.0.6</version>
+                <groupId>nz.net.ultraq.thymeleaf</groupId>
+                <artifactId>thymeleaf-layout-dialect</artifactId>
+				<version>1.1.1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.ivy</groupId>
--- a/spring-autoconfigure/pom.xml
+++ b/spring-autoconfigure/pom.xml
@ -26,7 +26,7 @@
				@@ -26,7 +26,7 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>nz.net.ultraq.web.thymeleaf</groupId>
+			<groupId>nz.net.ultraq.thymeleaf</groupId>
 			<artifactId>thymeleaf-layout-dialect</artifactId>
 			<optional>true</optional>
 		</dependency>
--- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
+++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
@ -23,7 +23,7 @@ import java.util.Collections;
				@@ -23,7 +23,7 @@ import java.util.Collections;

 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.EnableAutoConfiguration;
@ -105,7 +105,7 @@ public class ThymeleafAutoConfiguration {
				@@ -105,7 +105,7 @@ public class ThymeleafAutoConfiguration {
 	}

 	@Configuration
-	@ConditionalOnMissingClass("nz.net.ultraq.web.thymeleaf.LayoutDialect")
+	@ConditionalOnMissingClass("nz.net.ultraq.thymeleaf.LayoutDialect")
 	@ConditionalOnMissingBean(SpringTemplateEngine.class)
 	protected static class ThymeleafDefaultConfiguration {

@ -124,7 +124,7 @@ public class ThymeleafAutoConfiguration {
				@@ -124,7 +124,7 @@ public class ThymeleafAutoConfiguration {
 	}

 	@Configuration
-	@ConditionalOnClass(name = "nz.net.ultraq.web.thymeleaf.LayoutDialect")
+	@ConditionalOnClass(name = "nz.net.ultraq.thymeleaf.LayoutDialect")
 	@ConditionalOnMissingBean(SpringTemplateEngine.class)
 	protected static class ThymeleafWebLayoutConfiguration {

--- a/spring-autoconfigure/src/test/resources/templates/layout.html
+++ b/spring-autoconfigure/src/test/resources/templates/layout.html
@ -1,5 +1,5 @@
				@@ -1,5 +1,5 @@
 <!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>
    <title layout:fragment="title">Layout</title>
  </head>
--- a/spring-launcher/pom.xml
+++ b/spring-launcher/pom.xml
@ -22,6 +22,7 @@
				@@ -22,6 +22,7 @@
 					<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
 					<postBuildHookScript>verify</postBuildHookScript>
 					<addTestClassPath>true</addTestClassPath>
+					<skipInvocation>${skipTests}</skipInvocation>
 				</configuration>
 				<executions>
 					<execution>