[seam-commits] Seam SVN: r10685 - in modules/trunk: faces and 1 other directories.

Author: dan.j.allen Date: 2009-04-28 17:45:28 -0400 (Tue, 28 Apr 2009) New Revision: 10685 Modified: modules/trunk/el/pom.xml modules/trunk/faces/pom.xml modules/trunk/international/pom.xml Log: clean up POM add whitespace use webbeans properties push common test dependencies to parent Modified: modules/trunk/el/pom.xml =================================================================== --- modules/trunk/el/pom.xml 2009-04-28 21:43:44 UTC (rev 10684) +++ modules/trunk/el/pom.xml 2009-04-28 21:45:28 UTC (rev 10685) @@ -31,39 +31,31 @@ </build> <dependencies> - <!-- TODO pull up --> + <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <scope>test</scope> - <classifier>jdk15</classifier> + <groupId>${webbeans.groupId}</groupId> + <artifactId>jsr299-api</artifactId> + <scope>provided</scope> </dependency> + <dependency> + <groupId>${webbeans.groupId}</groupId> + <artifactId>webbeans-logging</artifactId> + <!-- assumes use of Web Beans impl --> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> <scope>provided</scope> </dependency> + <dependency> <groupId>org.jboss.el</groupId> <artifactId>jboss-el</artifactId> - <!-- move exclusion to version-matrix? --> - <exclusions> - <exclusion> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - </exclusion> - </exclusions> </dependency> - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>jsr299-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-logging</artifactId> - <!-- provided? --> - </dependency> + </dependencies> </project> Modified: modules/trunk/faces/pom.xml =================================================================== --- modules/trunk/faces/pom.xml 2009-04-28 21:43:44 UTC (rev 10684) +++ modules/trunk/faces/pom.xml 2009-04-28 21:45:28 UTC (rev 10685) @@ -15,38 +15,48 @@ <name>Seam Faces Module</name> <dependencies> + <dependency> <groupId>${seam.groupId}</groupId> <artifactId>seam-el</artifactId> </dependency> + <dependency> <groupId>${seam.groupId}</groupId> <artifactId>seam-international</artifactId> </dependency> + <dependency> + <groupId>${webbeans.groupId}</groupId> + <artifactId>jsr299-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>${webbeans.groupId}</groupId> + <artifactId>webbeans-logging</artifactId> + <!-- assumes use of Web Beans impl --> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> <scope>provided</scope> </dependency> + <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> <scope>provided</scope> </dependency> + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>jsr299-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-logging</artifactId> - </dependency> + </dependencies> </project> Modified: modules/trunk/international/pom.xml =================================================================== --- modules/trunk/international/pom.xml 2009-04-28 21:43:44 UTC (rev 10684) +++ modules/trunk/international/pom.xml 2009-04-28 21:45:28 UTC (rev 10685) @@ -32,63 +32,25 @@ <dependencies> - <!-- TODO pull up test dependencies --> <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <scope>test</scope> - <classifier>jdk15</classifier> + <groupId>${seam.groupId}</groupId> + <artifactId>seam-el</artifactId> </dependency> <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-core-test</artifactId> - <version>1.0.0-SNAPSHOT</version> - <scope>test</scope> + <groupId>${webbeans.groupId}</groupId> + <artifactId>jsr299-api</artifactId> + <scope>provided</scope> </dependency> <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness</artifactId> - <version>1.0.0-SNAPSHOT</version> - <scope>test</scope> + <groupId>${webbeans.groupId}</groupId> + <artifactId>webbeans-logging</artifactId> + <!-- assumes use of Web Beans impl --> + <scope>provided</scope> </dependency> <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness</artifactId> - <version>1.0.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <!-- we don't have a generic javax.ejb 3.1 api yet --> - <dependency> - <groupId>org.jboss.ejb3</groupId> - <artifactId>jboss-ejb3-api</artifactId> - <version>3.1.0-Alpha1</version> - <scope>test</scope> - <exclusions> - <exclusion> - <artifactId>jboss-jaxrpc</artifactId> - <groupId>jbossws</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-transaction-api</artifactId> - <groupId>org.jboss.javaee</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-jaxrpc</artifactId> - <groupId>jboss.jbossws</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>${seam.groupId}</groupId> - <artifactId>seam-el</artifactId> - </dependency> - - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> @@ -100,18 +62,6 @@ <scope>provided</scope> </dependency> - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>jsr299-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-logging</artifactId> - <!-- provided? --> - </dependency> - </dependencies> </project>