From 0835c33adf634a1ecbff748a320c050cada90d82 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Thu, 21 Jan 2016 09:20:05 +0100
Subject: [PATCH] Cleans up after migrating to Tiles 3 and dropped
 struts2-tiles3-plugin

---
 .gitignore                          | 1 -
 assembly/pom.xml                    | 5 -----
 assembly/src/main/assembly/all.xml  | 4 ----
 assembly/src/main/assembly/docs.xml | 4 ----
 bom/pom.xml                         | 5 -----
 pom.xml                             | 5 -----
 6 files changed, 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index bcebcd990..0285aab24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,7 +54,6 @@ plugins/portlet-tiles/target
 plugins/portlet/target
 plugins/sitegraph/target
 plugins/sitemesh/target
-plugins/tiles3/target
 plugins/javatemplates/target
 bundles/demo/target
 plugins/rest/target
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 94c10133c..a5e3a04d7 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -219,11 +219,6 @@
             <artifactId>struts2-tiles-plugin</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-tiles3-plugin</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-oval-plugin</artifactId>
diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml
index c3027ac40..ef9e68286 100644
--- a/assembly/src/main/assembly/all.xml
+++ b/assembly/src/main/assembly/all.xml
@@ -227,10 +227,6 @@
         <directory>../plugins/tiles/target/apidocs</directory>
         <outputDirectory>docs/struts2-plugins/struts2-tiles-plugin/apidocs</outputDirectory>
       </fileSet>
-      <fileSet>
-        <directory>../plugins/tiles3/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-tiles3-plugin/apidocs</outputDirectory>
-      </fileSet>
 
     <!-- bundles -->
     <fileSet>
diff --git a/assembly/src/main/assembly/docs.xml b/assembly/src/main/assembly/docs.xml
index f486c7ebd..e27107c33 100644
--- a/assembly/src/main/assembly/docs.xml
+++ b/assembly/src/main/assembly/docs.xml
@@ -150,10 +150,6 @@
             <directory>../plugins/tiles/target/apidocs</directory>
             <outputDirectory>docs/struts2-plugins/struts2-tiles-plugin/apidocs</outputDirectory>
         </fileSet>
-        <fileSet>
-            <directory>../plugins/tiles3/target/apidocs</directory>
-            <outputDirectory>docs/struts2-plugins/struts2-tiles3-plugin/apidocs</outputDirectory>
-        </fileSet>
 
     </fileSets>
 </assembly>
diff --git a/bom/pom.xml b/bom/pom.xml
index 12b3f75c5..e170a5eab 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -173,11 +173,6 @@
                 <artifactId>struts2-tiles-plugin</artifactId>
                 <version>${struts-version.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.struts</groupId>
-                <artifactId>struts2-tiles3-plugin</artifactId>
-                <version>${struts-version.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/pom.xml b/pom.xml
index 08c94b43a..1dc97dac1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -456,11 +456,6 @@
                 <artifactId>struts2-gxp-plugin</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.struts</groupId>
-                <artifactId>struts2-tiles3-plugin</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.struts</groupId>
                 <artifactId>struts2-osgi-admin-bundle</artifactId>