Starting to synchronizing the Maven 2 build with Struts Action 1,

keeping the Ant build in sync


git-svn-id: https://svn.apache.org/repos/asf/incubator/webwork2@400385 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald J. Brown
2006-05-07 02:32:25 +00:00
parent 1d0f8d9592
commit 5624d647e9
1354 changed files with 217 additions and 492 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
name = struts-action
name = struts-core
fullname = Struts Action 2
version = 2.0-dev
status = integration
+44 -47
View File
@@ -8,9 +8,17 @@
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.struts.action2</groupId>
<artifactId>action</artifactId>
<artifactId>struts-core</artifactId>
<packaging>jar</packaging>
<name>Struts Action Framework 2.0</name>
<name>Struts Action 2 - Core</name>
<distributionManagement>
<site>
<id>apache-site</id>
<url>scp://people.apache.org/www/struts.apache.org/struts-action2/core</url>
</site>
</distributionManagement>
<dependencies>
<!-- unreferenced dependencies:
* clover, mockobjects, xdoclet : only needed for build
@@ -25,38 +33,39 @@
<dependency>
<groupId>opensymphony</groupId>
<artifactId>xwork</artifactId>
</dependency>
<dependency>
<groupId>org.apache.struts.action2</groupId>
<artifactId>action-api</artifactId>
<version>1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>2.3.4</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>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.0</version>
<optional>true</optional>
</dependency>
@@ -64,6 +73,7 @@
<dependency>
<groupId>uk.ltd.getahead</groupId>
<artifactId>dwr</artifactId>
<version>1.1-beta-3</version>
<optional>true</optional>
</dependency>
@@ -71,12 +81,14 @@
<dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.4</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>velocity-tools</groupId>
<artifactId>velocity-tools</artifactId>
<version>1.1</version>
<optional>true</optional>
</dependency>
@@ -84,19 +96,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>servlets.com</groupId>
<artifactId>cos</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>opensymphony</groupId>
<artifactId>pell-multipart</artifactId>
<!-- webwork's ivy dependency reports mentions v1.19 ? -->
<version>1.1</version>
<optional>true</optional>
</dependency>
@@ -104,6 +104,7 @@
<dependency>
<groupId>opensymphony</groupId>
<artifactId>sitemesh</artifactId>
<version>2.2.1</version>
<optional>true</optional>
</dependency>
@@ -111,12 +112,14 @@
<dependency>
<groupId>jetty</groupId>
<artifactId>org.mortbay.jetty</artifactId>
<version>5.1.4</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>eclipse</groupId>
<artifactId>jdtcore</artifactId>
<version>3.1.0</version>
<optional>true</optional>
</dependency>
@@ -176,13 +179,6 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>2.1.1</version>
<optional>true</optional>
</dependency>
<!-- used by PrettyPrintWriter (debugging interceptor) and QuickStart -->
<dependency>
<groupId>xstream</groupId>
@@ -190,35 +186,17 @@
<version>1.1.2</version>
</dependency>
<!-- Jasper -->
<dependency>
<groupId>jasperreports</groupId>
<artifactId>jasperreports</artifactId>
<optional>true</optional>
</dependency>
<!-- JFree -->
<dependency>
<groupId>jfree</groupId>
<artifactId>jfreechart</artifactId>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>gnujaxp</groupId>
<artifactId>gnujaxp</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Tiles -->
<dependency>
<groupId>org.apache.struts.tiles</groupId>
<artifactId>tiles-core</artifactId>
<version>0.2-SNAPSHOT</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>1.7</version>
<optional>true</optional>
</dependency>
@@ -226,12 +204,14 @@
<dependency>
<groupId>portlet-api</groupId>
<artifactId>portlet-api</artifactId>
<version>1.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
<version>1.0.1-rc4</version>
<optional>true</optional>
</dependency>
@@ -239,6 +219,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-10-SNAPSHOT</version>
<optional>true</optional>
</dependency>
@@ -246,30 +227,35 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>1.2.6</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>1.2.6</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>1.2.6</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>1.2.6</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<version>1.2.6</version>
<scope>test</scope>
</dependency>
@@ -278,6 +264,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>compile</scope>
<version>3.8.1</version>
<!-- has to be compile for WebWorkTestCase, which is part of the base package so others can write unit tests -->
<optional>true</optional>
</dependency>
@@ -285,58 +272,68 @@
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
<version>1.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>easymock</groupId>
<artifactId>easymockclassextension</artifactId>
<version>1.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>
<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>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.9</version>
<scope>test</scope>
</dependency>
</dependencies>

Some files were not shown because too many files have changed in this diff Show More