Skip to content

Commit b75f5fa

Browse files
committed
Remove Tiles 2 support
Issue: SPR-13229
1 parent e909422 commit b75f5fa

File tree

15 files changed

+0
-1069
lines changed

15 files changed

+0
-1069
lines changed

build.gradle

-33
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ configure(allprojects) { project ->
7070
ext.snakeyamlVersion = "1.16"
7171
ext.snifferVersion = "1.14"
7272
ext.testngVersion = "6.9.10"
73-
ext.tiles2Version = "2.2.2"
7473
ext.tiles3Version = "3.0.5"
7574
ext.tomcatVersion = "8.0.30"
7675
ext.tyrusVersion = "1.3.5" // constrained by WebLogic 12.1.3 support
@@ -944,38 +943,6 @@ project("spring-webmvc") {
944943
}
945944
}
946945

947-
project("spring-webmvc-tiles2") {
948-
description = "Spring Framework Tiles2 Integration"
949-
merge.into = project(":spring-webmvc")
950-
951-
dependencies {
952-
provided(project(":spring-context"))
953-
provided(project(":spring-web"))
954-
provided("javax.servlet:javax.servlet-api:3.0.1")
955-
optional("javax.servlet.jsp:javax.servlet.jsp-api:2.2.1")
956-
optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1")
957-
optional("org.apache.tiles:tiles-api:${tiles2Version}")
958-
optional("org.apache.tiles:tiles-core:${tiles2Version}") {
959-
exclude group: "org.slf4j", module: "jcl-over-slf4j"
960-
}
961-
optional("org.apache.tiles:tiles-servlet:${tiles2Version}") {
962-
exclude group: "org.slf4j", module: "jcl-over-slf4j"
963-
}
964-
optional("org.apache.tiles:tiles-jsp:${tiles2Version}") {
965-
exclude group: "org.slf4j", module: "jcl-over-slf4j"
966-
}
967-
optional("org.apache.tiles:tiles-el:${tiles2Version}") {
968-
exclude group: "org.slf4j", module: "jcl-over-slf4j"
969-
}
970-
optional("org.apache.tiles:tiles-extras:${tiles2Version}") {
971-
exclude group: "org.slf4j", module: "jcl-over-slf4j"
972-
exclude group: "org.apache.velocity", module: "velocity-tools"
973-
exclude group: "org.springframework", module: "spring-web"
974-
}
975-
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
976-
}
977-
}
978-
979946
project("spring-webmvc-portlet") {
980947
description = "Spring Web Portlet"
981948

settings.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ include "spring-tx"
2222
include "spring-web"
2323
include "spring-webmvc"
2424
include "spring-webmvc-portlet"
25-
include "spring-webmvc-tiles2"
2625
include "spring-websocket"
2726
include "spring-framework-bom"
2827

spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java

-66
This file was deleted.

spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/SimpleSpringPreparerFactory.java

-73
This file was deleted.

spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/SpringBeanPreparerFactory.java

-44
This file was deleted.

spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/SpringLocaleResolver.java

-62
This file was deleted.

spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/SpringWildcardServletTilesApplicationContext.java

-74
This file was deleted.

0 commit comments

Comments
 (0)