Author: craigmcc Date: Tue Jun 13 20:49:26 2006 New Revision: 414044 URL: http://svn.apache.org/viewvc?rev=414044&view=rev Log: Mostly cosmetic refinements to the top level POMs. Be more explicit about Commons APIs that are *directly* utilized, rather than relying on the fact that the dependencies get transitively added.
Modified: struts/shale/branches/mvn_reorg/pom.xml struts/shale/branches/mvn_reorg/shale-clay/pom.xml struts/shale/branches/mvn_reorg/shale-core/pom.xml struts/shale/branches/mvn_reorg/shale-remoting/ (props changed) struts/shale/branches/mvn_reorg/shale-remoting/pom.xml struts/shale/branches/mvn_reorg/shale-spring/ (props changed) struts/shale/branches/mvn_reorg/shale-tiger/ (props changed) struts/shale/branches/mvn_reorg/shale-tiles/ (props changed) Modified: struts/shale/branches/mvn_reorg/pom.xml URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/pom.xml?rev=414044&r1=414043&r2=414044&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/pom.xml (original) +++ struts/shale/branches/mvn_reorg/pom.xml Tue Jun 13 20:49:26 2006 @@ -19,19 +19,21 @@ --> <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> <artifactId>struts-parent</artifactId> <version>2</version> </parent> + <groupId>org.apache.struts.shale</groupId> <artifactId>shale-parent</artifactId> <version>1.0.3-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Shale Framework</name> <url>http://struts.apache.org/struts-shale</url> + <description>The Apache Shale Framework</description> <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/struts/shale/trunk</connection> @@ -286,11 +288,13 @@ <dependencyManagement> <dependencies> + + <!-- Declare explicit version numbers for nested dependencies --> + <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + <version>2.7.2</version> </dependency> <dependency> @@ -330,16 +334,18 @@ </dependency> <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + + <dependency> <groupId>oro</groupId> <artifactId>oro</artifactId> <version>2.0.8</version> </dependency> - <dependency> - <groupId>antlr</groupId> - <artifactId>antlr</artifactId> - <version>2.7.2</version> - </dependency> </dependencies> </dependencyManagement> 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=414044&r1=414043&r2=414044&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-clay/pom.xml (original) +++ struts/shale/branches/mvn_reorg/shale-clay/pom.xml Tue Jun 13 20:49:26 2006 @@ -35,15 +35,32 @@ <dependencies> <dependency> - <groupId>org.apache.struts.shale</groupId> - <artifactId>shale-core</artifactId> - <version>${version}</version> + <groupId>commons-chain</groupId> + <artifactId>commons-chain</artifactId> + </dependency> + + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.apache.struts.shale</groupId> + <artifactId>shale-core</artifactId> + <version>${version}</version> + </dependency> + <dependency> <groupId>org.apache.struts.shale</groupId> <artifactId>shale-test</artifactId> 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=414044&r1=414043&r2=414044&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-core/pom.xml (original) +++ struts/shale/branches/mvn_reorg/shale-core/pom.xml Tue Jun 13 20:49:26 2006 @@ -33,25 +33,45 @@ <url>http://struts.apache.org/struts-shale</url> <dependencies> + + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> + <dependency> <groupId>commons-chain</groupId> <artifactId>commons-chain</artifactId> </dependency> + + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> <groupId>commons-validator</groupId> <artifactId>commons-validator</artifactId> </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> + <dependency> <groupId>org.apache.struts.shale</groupId> <artifactId>shale-test</artifactId> <version>${version}</version> <scope>test</scope> </dependency> + </dependencies> <build> Propchange: struts/shale/branches/mvn_reorg/shale-remoting/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Jun 13 20:49:26 2006 @@ -0,0 +1 @@ +pom.xml~ 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=414044&r1=414043&r2=414044&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-remoting/pom.xml (original) +++ struts/shale/branches/mvn_reorg/shale-remoting/pom.xml Tue Jun 13 20:49:26 2006 @@ -23,6 +23,7 @@ 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.shale</groupId> <artifactId>shale-parent</artifactId> @@ -32,6 +33,7 @@ <artifactId>shale-remoting</artifactId> <packaging>jar</packaging> <name>Shale Remoting Support</name> + <!-- <build> <plugins> @@ -53,22 +55,32 @@ </build> --> + <dependencies> + <dependency> <groupId>commons-chain</groupId> <artifactId>commons-chain</artifactId> </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> + <dependency> <groupId>org.apache.struts.shale</groupId> <artifactId>shale-test</artifactId> <version>${version}</version> <scope>test</scope> </dependency> + </dependencies> </project> Propchange: struts/shale/branches/mvn_reorg/shale-spring/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Jun 13 20:49:26 2006 @@ -0,0 +1 @@ +pom.xml~ Propchange: struts/shale/branches/mvn_reorg/shale-tiger/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Tue Jun 13 20:49:26 2006 @@ -1 +1,2 @@ target +pom.xml~ Propchange: struts/shale/branches/mvn_reorg/shale-tiles/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Jun 13 20:49:26 2006 @@ -0,0 +1 @@ +pom.xml~