Author: lukaszlenart
Date: Thu Dec 30 07:03:51 2010
New Revision: 1053813
URL: http://svn.apache.org/viewvc?rev=1053813&view=rev
Log:
Cleans poms and dependency management
Modified:
struts/struts2/trunk/apps/blank/pom.xml
struts/struts2/trunk/core/pom.xml
struts/struts2/trunk/plugins/codebehind/pom.xml
struts/struts2/trunk/plugins/dojo/pom.xml
struts/struts2/trunk/plugins/jfreechart/pom.xml
struts/struts2/trunk/plugins/json/pom.xml
struts/struts2/trunk/plugins/junit/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/struts1/pom.xml
struts/struts2/trunk/pom.xml
Modified: struts/struts2/trunk/apps/blank/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/pom.xml?rev=1053813&r1=1053812&r2=1053813&view=diff
==============================================================================
--- struts/struts2/trunk/apps/blank/pom.xml (original)
+++ struts/struts2/trunk/apps/blank/pom.xml Thu Dec 30 07:03:51 2010
@@ -44,27 +44,25 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>javassist</groupId>
<artifactId>javassist</artifactId>
- <version>3.7.ga</version>
- </dependency>
+ <scope>test</scope>
+ </dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>struts2-junit-plugin</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: struts/struts2/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?rev=1053813&r1=1053812&r2=1053813&view=diff
==============================================================================
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Thu Dec 30 07:03:51 2010
@@ -21,7 +21,8 @@
* under the License.
*/
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.struts</groupId>
@@ -34,14 +35,13 @@
<name>Struts 2 Core</name>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/core/</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/core/</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/core/</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/core/</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/core/</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/core/</url>
</scm>
<properties>
<tlib.version>2.2</tlib.version>
- <ognl.version>3.0</ognl.version>
</properties>
<build>
@@ -52,13 +52,13 @@
<version>1.0.15</version>
<configuration>
<A>uri=/struts-tags,tlibVersion=${tlib.version},jspVersion=2.0,shortName=s,displayName="Struts
Tags",
- outFile=${basedir}/target/classes/META-INF/struts-tags.tld,
- description="To make it easier to access dynamic data;
- the Apache Struts framework includes a library of custom
tags.
- The tags interact with the framework's validation and
internationalization features;
- to ensure that input is correct and output is localized.
- The Struts Tags can be used with JSP FreeMarker or
Velocity.",
- outTemplatesDir=${basedir}/src/site/resources/tags
+
outFile=${basedir}/target/classes/META-INF/struts-tags.tld,
+ description="To make it easier to access dynamic data;
+ the Apache Struts framework includes a library of
custom tags.
+ The tags interact with the framework's validation and
internationalization features;
+ to ensure that input is correct and output is
localized.
+ The Struts Tags can be used with JSP FreeMarker or
Velocity.",
+ outTemplatesDir=${basedir}/src/site/resources/tags
</A>
<resourceTargetPath>target</resourceTargetPath>
<fork>false</fork>
@@ -77,7 +77,7 @@
<goals>
<goal>execute</goal>
</goals>
- </execution>
+ </execution>
</executions>
</plugin>
</plugins>
@@ -213,160 +213,117 @@
<version>${project.version}</version>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.struts</groupId>-->
- <!--<artifactId>struts2-api</artifactId>-->
- <!--<version>${pom.version}</version>-->
- <!--</dependency>-->
-
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
- <version>2.3.16</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>ognl</groupId>
<artifactId>ognl</artifactId>
- <version>${ognl.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <scope>test</scope>
</dependency>
<!-- Velocity -->
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.6.3</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools</artifactId>
- <version>1.3</version>
<optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>struts</groupId>
- <artifactId>struts</artifactId>
- </exclusion>
- <exclusion>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- File upload -->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2.1</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.3.2</version>
</dependency>
-
+
<!-- Mocks for unit testing (by Spring) -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${struts2.springPlatformVersion}</version>
<scope>test</scope>
</dependency>
-
-
-
<!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <scope>compile</scope>
+ <scope>compile</scope>
<optional>true</optional>
- <version>3.8.2</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.4</version>
<scope>test</scope>
</dependency>
- <!--dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- </exclusion>
- </exclusions>
- </dependency-->
<dependency>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-core</artifactId>
- <version>0.09</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-jdk1.3</artifactId>
- <version>0.09</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-alt-jdk1.3</artifactId>
- <version>0.09</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-alt-jdk1.3-j2ee1.3</artifactId>
- <version>0.09</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-jdk1.3-j2ee1.3</artifactId>
- <version>0.09</version>
<scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
- <version>1.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.9</version>
<scope>test</scope>
</dependency>
@@ -384,16 +341,14 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>5.1</version>
- <scope>compile</scope>
+ <scope>compile</scope>
<optional>true</optional>
- <classifier>jdk15</classifier>
+ <classifier>jdk15</classifier>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
- <version>${struts2.springPlatformVersion}</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
Modified: struts/struts2/trunk/plugins/codebehind/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/pom.xml?rev=1053813&r1=1053812&r2=1053813&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/codebehind/pom.xml (original)
+++ struts/struts2/trunk/plugins/codebehind/pom.xml Thu Dec 30 07:03:51 2010
@@ -41,52 +41,48 @@
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>struts2-junit-plugin</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- <version>3.8.2</version>
</dependency>
<dependency>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-core</artifactId>
- <version>0.09</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${struts2.springPlatformVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>${struts2.springPlatformVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
<scope>provided</scope>
</dependency>
-
-
-
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: struts/struts2/trunk/plugins/dojo/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/pom.xml?rev=1053813&r1=1053812&r2=1053813&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/dojo/pom.xml (original)
+++ struts/struts2/trunk/plugins/dojo/pom.xml Thu Dec 30 07:03:51 2010
@@ -128,14 +128,13 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<!-- JSP API -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
<scope>provided</scope>
</dependency>
@@ -143,87 +142,71 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.6.3</version>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- <version>3.8.2</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>struts2-junit-plugin</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
- <version>1.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.4</version>
<scope>test</scope>
</dependency>
- <!--dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- </exclusion>
- </exclusions>
- </dependency-->
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock-cglib</artifactId>
- <version>1.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-core</artifactId>
- <version>0.09</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-jdk1.3</artifactId>
- <version>0.09</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-alt-jdk1.3</artifactId>
- <version>0.09</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-alt-jdk1.3-j2ee1.3</artifactId>
- <version>0.09</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-jdk1.3-j2ee1.3</artifactId>
- <version>0.09</version>
<scope>test</scope>
</dependency>
@@ -232,14 +215,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${struts2.springPlatformVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>${struts2.springPlatformVersion}</version>
<scope>test</scope>
</dependency>
Modified: struts/struts2/trunk/plugins/jfreechart/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jfreechart/pom.xml?rev=1053813&r1=1053812&r2=1053813&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/jfreechart/pom.xml (original)
+++ struts/struts2/trunk/plugins/jfreechart/pom.xml Thu Dec 30 07:03:51 2010
@@ -68,30 +68,32 @@
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
<scope>compile</scope>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-junit-plugin</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
<scope>test</scope>
</dependency>
Modified: struts/struts2/trunk/plugins/json/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/json/pom.xml?rev=1053813&r1=1053812&r2=1053813&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/json/pom.xml (original)
+++ struts/struts2/trunk/plugins/json/pom.xml Thu Dec 30 07:03:51 2010
@@ -59,43 +59,45 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-junit-plugin</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${struts2.springPlatformVersion}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
Modified: struts/struts2/trunk/plugins/junit/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/junit/pom.xml?rev=1053813&r1=1053812&r2=1053813&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/junit/pom.xml (original)
+++ struts/struts2/trunk/plugins/junit/pom.xml Thu Dec 30 07:03:51 2010
@@ -43,29 +43,31 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${struts2.springPlatformVersion}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>${struts2.springPlatformVersion}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${struts2.springPlatformVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-spring-plugin</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
Modified: struts/struts2/trunk/plugins/oval/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/oval/pom.xml?rev=1053813&r1=1053812&r2=1053813&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/oval/pom.xml (original)
+++ struts/struts2/trunk/plugins/oval/pom.xml Thu Dec 30 07:03:51 2010
@@ -44,19 +44,16 @@
<dependency>
<groupId>net.sf.oval</groupId>
<artifactId>oval</artifactId>
- <version>1.31</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.2.2</version>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
- <version>1.0</version>
<scope>test</scope>
</dependency>
@@ -64,15 +61,20 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${struts2.springPlatformVersion}</version>
+ </dependency>
+
</dependencies>
</project>
Modified: struts/struts2/trunk/plugins/portlet/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/pom.xml?rev=1053813&r1=1053812&r2=1053813&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/portlet/pom.xml (original)
+++ struts/struts2/trunk/plugins/portlet/pom.xml Thu Dec 30 07:03:51 2010
@@ -21,7 +21,8 @@
* under the License.
*/
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.struts</groupId>
@@ -34,9 +35,9 @@
<name>Struts 2 Portlet Plugin</name>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/portlet/</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/portlet/</developerConnection>
-
<url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/portlet/</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/portlet/</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/portlet/</developerConnection>
+
<url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/portlet/</url>
</scm>
<dependencies>
@@ -44,19 +45,17 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- <version>3.8.2</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>struts2-junit-plugin</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
<scope>provided</scope>
</dependency>
@@ -64,73 +63,60 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.6.3</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools</artifactId>
- <version>1.3</version>
<optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- </exclusion>
- <exclusion>
- <groupId>struts</groupId>
- <artifactId>struts</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- Portlet -->
<dependency>
<groupId>portlet-api</groupId>
<artifactId>portlet-api</artifactId>
- <version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-jdk1.3-j2ee1.3</artifactId>
- <version>0.09</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.4</version>
<scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
- <version>1.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock-cglib</artifactId>
- <version>1.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-core</artifactId>
- <version>0.09</version>
<scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.9</version>
<scope>test</scope>
</dependency>
@@ -138,32 +124,27 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${struts2.springPlatformVersion}</version>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc-portlet</artifactId>
- <version>${struts2.springPlatformVersion}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc-portlet</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>${struts2.springPlatformVersion}</version>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.1.1</version>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
- <version>2.2</version>
<scope>test</scope>
</dependency>
- </dependencies>
+ </dependencies>
</project>
Modified: struts/struts2/trunk/plugins/rest/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/rest/pom.xml?rev=1053813&r1=1053812&r2=1053813&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/rest/pom.xml (original)
+++ struts/struts2/trunk/plugins/rest/pom.xml Thu Dec 30 07:03:51 2010
@@ -37,45 +37,37 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.2.2</version>
</dependency>
<dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
- <classifier>jdk15</classifier>
- <version>2.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-core</artifactId>
- <version>0.09</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${struts2.springPlatformVersion}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>${struts2.springPlatformVersion}</version>
<optional>true</optional>
</dependency>
Modified: struts/struts2/trunk/plugins/sitegraph/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitegraph/pom.xml?rev=1053813&r1=1053812&r2=1053813&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/sitegraph/pom.xml (original)
+++ struts/struts2/trunk/plugins/sitegraph/pom.xml Thu Dec 30 07:03:51 2010
@@ -58,23 +58,21 @@
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>struts2-junit-plugin</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
<scope>provided</scope>
</dependency>
@@ -124,21 +122,18 @@
<dependency>
<groupId>commons-el</groupId>
<artifactId>commons-el</artifactId>
- <version>1.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.1</version>
<optional>true</optional>
</dependency>
@@ -147,25 +142,20 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- <version>3.8.2</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>${struts2.springPlatformVersion}</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${struts2.springPlatformVersion}</version>
<scope>test</scope>
</dependency>
-
</dependencies>
<reporting>
Modified: struts/struts2/trunk/plugins/struts1/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/struts1/pom.xml?rev=1053813&r1=1053812&r2=1053813&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/struts1/pom.xml (original)
+++ struts/struts2/trunk/plugins/struts1/pom.xml Thu Dec 30 07:03:51 2010
@@ -46,16 +46,15 @@
<version>1.3.10</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>struts2-junit-plugin</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mockobjects</groupId>
<artifactId>mockobjects-core</artifactId>
- <version>0.09</version>
<scope>test</scope>
</dependency>
@@ -63,21 +62,18 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${struts2.springPlatformVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>${struts2.springPlatformVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
<scope>provided</scope>
</dependency>
Modified: struts/struts2/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=1053813&r1=1053812&r2=1053813&view=diff
==============================================================================
--- struts/struts2/trunk/pom.xml (original)
+++ struts/struts2/trunk/pom.xml Thu Dec 30 07:03:51 2010
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
<groupId>org.apache.struts</groupId>
@@ -28,9 +29,9 @@
-->
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk</url>
</scm>
<issueManagement>
@@ -38,7 +39,7 @@
<url>http://issues.apache.org/struts/</url>
</issueManagement>
- <ciManagement />
+ <ciManagement/>
<distributionManagement>
<site>
<id>apache-site</id>
@@ -60,7 +61,7 @@
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
- <comments />
+ <comments/>
</license>
</licenses>
@@ -70,8 +71,9 @@
</organization>
<properties>
- <currentVersion>${pom.version}</currentVersion>
+ <currentVersion>${project.version}</currentVersion>
<struts2.springPlatformVersion>2.5.6</struts2.springPlatformVersion>
+ <ognl.version>3.0</ognl.version>
</properties>
<profiles>
@@ -355,6 +357,7 @@
<dependencyManagement>
<dependencies>
+
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts-annotations</artifactId>
@@ -364,6 +367,43 @@
</dependency>
<dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.16</version>
+ </dependency>
+
+ <!-- Velocity -->
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.6.3</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools</artifactId>
+ <version>1.3</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>struts</groupId>
+ <artifactId>struts</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>ognl</groupId>
+ <artifactId>ognl</artifactId>
+ <version>${ognl.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.8.0.GA</version>
@@ -374,6 +414,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -404,6 +445,166 @@
<scope>provided</scope>
</dependency>
+ <!-- Commons -->
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <!-- Mocks for unit testing (by Spring) -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${struts2.springPlatformVersion}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ <version>${struts2.springPlatformVersion}</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc-portlet</artifactId>
+ <version>${struts2.springPlatformVersion}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${struts2.springPlatformVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${struts2.springPlatformVersion}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>mockobjects</groupId>
+ <artifactId>mockobjects-core</artifactId>
+ <version>0.09</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>mockobjects</groupId>
+ <artifactId>mockobjects-jdk1.3</artifactId>
+ <version>0.09</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>mockobjects</groupId>
+ <artifactId>mockobjects-alt-jdk1.3</artifactId>
+ <version>0.09</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>mockobjects</groupId>
+ <artifactId>mockobjects-alt-jdk1.3-j2ee1.3</artifactId>
+ <version>0.09</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>mockobjects</groupId>
+ <artifactId>mockobjects-jdk1.3-j2ee1.3</artifactId>
+ <version>0.09</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <version>1.0.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock-cglib</artifactId>
+ <version>1.0.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.9</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.1</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ <classifier>jdk15</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.oval</groupId>
+ <artifactId>oval</artifactId>
+ <version>1.31</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.2.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Portlet -->
+ <dependency>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.json-lib</groupId>
+ <artifactId>json-lib</artifactId>
+ <classifier>jdk15</classifier>
+ <version>2.1</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
</project>
