Author: alexsmirnov Date: 2010-06-25 20:56:48 -0400 (Fri, 25 Jun 2010) New Revision: 17677 Modified: root/cdk/branches/RF8755/bom/pom.xml Log: svitch to the new google collections project Modified: root/cdk/branches/RF8755/bom/pom.xml =================================================================== --- root/cdk/branches/RF8755/bom/pom.xml 2010-06-26 00:56:03 UTC (rev 17676) +++ root/cdk/branches/RF8755/bom/pom.xml 2010-06-26 00:56:48 UTC (rev 17677) @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<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/xsd/maven-4.0.0.xsd"> +<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/xsd/maven-4.0.0.xsd"> <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>7</version> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>7</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -16,9 +17,9 @@ <packaging>pom</packaging> <name>JSF Components Development Kit (CDK) bill of materials.</name> <description>This module defines all versions of CDK projects and their dependencies.</description> - <properties> - <org.richfaces.commons.version>4.0.0-SNAPSHOT</org.richfaces.commons.version> - </properties> + <properties> + <org.richfaces.commons.version>4.0.0-SNAPSHOT</org.richfaces.commons.version> + </properties> <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/cdk/t... <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... @@ -38,17 +39,18 @@ </build> <dependencyManagement> <dependencies> - <!-- Import richfaces-common-bom --> - <dependency> - <groupId>org.richfaces.commons</groupId> - <artifactId>richfaces-commons-bom</artifactId> - <version>${org.richfaces.commons.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - - <!-- TODO remove duplicates from these dependences already defined in project BOM --> + <!-- Import richfaces-common-bom --> <dependency> + <groupId>org.richfaces.commons</groupId> + <artifactId>richfaces-commons-bom</artifactId> + <version>${org.richfaces.commons.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + + <!-- TODO remove duplicates from these dependences already defined in + project BOM --> + <dependency> <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> <version>2.1</version> @@ -80,6 +82,22 @@ <version>1.0</version> </dependency> <dependency> + <groupId>com.googlecode.functional-collections</groupId> + <artifactId>functional-collections</artifactId> + <version>1.1.7</version> + <exclusions> + <exclusion> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>r05</version> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> <version>2.0</version>