Author: jbalunas(a)redhat.com Date: 2010-05-21 12:58:58 -0400 (Fri, 21 May 2010) New Revision: 17184 Modified: root/cdk/trunk/bom/pom.xml root/cdk/trunk/plugins/annotations/pom.xml root/cdk/trunk/plugins/generator/pom.xml Log: Updated cdk to follow conditional jsf impl profiles Modified: root/cdk/trunk/bom/pom.xml =================================================================== --- root/cdk/trunk/bom/pom.xml 2010-05-21 16:32:57 UTC (rev 17183) +++ root/cdk/trunk/bom/pom.xml 2010-05-21 16:58:58 UTC (rev 17184) @@ -4,15 +4,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <!-- - TODO inherit this module from the RichFaces root that should define - all global properties: distribution management, license, developers, - company ... - --> <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-parent</artifactId> - <version>1</version> + <version>2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -23,6 +18,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> + <richfaces.commons.version>4.0.0-SNAPSHOT</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... @@ -42,14 +40,17 @@ </build> <dependencyManagement> <dependencies> - <!-- JSF --> + <!-- Import richfaces-common-bom --> + <dependency> + <groupId>org.richfaces.commons</groupId> + <artifactId>richfaces-commons-bom</artifactId> + <version>${richfaces.commons.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + + <!-- TODO remove duplicates from these dependences already defined in project BOM --> <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>2.0.3-SNAPSHOT</version> - <!--<scope>provided</scope>--> - </dependency> - <dependency> <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> <version>2.1</version> Modified: root/cdk/trunk/plugins/annotations/pom.xml =================================================================== --- root/cdk/trunk/plugins/annotations/pom.xml 2010-05-21 16:32:57 UTC (rev 17183) +++ root/cdk/trunk/plugins/annotations/pom.xml 2010-05-21 16:58:58 UTC (rev 17184) @@ -15,8 +15,8 @@ <name>annotations</name> <dependencies> <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - </dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + </dependency> </dependencies> </project> Modified: root/cdk/trunk/plugins/generator/pom.xml =================================================================== --- root/cdk/trunk/plugins/generator/pom.xml 2010-05-21 16:32:57 UTC (rev 17183) +++ root/cdk/trunk/plugins/generator/pom.xml 2010-05-21 16:58:58 UTC (rev 17184) @@ -132,9 +132,9 @@ <artifactId>jaxb-impl</artifactId> </dependency> <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - </dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + </dependency> <dependency> <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId>