diff --git a/pom.xml b/pom.xml
index dacd440e537..65bb44f930e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -260,9 +260,9 @@
4.4
- nz.net.ultraq.web.thymeleaf
- thymeleaf-layout-dialect
- 1.0.6
+ nz.net.ultraq.thymeleaf
+ thymeleaf-layout-dialect
+ 1.1.1
org.apache.ivy
diff --git a/spring-autoconfigure/pom.xml b/spring-autoconfigure/pom.xml
index 0f04f0543fe..838ba74b9fd 100644
--- a/spring-autoconfigure/pom.xml
+++ b/spring-autoconfigure/pom.xml
@@ -26,7 +26,7 @@
true
- nz.net.ultraq.web.thymeleaf
+ nz.net.ultraq.thymeleaf
thymeleaf-layout-dialect
true
diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
index 1b083d61068..04514a037fe 100644
--- 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;
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 {
}
@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 {
}
@Configuration
- @ConditionalOnClass(name = "nz.net.ultraq.web.thymeleaf.LayoutDialect")
+ @ConditionalOnClass(name = "nz.net.ultraq.thymeleaf.LayoutDialect")
@ConditionalOnMissingBean(SpringTemplateEngine.class)
protected static class ThymeleafWebLayoutConfiguration {
diff --git a/spring-autoconfigure/src/test/resources/templates/layout.html b/spring-autoconfigure/src/test/resources/templates/layout.html
index 77ae2757360..b4be8f22a66 100644
--- a/spring-autoconfigure/src/test/resources/templates/layout.html
+++ b/spring-autoconfigure/src/test/resources/templates/layout.html
@@ -1,5 +1,5 @@
-
+
Layout
diff --git a/spring-launcher/pom.xml b/spring-launcher/pom.xml
index 50e94622928..8a9d9e82980 100644
--- a/spring-launcher/pom.xml
+++ b/spring-launcher/pom.xml
@@ -22,6 +22,7 @@
${project.build.directory}/local-repo
verify
true
+ ${skipTests}