From 0c61bf4c346b58669fc8092fdb9ee3857b78df16 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Fri, 16 Dec 2011 07:29:09 +0000
Subject: [PATCH] Removes duplicated dependencies from poms

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1215053 13f79535-47bb-0310-9956-ffa450edef68
---
 plugins/cdi/pom.xml           |  6 ------
 plugins/codebehind/pom.xml    | 10 ----------
 plugins/convention/pom.xml    | 10 ----------
 plugins/dojo/pom.xml          | 12 ------------
 plugins/embeddedjsp/pom.xml   | 10 ----------
 plugins/gxp/pom.xml           | 11 -----------
 plugins/javatemplates/pom.xml | 10 ----------
 plugins/jfreechart/pom.xml    | 11 -----------
 plugins/json/pom.xml          | 11 -----------
 plugins/osgi/pom.xml          |  6 ------
 plugins/oval/pom.xml          |  6 ------
 plugins/portlet/pom.xml       |  5 -----
 plugins/rest/pom.xml          | 10 ----------
 plugins/sitegraph/pom.xml     | 12 ------------
 plugins/spring/pom.xml        |  6 ------
 15 files changed, 136 deletions(-)

diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index 6fd8e4bdb..1fc46e098 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -59,12 +59,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml
index 2e084baea..4f23cacc2 100644
--- a/plugins/codebehind/pom.xml
+++ b/plugins/codebehind/pom.xml
@@ -50,11 +50,6 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>mockobjects</groupId>
             <artifactId>mockobjects-core</artifactId>
@@ -70,11 +65,6 @@
             <artifactId>spring-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
 
         <dependency>
             <groupId>javax.servlet</groupId>
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index 7c2442262..65c7814fa 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -37,11 +37,6 @@
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
@@ -52,11 +47,6 @@
             <artifactId>easymockclassextension</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jsp-api</artifactId>
diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml
index 48d9c6247..1abc05442 100644
--- a/plugins/dojo/pom.xml
+++ b/plugins/dojo/pom.xml
@@ -129,13 +129,6 @@
 
     <dependencies>
 
-        <!-- Core -->
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <!-- JSP API -->
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -151,11 +144,6 @@
         </dependency>
 
         <!-- Test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index 265e5a7ab..14061cdb3 100644
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@ -45,11 +45,6 @@
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
@@ -79,11 +74,6 @@
             <groupId>org.apache.tomcat</groupId>
             <artifactId>juli</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>taglibs</groupId>
             <artifactId>standard</artifactId>
diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml
index 0c03abe5a..4fdf2e741 100644
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@ -19,17 +19,6 @@
     </scm>
 
     <dependencies>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.google.gxp</groupId>
             <artifactId>google-gxp</artifactId>
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index 5d5ef5296..f94d776c4 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -39,20 +39,10 @@
     </scm>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index 2fd12dfbb..0480e205f 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -64,23 +64,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-core</artifactId>
-            <scope>compile</scope>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jsp-api</artifactId>
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index 837ebbc47..be9c742ec 100644
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@ -56,12 +56,6 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
@@ -73,11 +67,6 @@
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
 
         <dependency>
             <groupId>javax.servlet</groupId>
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index e1dabc131..6d9bdfef0 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -58,12 +58,6 @@
             <artifactId>commons-digester</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml
index cc08e3e67..aa253db62 100644
--- a/plugins/oval/pom.xml
+++ b/plugins/oval/pom.xml
@@ -69,12 +69,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index a7c2a8fbb..58a0a9e0c 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -17,11 +17,6 @@
     </scm>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>struts2-junit-plugin</artifactId>
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index 7a98bfb63..40884429c 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -57,16 +57,6 @@
             <artifactId>jackson-mapper-asl</artifactId>
             <version>${jackson.version}</version>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
 
         <dependency>
             <groupId>mockobjects</groupId>
diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml
index 0bac7ee90..23eb57a60 100644
--- a/plugins/sitegraph/pom.xml
+++ b/plugins/sitegraph/pom.xml
@@ -64,12 +64,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jsp-api</artifactId>
@@ -138,12 +132,6 @@
         </dependency>
 
         <!-- Test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 8e749f442..786c7d327 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -82,12 +82,6 @@
             <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-		
 		 <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>