Author: craigmcc
Date: Tue Jun 13 19:11:46 2006
New Revision: 414025
URL: http://svn.apache.org/viewvc?rev=414025&view=rev
Log:
Refactor dependencies on platform-provided APIs (since Shale requires
J2SE 1.4 and J2EE 1.4) into the top-level POM so we can start
simplifying the detailed ones.
Modified:
struts/shale/branches/mvn_reorg/pom.xml
struts/shale/branches/mvn_reorg/shale-apps/ (props changed)
struts/shale/branches/mvn_reorg/shale-apps/pom.xml
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/ (props changed)
struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml
struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/ (props
changed)
struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/pom.xml
struts/shale/branches/mvn_reorg/shale-apps/shale-sql-browser/ (props
changed)
struts/shale/branches/mvn_reorg/shale-apps/shale-sql-browser/pom.xml
struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/ (props changed)
struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/pom.xml
struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/src/main/webapp/
(props changed)
struts/shale/branches/mvn_reorg/shale-clay/pom.xml
struts/shale/branches/mvn_reorg/shale-core/ (props changed)
struts/shale/branches/mvn_reorg/shale-core/pom.xml
struts/shale/branches/mvn_reorg/shale-dist/pom.xml
struts/shale/branches/mvn_reorg/shale-remoting/pom.xml
struts/shale/branches/mvn_reorg/shale-test/pom.xml
struts/shale/branches/mvn_reorg/shale-tiger/pom.xml
struts/shale/branches/mvn_reorg/shale-tiles/pom.xml
Modified: struts/shale/branches/mvn_reorg/pom.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/pom.xml?rev=414025&r1=414024&r2=414025&view=diff
==============================================================================
--- struts/shale/branches/mvn_reorg/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/pom.xml Tue Jun 13 19:11:46 2006
@@ -241,73 +241,56 @@
</plugins>
</reporting>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.6.2</version>
- <scope>test</scope>
- </dependency>
+ <dependencies>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <version>2.6.2</version>
- <scope>test</scope>
- </dependency>
-
+ <!-- Declare provided dependencies for platform APIs -->
- <!-- Needs a different xml-apis jar
- <dependency> (or 2.4.0)
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.7.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.4</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.6.2</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>2.6.2</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>2.0.2</version>
- <scope>test</scope>
- </dependency>
- -->
-
- <!--
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.0</version>
- <scope>test</scope>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>2.0.2</version>
+ <scope>provided</scope>
</dependency>
- -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <!--exclusions>
- <exclusion>
- <groupId>servletapi</groupId>
- <artifactId>servletapi</artifactId>
- </exclusion>
- </exclusions-->
- <scope>provided</scope>
- </dependency>
+ </dependencies>
+
+ <dependencyManagement>
+ <dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
</dependency>
<dependency>
Propchange: struts/shale/branches/mvn_reorg/shale-apps/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jun 13 19:11:46 2006
@@ -0,0 +1 @@
+pom.xml~
Modified: struts/shale/branches/mvn_reorg/shale-apps/pom.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-apps/pom.xml?rev=414025&r1=414024&r2=414025&view=diff
==============================================================================
--- struts/shale/branches/mvn_reorg/shale-apps/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/shale-apps/pom.xml Tue Jun 13 19:11:46 2006
@@ -33,18 +33,6 @@
<dependencies>
<!-- Document "provided" dependencies to avoid cluttering WAR files -->
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.2.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.0.b2</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<!-- TODO: Move the 'itest' profile and dependencies to this pom when
MNG-2221 is fixed. -->
Propchange: struts/shale/branches/mvn_reorg/shale-apps/shale-blank/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jun 13 19:11:46 2006
@@ -0,0 +1 @@
+pom.xml~
Modified: struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml?rev=414025&r1=414024&r2=414025&view=diff
==============================================================================
--- struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/shale-apps/shale-blank/pom.xml Tue Jun 13
19:11:46 2006
@@ -53,18 +53,6 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- </dependency>
-
- <dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>1.1.2</version>
Propchange: struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jun 13 19:11:46 2006
@@ -0,0 +1 @@
+pom.xml~
Modified: struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/pom.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/pom.xml?rev=414025&r1=414024&r2=414025&view=diff
==============================================================================
--- struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/pom.xml
(original)
+++ struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/pom.xml Tue Jun
13 19:11:46 2006
@@ -53,20 +53,6 @@
</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>taglibs</groupId>
<artifactId>standard</artifactId>
<version>1.1.2</version>
Propchange: struts/shale/branches/mvn_reorg/shale-apps/shale-sql-browser/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jun 13 19:11:46 2006
@@ -0,0 +1 @@
+pom.xml~
Modified: struts/shale/branches/mvn_reorg/shale-apps/shale-sql-browser/pom.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-apps/shale-sql-browser/pom.xml?rev=414025&r1=414024&r2=414025&view=diff
==============================================================================
--- struts/shale/branches/mvn_reorg/shale-apps/shale-sql-browser/pom.xml
(original)
+++ struts/shale/branches/mvn_reorg/shale-apps/shale-sql-browser/pom.xml Tue
Jun 13 19:11:46 2006
@@ -90,18 +90,6 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- </dependency>
-
- <dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>1.1.2</version>
Propchange: struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jun 13 19:11:46 2006
@@ -0,0 +1 @@
+pom.xml~
Modified: struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/pom.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/pom.xml?rev=414025&r1=414024&r2=414025&view=diff
==============================================================================
--- struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/pom.xml Tue Jun
13 19:11:46 2006
@@ -71,18 +71,6 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- </dependency>
-
- <dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>1.1.2</version>
Propchange:
struts/shale/branches/mvn_reorg/shale-apps/shale-usecases/src/main/webapp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jun 13 19:11:46 2006
@@ -0,0 +1 @@
+usecases.jsp~
Modified: struts/shale/branches/mvn_reorg/shale-clay/pom.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/pom.xml?rev=414025&r1=414024&r2=414025&view=diff
==============================================================================
--- struts/shale/branches/mvn_reorg/shale-clay/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/shale-clay/pom.xml Tue Jun 13 19:11:46 2006
@@ -40,14 +40,6 @@
<version>${version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Propchange: struts/shale/branches/mvn_reorg/shale-core/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jun 13 19:11:46 2006
@@ -1,3 +1,3 @@
dist
target
-
+pom.xml~
Modified: struts/shale/branches/mvn_reorg/shale-core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-core/pom.xml?rev=414025&r1=414024&r2=414025&view=diff
==============================================================================
--- struts/shale/branches/mvn_reorg/shale-core/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/shale-core/pom.xml Tue Jun 13 19:11:46 2006
@@ -34,16 +34,8 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
<groupId>commons-chain</groupId>
<artifactId>commons-chain</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
</dependency>
<dependency>
<groupId>commons-validator</groupId>
Modified: struts/shale/branches/mvn_reorg/shale-dist/pom.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-dist/pom.xml?rev=414025&r1=414024&r2=414025&view=diff
==============================================================================
--- struts/shale/branches/mvn_reorg/shale-dist/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/shale-dist/pom.xml Tue Jun 13 19:11:46 2006
@@ -100,24 +100,6 @@
<!-- Exclude transitive dependencies -->
<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>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.0.b2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
Modified: struts/shale/branches/mvn_reorg/shale-remoting/pom.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-remoting/pom.xml?rev=414025&r1=414024&r2=414025&view=diff
==============================================================================
--- struts/shale/branches/mvn_reorg/shale-remoting/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/shale-remoting/pom.xml Tue Jun 13 19:11:46
2006
@@ -59,10 +59,6 @@
<artifactId>commons-chain</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: struts/shale/branches/mvn_reorg/shale-test/pom.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-test/pom.xml?rev=414025&r1=414024&r2=414025&view=diff
==============================================================================
--- struts/shale/branches/mvn_reorg/shale-test/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/shale-test/pom.xml Tue Jun 13 19:11:46 2006
@@ -34,10 +34,6 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
<groupId>htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<version>1.8</version>
Modified: struts/shale/branches/mvn_reorg/shale-tiger/pom.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-tiger/pom.xml?rev=414025&r1=414024&r2=414025&view=diff
==============================================================================
--- struts/shale/branches/mvn_reorg/shale-tiger/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/shale-tiger/pom.xml Tue Jun 13 19:11:46 2006
@@ -121,10 +121,6 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
Modified: struts/shale/branches/mvn_reorg/shale-tiles/pom.xml
URL:
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-tiles/pom.xml?rev=414025&r1=414024&r2=414025&view=diff
==============================================================================
--- struts/shale/branches/mvn_reorg/shale-tiles/pom.xml (original)
+++ struts/shale/branches/mvn_reorg/shale-tiles/pom.xml Tue Jun 13 19:11:46 2006
@@ -34,10 +34,6 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.struts.shale</groupId>
<artifactId>shale-core</artifactId>
<version>${pom.version}</version>
