From af82d23c95f592bac84f1cac105bc00163c53b4d Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukasz.lenart@gmail.com>
Date: Tue, 12 Jan 2016 08:51:14 +0100
Subject: [PATCH] Upgrade Tiles dependencies

---
 plugins/tiles/pom.xml | 13 -------------
 pom.xml               | 13 +------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 45a9b7e68..be3976217 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -47,14 +47,6 @@
             <artifactId>tiles-jsp</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.tiles</groupId>
-            <artifactId>tiles-servlet-wildcard</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tiles</groupId>
-            <artifactId>tiles-jsp</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.tiles</groupId>
             <artifactId>tiles-freemarker</artifactId>
@@ -67,11 +59,6 @@
             <groupId>org.apache.tiles</groupId>
             <artifactId>tiles-el</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jsp-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.glassfish</groupId>
             <artifactId>javax.el</artifactId>
diff --git a/pom.xml b/pom.xml
index d5489ec6a..b468f9226 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
         <ognl.version>3.1.1</ognl.version>
         <asm.version>3.3</asm.version>
         <asm5.version>5.0.2</asm5.version>
-        <tiles.version>2.2.2</tiles.version>
+        <tiles.version>3.0.5</tiles.version>
         <log4j2.version>2.3</log4j2.version>
 
         <!-- SCM Site Configuration -->
@@ -618,17 +618,6 @@
                 <artifactId>tiles-portlet</artifactId>
                 <version>${tiles.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.tiles</groupId>
-                <artifactId>tiles-jsp</artifactId>
-                <version>${tiles.version}</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.tiles</groupId>
-                <artifactId>tiles-servlet-wildcard</artifactId>
-                <version>${tiles.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.tiles</groupId>
                 <artifactId>tiles-jsp</artifactId>