From 8c2b321aa042d9f5d4210d03ad4d8c8ec044f162 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Tue, 26 May 2015 18:39:34 +0200
Subject: [PATCH] Cleans up after dropping deprecated plugins

---
 .gitignore                          |  6 +-----
 assembly/pom.xml                    | 21 ---------------------
 assembly/src/main/assembly/all.xml  | 16 ----------------
 assembly/src/main/assembly/docs.xml | 16 ----------------
 bom/pom.xml                         | 20 --------------------
 pom.xml                             | 20 --------------------
 6 files changed, 1 insertion(+), 98 deletions(-)

diff --git a/.gitignore b/.gitignore
index e95318aaa..a1e20c796 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,10 +31,8 @@ archetypes/struts2-archetype-starter/target
 archetypes/target
 plugins/convention/target
 plugins/embeddedjsp/target
-plugins/dojo/target
 plugins/osgi/target
 plugins/cdi/target
-plugins/codebehind/target
 plugins/spring/target
 plugins/jfreechart/target
 apps/rest-showcase/target
@@ -49,13 +47,11 @@ apps/target
 bundles/admin/target
 plugins/config-browser/target
 plugins/jasperreports/target
-plugins/jsf/target
 plugins/json/target
 plugins/portlet-tiles/target
 plugins/portlet/target
 plugins/sitegraph/target
 plugins/sitemesh/target
-plugins/struts1/target
 plugins/tiles3/target
 plugins/javatemplates/target
 bundles/demo/target
@@ -70,4 +66,4 @@ plugins/tiles/target
 bundles/target
 plugins/target
 target
-plugins/testng/test-output
\ No newline at end of file
+plugins/testng/test-output
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 45329d6ed..e97111263 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -148,11 +148,6 @@
             <artifactId>struts2-cdi-plugin</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-codebehind-plugin</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-convention-plugin</artifactId>
@@ -168,11 +163,6 @@
             <artifactId>struts2-config-browser-plugin</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-dojo-plugin</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-dwr-plugin</artifactId>
@@ -188,11 +178,6 @@
             <artifactId>struts2-jfreechart-plugin</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-jsf-plugin</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
@@ -231,12 +216,6 @@
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-spring-plugin</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-struts1-plugin</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-testng-plugin</artifactId>
diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml
index acf9c98ff..9e5285695 100644
--- a/assembly/src/main/assembly/all.xml
+++ b/assembly/src/main/assembly/all.xml
@@ -132,10 +132,6 @@
         <directory>../plugins/cdi/target/apidocs</directory>
         <outputDirectory>docs/struts2-plugins/struts2-cdi-plugin/apidocs</outputDirectory>
       </fileSet>
-      <fileSet>
-        <directory>../plugins/codebehind/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-codebehind-plugin/apidocs</outputDirectory>
-      </fileSet>
       <fileSet>
         <directory>../plugins/config-browser/target/apidocs</directory>
         <outputDirectory>docs/struts2-plugins/struts2-config-browser-plugin/apidocs</outputDirectory>
@@ -144,10 +140,6 @@
         <directory>../plugins/convention/target/apidocs</directory>
         <outputDirectory>docs/struts2-plugins/struts2-convention-plugin/apidocs</outputDirectory>
       </fileSet>
-      <fileSet>
-        <directory>../plugins/dojo/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-dojo-plugin/apidocs</outputDirectory>
-      </fileSet>
       <fileSet>
         <directory>../plugins/dwr/target/apidocs</directory>
         <outputDirectory>docs/struts2-plugins/struts2-dwr-plugin/apidocs</outputDirectory>
@@ -172,10 +164,6 @@
         <directory>../plugins/jfreechart/target/apidocs</directory>
         <outputDirectory>docs/struts2-plugins/struts2-jfreechart-plugin/apidocs</outputDirectory>
       </fileSet>
-      <fileSet>
-        <directory>../plugins/jsf/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-jsf-plugin/apidocs</outputDirectory>
-      </fileSet>
       <fileSet>
         <directory>../plugins/json/target/apidocs</directory>
         <outputDirectory>docs/struts2-plugins/struts2-json-plugin/apidocs</outputDirectory>
@@ -224,10 +212,6 @@
         <directory>../plugins/spring/target/apidocs</directory>
         <outputDirectory>docs/struts2-plugins/struts2-spring-plugin/apidocs</outputDirectory>
       </fileSet>
-      <fileSet>
-        <directory>../plugins/struts1/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-struts1-plugin/apidocs</outputDirectory>
-      </fileSet>
       <fileSet>
         <directory>../plugins/testng/target/apidocs</directory>
         <outputDirectory>docs/struts2-plugins/struts2-testng-plugin/apidocs</outputDirectory>
diff --git a/assembly/src/main/assembly/docs.xml b/assembly/src/main/assembly/docs.xml
index d5d2f7bfa..1f349bab8 100644
--- a/assembly/src/main/assembly/docs.xml
+++ b/assembly/src/main/assembly/docs.xml
@@ -56,10 +56,6 @@
             <directory>../plugins/cdi/target/apidocs</directory>
             <outputDirectory>docs/struts2-plugins/struts2-cdi-plugin/apidocs</outputDirectory>
         </fileSet>
