Author: Alex.Kolonitsky Date: 2010-06-01 11:24:43 -0400 (Tue, 01 Jun 2010) New Revision: 17452 Modified: root/archetypes/richfaces-archetype-simpleapp/trunk/src/main/resources/archetype-resources/pom.xml root/ui/dist/trunk/richfaces-components-api/pom.xml root/ui/dist/trunk/richfaces-components-impl/pom.xml root/ui/dist/trunk/richfaces-components-ui/pom.xml Log: RF-8713 Adjust richfaces dependences for generated application with proper ones after assembly will be ready fix dependencies between components modules Modified: root/archetypes/richfaces-archetype-simpleapp/trunk/src/main/resources/archetype-resources/pom.xml =================================================================== --- root/archetypes/richfaces-archetype-simpleapp/trunk/src/main/resources/archetype-resources/pom.xml 2010-06-01 14:29:28 UTC (rev 17451) +++ root/archetypes/richfaces-archetype-simpleapp/trunk/src/main/resources/archetype-resources/pom.xml 2010-06-01 15:24:43 UTC (rev 17452) @@ -6,11 +6,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> + <groupId>${groupId}</groupId> <artifactId>${artifactId}</artifactId> <name>RichFaces 4 Application</name> <version>${version}</version> <packaging>war</packaging> + <url>http://jboss.org/richfaces</url> <repositories> @@ -90,40 +92,49 @@ </profile> </profiles> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-bom</artifactId> + <version>4.0.0-SNAPSHOT</version> + <scope>import</scope> + <type>pom</type> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> - <groupId>org.richfaces.ui.components</groupId> - <artifactId>core-ui</artifactId> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-ui</artifactId> <version>4.0.0-SNAPSHOT</version> </dependency> + <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.10</version> - <classifier>jdk15</classifier> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-api</artifactId> - <version>2.0.3-SNAPSHOT</version> </dependency> <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-impl</artifactId> - <version>2.0.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.5.11</version> - <type>jar</type> </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> - <version>1.5.11</version> - <type>jar</type> + <version>1.5.8</version> </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.10</version> + <classifier>jdk15</classifier> + <scope>test</scope> + </dependency> </dependencies> </project> Modified: root/ui/dist/trunk/richfaces-components-api/pom.xml =================================================================== --- root/ui/dist/trunk/richfaces-components-api/pom.xml 2010-06-01 14:29:28 UTC (rev 17451) +++ root/ui/dist/trunk/richfaces-components-api/pom.xml 2010-06-01 15:24:43 UTC (rev 17452) @@ -80,11 +80,6 @@ <artifactId>${jsf2.impl.artifactid}</artifactId> </dependency> <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> - <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> </dependency> Modified: root/ui/dist/trunk/richfaces-components-impl/pom.xml =================================================================== --- root/ui/dist/trunk/richfaces-components-impl/pom.xml 2010-06-01 14:29:28 UTC (rev 17451) +++ root/ui/dist/trunk/richfaces-components-impl/pom.xml 2010-06-01 15:24:43 UTC (rev 17452) @@ -58,8 +58,14 @@ <artifactId>richfaces-ui-iteration-impl</artifactId> </dependency> - <!-- for javadoc generation --> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-api</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-api</artifactId> </dependency> @@ -82,11 +88,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> - <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> </dependency> Modified: root/ui/dist/trunk/richfaces-components-ui/pom.xml =================================================================== --- root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-06-01 14:29:28 UTC (rev 17451) +++ root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-06-01 15:24:43 UTC (rev 17452) @@ -83,6 +83,12 @@ <!-- for javadoc generation --> <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-impl</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-api</artifactId> </dependency> @@ -105,11 +111,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <version>4.0.0-SNAPSHOT</version> - </dependency> - <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> </dependency>