You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2011/12/16 08:29:10 UTC
svn commit: r1215053 - in /struts/struts2/trunk/plugins: cdi/ codebehind/
convention/ dojo/ embeddedjsp/ gxp/ javatemplates/ jfreechart/ json/ osgi/
oval/ portlet/ rest/ sitegraph/ spring/
Author: lukaszlenart
Date: Fri Dec 16 07:29:09 2011
New Revision: 1215053
URL: http://svn.apache.org/viewvc?rev=1215053&view=rev
Log:
Removes duplicated dependencies from poms
Modified:
struts/struts2/trunk/plugins/cdi/pom.xml
struts/struts2/trunk/plugins/codebehind/pom.xml
struts/struts2/trunk/plugins/convention/pom.xml
struts/struts2/trunk/plugins/dojo/pom.xml
struts/struts2/trunk/plugins/embeddedjsp/pom.xml
struts/struts2/trunk/plugins/gxp/pom.xml
struts/struts2/trunk/plugins/javatemplates/pom.xml
struts/struts2/trunk/plugins/jfreechart/pom.xml
struts/struts2/trunk/plugins/json/pom.xml
struts/struts2/trunk/plugins/osgi/pom.xml
struts/struts2/trunk/plugins/oval/pom.xml
struts/struts2/trunk/plugins/portlet/pom.xml
struts/struts2/trunk/plugins/rest/pom.xml
struts/struts2/trunk/plugins/sitegraph/pom.xml
struts/struts2/trunk/plugins/spring/pom.xml
Modified: struts/struts2/trunk/plugins/cdi/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/cdi/pom.xml?rev=1215053&r1=1215052&r2=1215053&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/cdi/pom.xml (original)
+++ struts/struts2/trunk/plugins/cdi/pom.xml Fri Dec 16 07:29:09 2011
@@ -60,12 +60,6 @@
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
Modified: struts/struts2/trunk/plugins/codebehind/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/pom.xml?rev=1215053&r1=1215052&r2=1215053&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/codebehind/pom.xml (original)
+++ struts/struts2/trunk/plugins/codebehind/pom.xml Fri Dec 16 07:29:09 2011
@@ -51,11 +51,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-core</artifactId>
<scope>test</scope>
@@ -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>
Modified: struts/struts2/trunk/plugins/convention/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/pom.xml?rev=1215053&r1=1215052&r2=1215053&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/convention/pom.xml (original)
+++ struts/struts2/trunk/plugins/convention/pom.xml Fri Dec 16 07:29:09 2011
@@ -38,11 +38,6 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
@@ -54,11 +49,6 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
<scope>provided</scope>
</dependency>
Modified: struts/struts2/trunk/plugins/dojo/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/pom.xml?rev=1215053&r1=1215052&r2=1215053&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/dojo/pom.xml (original)
+++ struts/struts2/trunk/plugins/dojo/pom.xml Fri Dec 16 07:29:09 2011
@@ -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>
@@ -152,11 +145,6 @@
<!-- Test dependencies -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>struts2-junit-plugin</artifactId>
<version>${project.version}</version>
Modified: struts/struts2/trunk/plugins/embeddedjsp/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/embeddedjsp/pom.xml?rev=1215053&r1=1215052&r2=1215053&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/embeddedjsp/pom.xml (original)
+++ struts/struts2/trunk/plugins/embeddedjsp/pom.xml Fri Dec 16 07:29:09 2011
@@ -46,11 +46,6 @@
<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>
<scope>test</scope>
@@ -80,11 +75,6 @@
<artifactId>juli</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<scope>test</scope>
Modified: struts/struts2/trunk/plugins/gxp/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/gxp/pom.xml?rev=1215053&r1=1215052&r2=1215053&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/gxp/pom.xml (original)
+++ struts/struts2/trunk/plugins/gxp/pom.xml Fri Dec 16 07:29:09 2011
@@ -20,17 +20,6 @@
<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>
<version>0.2.4-beta</version>
Modified: struts/struts2/trunk/plugins/javatemplates/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/pom.xml?rev=1215053&r1=1215052&r2=1215053&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/javatemplates/pom.xml (original)
+++ struts/struts2/trunk/plugins/javatemplates/pom.xml Fri Dec 16 07:29:09 2011
@@ -40,20 +40,10 @@
<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>
<scope>test</scope>
Modified: struts/struts2/trunk/plugins/jfreechart/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jfreechart/pom.xml?rev=1215053&r1=1215052&r2=1215053&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/jfreechart/pom.xml (original)
+++ struts/struts2/trunk/plugins/jfreechart/pom.xml Fri Dec 16 07:29:09 2011
@@ -66,23 +66,12 @@
</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>
<scope>provided</scope>
</dependency>
Modified: struts/struts2/trunk/plugins/json/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/json/pom.xml?rev=1215053&r1=1215052&r2=1215053&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/json/pom.xml (original)
+++ struts/struts2/trunk/plugins/json/pom.xml Fri Dec 16 07:29:09 2011
@@ -57,12 +57,6 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-junit-plugin</artifactId>
<version>${project.version}</version>
@@ -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>
Modified: struts/struts2/trunk/plugins/osgi/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/osgi/pom.xml?rev=1215053&r1=1215052&r2=1215053&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/osgi/pom.xml (original)
+++ struts/struts2/trunk/plugins/osgi/pom.xml Fri Dec 16 07:29:09 2011
@@ -59,12 +59,6 @@
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
Modified: struts/struts2/trunk/plugins/oval/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/oval/pom.xml?rev=1215053&r1=1215052&r2=1215053&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/oval/pom.xml (original)
+++ struts/struts2/trunk/plugins/oval/pom.xml Fri Dec 16 07:29:09 2011
@@ -70,12 +70,6 @@
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${struts2.springPlatformVersion}</version>
Modified: struts/struts2/trunk/plugins/portlet/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/pom.xml?rev=1215053&r1=1215052&r2=1215053&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/portlet/pom.xml (original)
+++ struts/struts2/trunk/plugins/portlet/pom.xml Fri Dec 16 07:29:09 2011
@@ -18,11 +18,6 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>struts2-junit-plugin</artifactId>
<version>${project.version}</version>
Modified: struts/struts2/trunk/plugins/rest/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/rest/pom.xml?rev=1215053&r1=1215052&r2=1215053&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/rest/pom.xml (original)
+++ struts/struts2/trunk/plugins/rest/pom.xml Fri Dec 16 07:29:09 2011
@@ -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>
Modified: struts/struts2/trunk/plugins/sitegraph/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitegraph/pom.xml?rev=1215053&r1=1215052&r2=1215053&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/sitegraph/pom.xml (original)
+++ struts/struts2/trunk/plugins/sitegraph/pom.xml Fri Dec 16 07:29:09 2011
@@ -66,12 +66,6 @@
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
<scope>provided</scope>
</dependency>
@@ -139,12 +133,6 @@
<!-- Test dependencies -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<scope>test</scope>
Modified: struts/struts2/trunk/plugins/spring/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/spring/pom.xml?rev=1215053&r1=1215052&r2=1215053&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/spring/pom.xml (original)
+++ struts/struts2/trunk/plugins/spring/pom.xml Fri Dec 16 07:29:09 2011
@@ -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>