Author: pbenedict
Date: Wed Jun 4 21:54:49 2008
New Revision: 663449
URL: http://svn.apache.org/viewvc?rev=663449&view=rev
Log:
STR-3152: Pull common dependencies into the parent Struts 1 POM
Modified:
struts/struts1/trunk/apps/blank/pom.xml
struts/struts1/trunk/apps/cookbook/pom.xml
struts/struts1/trunk/apps/el-example/pom.xml
struts/struts1/trunk/apps/examples/pom.xml
struts/struts1/trunk/apps/faces-example1/pom.xml
struts/struts1/trunk/apps/faces-example2/pom.xml
struts/struts1/trunk/apps/mailreader/pom.xml
struts/struts1/trunk/apps/scripting-mailreader/pom.xml
struts/struts1/trunk/core/pom.xml
struts/struts1/trunk/el/pom.xml
struts/struts1/trunk/extras/pom.xml
struts/struts1/trunk/faces/pom.xml
struts/struts1/trunk/mailreader-dao/pom.xml
struts/struts1/trunk/pom.xml
struts/struts1/trunk/scripting/pom.xml
struts/struts1/trunk/taglib/pom.xml
struts/struts1/trunk/tiles/pom.xml
struts/struts1/trunk/tiles2/pom.xml
Modified: struts/struts1/trunk/apps/blank/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/blank/pom.xml?rev=663449&r1=663448&r2=663449&view=diff
==============================================================================
--- struts/struts1/trunk/apps/blank/pom.xml (original)
+++ struts/struts1/trunk/apps/blank/pom.xml Wed Jun 4 21:54:49 2008
@@ -51,8 +51,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
</dependency>
</dependencies>
Modified: struts/struts1/trunk/apps/cookbook/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/cookbook/pom.xml?rev=663449&r1=663448&r2=663449&view=diff
==============================================================================
--- struts/struts1/trunk/apps/cookbook/pom.xml (original)
+++ struts/struts1/trunk/apps/cookbook/pom.xml Wed Jun 4 21:54:49 2008
@@ -44,16 +44,14 @@
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>struts-taglib</artifactId>
<version>${pom.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: struts/struts1/trunk/apps/el-example/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/el-example/pom.xml?rev=663449&r1=663448&r2=663449&view=diff
==============================================================================
--- struts/struts1/trunk/apps/el-example/pom.xml (original)
+++ struts/struts1/trunk/apps/el-example/pom.xml Wed Jun 4 21:54:49 2008
@@ -46,8 +46,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
</dependency>
</dependencies>
Modified: struts/struts1/trunk/apps/examples/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/pom.xml?rev=663449&r1=663448&r2=663449&view=diff
==============================================================================
--- struts/struts1/trunk/apps/examples/pom.xml (original)
+++ struts/struts1/trunk/apps/examples/pom.xml Wed Jun 4 21:54:49 2008
@@ -49,26 +49,21 @@
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
- <version>1.0.6</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
- <version>1.0.6</version>
</dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.1.1</version>
- </dependency>
</dependencies>
</project>
Modified: struts/struts1/trunk/apps/faces-example1/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/pom.xml?rev=663449&r1=663448&r2=663449&view=diff
==============================================================================
--- struts/struts1/trunk/apps/faces-example1/pom.xml (original)
+++ struts/struts1/trunk/apps/faces-example1/pom.xml Wed Jun 4 21:54:49 2008
@@ -45,48 +45,38 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>myfaces</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.0.9</version>
+ <version>${myfaces.version}</version>
</dependency>
<dependency>
<groupId>myfaces</groupId>
<artifactId>myfaces-extensions</artifactId>
- <version>1.0.9</version>
</dependency>
<dependency>
<groupId>myfaces</groupId>
<artifactId>myfaces-jsf-api</artifactId>
- <version>1.0.9</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.0.2</version>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
- <version>1.0.2</version>
</dependency>
-
<!-- Required by MyFaces -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.2</version>
</dependency>
<dependency>
<groupId>commons-el</groupId>
<artifactId>commons-el</artifactId>
- <version>1.0</version>
</dependency>
-
</dependencies>
<build>
Modified: struts/struts1/trunk/apps/faces-example2/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example2/pom.xml?rev=663449&r1=663448&r2=663449&view=diff
==============================================================================
--- struts/struts1/trunk/apps/faces-example2/pom.xml (original)
+++ struts/struts1/trunk/apps/faces-example2/pom.xml Wed Jun 4 21:54:49 2008
@@ -44,57 +44,43 @@
<version>${pom.version}</version>
</dependency>
<dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>struts-tiles</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>myfaces</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.0.9</version>
</dependency>
<dependency>
<groupId>myfaces</groupId>
<artifactId>myfaces-extensions</artifactId>
- <version>1.0.9</version>
</dependency>
<dependency>
<groupId>myfaces</groupId>
<artifactId>myfaces-jsf-api</artifactId>
- <version>1.0.9</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.0.2</version>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
- <version>1.0.2</version>
</dependency>
-
<!-- Required by MyFaces -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.2</version>
</dependency>
<dependency>
<groupId>commons-el</groupId>
<artifactId>commons-el</artifactId>
- <version>1.0</version>
- </dependency>
-
- <!-- This example needs Tiles as well -->
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts-tiles</artifactId>
- <version>${pom.version}</version>
</dependency>
-
-
</dependencies>
<build>
Modified: struts/struts1/trunk/apps/mailreader/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/mailreader/pom.xml?rev=663449&r1=663448&r2=663449&view=diff
==============================================================================
--- struts/struts1/trunk/apps/mailreader/pom.xml (original)
+++ struts/struts1/trunk/apps/mailreader/pom.xml Wed Jun 4 21:54:49 2008
@@ -56,8 +56,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
</dependency>
</dependencies>
Modified: struts/struts1/trunk/apps/scripting-mailreader/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/scripting-mailreader/pom.xml?rev=663449&r1=663448&r2=663449&view=diff
==============================================================================
--- struts/struts1/trunk/apps/scripting-mailreader/pom.xml (original)
+++ struts/struts1/trunk/apps/scripting-mailreader/pom.xml Wed Jun 4 21:54:49
2008
@@ -168,8 +168,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
</dependency>
</dependencies>
Modified: struts/struts1/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/pom.xml?rev=663449&r1=663448&r2=663449&view=diff
==============================================================================
--- struts/struts1/trunk/core/pom.xml (original)
+++ struts/struts1/trunk/core/pom.xml Wed Jun 4 21:54:49 2008
@@ -106,71 +106,42 @@
<dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
- <version>2.7.7</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
</dependency>
<dependency>
<groupId>commons-chain</groupId>
<artifactId>commons-chain</artifactId>
- <version>1.2</version>
- <exclusions>
- <exclusion>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
- <version>1.8</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
</dependency>
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
- <version>1.3.1</version>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
- <version>2.0.8</version>
</dependency>
</dependencies>
Modified: struts/struts1/trunk/el/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/el/pom.xml?rev=663449&r1=663448&r2=663449&view=diff
==============================================================================
--- struts/struts1/trunk/el/pom.xml (original)
+++ struts/struts1/trunk/el/pom.xml Wed Jun 4 21:54:49 2008
@@ -57,45 +57,34 @@
</build>
<dependencies>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.0.2</version>
- </dependency>
-
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.struts</groupId>
+ <groupId>${pom.groupId}</groupId>
<artifactId>struts-core</artifactId>
<version>${pom.version}</version>
</dependency>
-
<dependency>
- <groupId>org.apache.struts</groupId>
+ <groupId>${pom.groupId}</groupId>
<artifactId>struts-taglib</artifactId>
<version>${pom.version}</version>
</dependency>
-
<dependency>
- <groupId>org.apache.struts</groupId>
+ <groupId>${pom.groupId}</groupId>
<artifactId>struts-tiles</artifactId>
<version>${pom.version}</version>
<optional>true</optional>
</dependency>
-
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
- <version>1.0.2</version>
</dependency>
-
</dependencies>
<reporting>
Modified: struts/struts1/trunk/extras/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/extras/pom.xml?rev=663449&r1=663448&r2=663449&view=diff
==============================================================================
--- struts/struts1/trunk/extras/pom.xml (original)
+++ struts/struts1/trunk/extras/pom.xml Wed Jun 4 21:54:49 2008
@@ -63,27 +63,19 @@
</build>
<dependencies>
-
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts-core</artifactId>
<version>${pom.version}</version>
</dependency>
-
</dependencies>
<profiles>
Modified: struts/struts1/trunk/faces/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/faces/pom.xml?rev=663449&r1=663448&r2=663449&view=diff
==============================================================================
--- struts/struts1/trunk/faces/pom.xml (original)
+++ struts/struts1/trunk/faces/pom.xml Wed Jun 4 21:54:49 2008
@@ -71,54 +71,39 @@
</build>
<dependencies>
-
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>struts-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>struts-taglib</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>struts-tiles</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
</dependency>
-
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
<version>2.0</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts-core</artifactId>
- <version>${pom.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts-taglib</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts-tiles</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
-
<dependency>
<groupId>myfaces</groupId>
<artifactId>myfaces-jsf-api</artifactId>
- <version>1.0.9</version>
- <scope>provided</scope>
</dependency>
-
</dependencies>
<reporting>
Modified: struts/struts1/trunk/mailreader-dao/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/mailreader-dao/pom.xml?rev=663449&r1=663448&r2=663449&view=diff
==============================================================================
--- struts/struts1/trunk/mailreader-dao/pom.xml (original)
+++ struts/struts1/trunk/mailreader-dao/pom.xml Wed Jun 4 21:54:49 2008
@@ -53,22 +53,16 @@
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
- <version>1.8</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
<!--
<reporting>
Modified: struts/struts1/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/pom.xml?rev=663449&r1=663448&r2=663449&view=diff
==============================================================================
--- struts/struts1/trunk/pom.xml (original)
+++ struts/struts1/trunk/pom.xml Wed Jun 4 21:54:49 2008
@@ -265,8 +265,135 @@
</plugin>
</plugins>
</reporting>
+
+ <properties>
+ <myfaces.version>1.0.9</myfaces.version>
+ </properties>
- <dependencies/>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>2.7.7</version>
+ </dependency>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-chain</groupId>
+ <artifactId>commons-chain</artifactId>
+ <version>1.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>myfaces</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.8</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.2</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ <version>1.3.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>myfaces</groupId>
+ <artifactId>myfaces-extensions</artifactId>
+ <version>${myfaces.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>myfaces</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${myfaces.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>myfaces</groupId>
+ <artifactId>myfaces-jsf-api</artifactId>
+ <version>${myfaces.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<repositories>
<repository>
Modified: struts/struts1/trunk/scripting/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/scripting/pom.xml?rev=663449&r1=663448&r2=663449&view=diff
==============================================================================
--- struts/struts1/trunk/scripting/pom.xml (original)
+++ struts/struts1/trunk/scripting/pom.xml Wed Jun 4 21:54:49 2008
@@ -56,35 +56,24 @@
</resources>
</build>
- <dependencies>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts-core</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>bsf</groupId>
- <artifactId>bsf</artifactId>
- <version>2.3.0</version>
- </dependency>
-
-
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>struts-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
</dependencies>
<!--
Modified: struts/struts1/trunk/taglib/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/pom.xml?rev=663449&r1=663448&r2=663449&view=diff
==============================================================================
--- struts/struts1/trunk/taglib/pom.xml (original)
+++ struts/struts1/trunk/taglib/pom.xml Wed Jun 4 21:54:49 2008
@@ -72,29 +72,21 @@
</build>
- <dependencies>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts-core</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>struts-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
<reporting>
<plugins>
Modified: struts/struts1/trunk/tiles/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles/pom.xml?rev=663449&r1=663448&r2=663449&view=diff
==============================================================================
--- struts/struts1/trunk/tiles/pom.xml (original)
+++ struts/struts1/trunk/tiles/pom.xml Wed Jun 4 21:54:49 2008
@@ -65,28 +65,20 @@
</testResources>
</build>
- <dependencies>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts-core</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>struts-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
</dependencies>
<reporting>
Modified: struts/struts1/trunk/tiles2/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/pom.xml?rev=663449&r1=663448&r2=663449&view=diff
==============================================================================
--- struts/struts1/trunk/tiles2/pom.xml (original)
+++ struts/struts1/trunk/tiles2/pom.xml Wed Jun 4 21:54:49 2008
@@ -66,34 +66,40 @@
</build>
<dependencies>
-
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>struts-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>3.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </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>test</scope>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
</dependency>
-
<dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts-core</artifactId>
- <version>${pom.version}</version>
+ <groupId>net.sf.retrotranslator</groupId>
+ <artifactId>retrotranslator-runtime</artifactId>
+ <version>1.2.1</version>
+ <scope>runtime</scope>
</dependency>
-
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-core</artifactId>
@@ -106,34 +112,12 @@
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-api</artifactId>
<version>2.0.5</version>
<classifier>j4</classifier>
</dependency>
-
- <dependency>
- <groupId>net.sf.retrotranslator</groupId>
- <artifactId>retrotranslator-runtime</artifactId>
- <version>1.2.1</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>3.0</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>2.1</version>
- </dependency>
-
</dependencies>
<reporting>