-        <fileSet>
-            <directory>../plugins/codebehind/target/apidocs</directory>
-            <outputDirectory>docs/struts2-plugins/struts2-codebehind-plugin/apidocs</outputDirectory>
-        </fileSet>
         <fileSet>
             <directory>../plugins/config-browser/target/apidocs</directory>
             <outputDirectory>docs/struts2-plugins/struts2-config-browser-plugin/apidocs</outputDirectory>
@@ -68,10 +64,6 @@
             <directory>../plugins/convention/target/apidocs</directory>
             <outputDirectory>docs/struts2-plugins/struts2-convention-plugin/apidocs</outputDirectory>
         </fileSet>
-        <fileSet>
-            <directory>../plugins/dojo/target/apidocs</directory>
-            <outputDirectory>docs/struts2-plugins/struts2-dojo-plugin/apidocs</outputDirectory>
-        </fileSet>
         <fileSet>
             <directory>../plugins/dwr/target/apidocs</directory>
             <outputDirectory>docs/struts2-plugins/struts2-dwr-plugin/apidocs</outputDirectory>
@@ -96,10 +88,6 @@
             <directory>../plugins/jfreechart/target/apidocs</directory>
             <outputDirectory>docs/struts2-plugins/struts2-jfreechart-plugin/apidocs</outputDirectory>
         </fileSet>
-        <fileSet>
-            <directory>../plugins/jsf/target/apidocs</directory>
-            <outputDirectory>docs/struts2-plugins/struts2-jsf-plugin/apidocs</outputDirectory>
-        </fileSet>
         <fileSet>
             <directory>../plugins/json/target/apidocs</directory>
             <outputDirectory>docs/struts2-plugins/struts2-json-plugin/apidocs</outputDirectory>
@@ -148,10 +136,6 @@
             <directory>../plugins/spring/target/apidocs</directory>
             <outputDirectory>docs/struts2-plugins/struts2-spring-plugin/apidocs</outputDirectory>
         </fileSet>
-        <fileSet>
-            <directory>../plugins/struts1/target/apidocs</directory>
-            <outputDirectory>docs/struts2-plugins/struts2-struts1-plugin/apidocs</outputDirectory>
-        </fileSet>
         <fileSet>
             <directory>../plugins/testng/target/apidocs</directory>
             <outputDirectory>docs/struts2-plugins/struts2-testng-plugin/apidocs</outputDirectory>
diff --git a/bom/pom.xml b/bom/pom.xml
index bd234e42d..7e4bed3c2 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -53,21 +53,11 @@
                 <artifactId>struts2-core</artifactId>
                 <version>${struts-version.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.struts</groupId>
-                <artifactId>struts2-dojo-plugin</artifactId>
-                <version>${struts-version.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.struts</groupId>
                 <artifactId>struts2-cdi-plugin</artifactId>
                 <version>${struts-version.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.struts</groupId>
-                <artifactId>struts2-codebehind-plugin</artifactId>
-                <version>${struts-version.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.struts</groupId>
                 <artifactId>struts2-convention-plugin</artifactId>
@@ -103,11 +93,6 @@
                 <artifactId>struts2-javatemplates-plugin</artifactId>
                 <version>${struts-version.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.struts</groupId>
-                <artifactId>struts2-jsf-plugin</artifactId>
-                <version>${struts-version.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.struts</groupId>
                 <artifactId>struts2-jfreechart-plugin</artifactId>
@@ -173,11 +158,6 @@
                 <artifactId>struts2-spring-plugin</artifactId>
                 <version>${struts-version.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.struts</groupId>
-                <artifactId>struts2-struts1-plugin</artifactId>
-                <version>${struts-version.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.struts</groupId>
                 <artifactId>struts2-testng-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index b99e47e2d..487d41808 100644
--- a/pom.xml
+++ b/pom.xml
@@ -410,11 +410,6 @@
                 <artifactId>struts2-osgi-plugin</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.struts</groupId>
-                <artifactId>struts2-codebehind-plugin</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.struts</groupId>
                 <artifactId>struts2-javatemplates-plugin</artifactId>
@@ -425,11 +420,6 @@
                 <artifactId>struts2-config-browser-plugin</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.struts</groupId>
-                <artifactId>struts2-dojo-plugin</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.struts</groupId>
                 <artifactId>struts2-jasperreports-plugin</artifactId>
@@ -440,11 +430,6 @@
                 <artifactId>struts2-jfreechart-plugin</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.struts</groupId>
-                <artifactId>struts2-jsf-plugin</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.struts</groupId>
                 <artifactId>struts2-pell-multipart-plugin</artifactId>
@@ -470,11 +455,6 @@
                 <artifactId>struts2-sitemesh-plugin</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.struts</groupId>
-                <artifactId>struts2-struts1-plugin</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.struts</groupId>
                 <artifactId>struts2-testng-plugin</artifactId>