Author: jbalunas(a)redhat.com Date: 2010-08-12 16:16:31 -0400 (Thu, 12 Aug 2010) New Revision: 18601 Modified: branches/RF-9040_build_updated_m2/bom/pom.xml branches/RF-9040_build_updated_m2/ui/common/api/pom.xml branches/RF-9040_build_updated_m2/ui/common/ui/pom.xml branches/RF-9040_build_updated_m2/ui/core/ui/pom.xml branches/RF-9040_build_updated_m2/ui/dist/pom.xml branches/RF-9040_build_updated_m2/ui/dist/richfaces-components-api/pom.xml branches/RF-9040_build_updated_m2/ui/dist/richfaces-components-ui/pom.xml branches/RF-9040_build_updated_m2/ui/iteration/api/pom.xml branches/RF-9040_build_updated_m2/ui/iteration/ui/pom.xml branches/RF-9040_build_updated_m2/ui/misc/ui/pom.xml branches/RF-9040_build_updated_m2/ui/output/api/pom.xml branches/RF-9040_build_updated_m2/ui/output/ui/pom.xml branches/RF-9040_build_updated_m2/ui/parent/pom.xml branches/RF-9040_build_updated_m2/ui/pom.xml Log: RF-9040 ui build refactoring Modified: branches/RF-9040_build_updated_m2/bom/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/bom/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/bom/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -63,6 +63,61 @@ <artifactId>richfaces-core-impl</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.richfaces.ui.common</groupId> + <artifactId>richfaces-ui-common-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.common</groupId> + <artifactId>richfaces-ui-common-ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.core</groupId> + <artifactId>richfaces-ui-core-ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>richfaces-ui-iteration-ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>richfaces-ui-iteration-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.output</groupId> + <artifactId>richfaces-ui-output-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.output</groupId> + <artifactId>richfaces-ui-output-ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.misc</groupId> + <artifactId>richfaces-ui-misc-ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>annotations</artifactId> + <version>${project.version}</version> + </dependency> <!-- JSF 2 --> <dependency> <groupId>javax.faces</groupId> Modified: branches/RF-9040_build_updated_m2/ui/common/api/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/common/api/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/ui/common/api/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -35,13 +35,7 @@ <packaging>jar</packaging> <dependencies> - <!-- JSF with dependencies --> <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> @@ -64,11 +58,6 @@ <!-- tests --> <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>test</scope> - </dependency> - <dependency> <!-- todo api? --> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> Modified: branches/RF-9040_build_updated_m2/ui/common/ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/common/ui/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/ui/common/ui/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -36,14 +36,12 @@ <packaging>jar</packaging> <properties> - <org.richfaces.cdk.version>4.0.0-SNAPSHOT</org.richfaces.cdk.version> </properties> <dependencies> <dependency> <groupId>org.richfaces.ui.common</groupId> <artifactId>richfaces-ui-common-api</artifactId> - <version>${project.version}</version> </dependency> <!-- runtime --> @@ -54,11 +52,6 @@ <!-- JSF with dependencies --> <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> @@ -81,11 +74,6 @@ <!-- tests --> <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>test</scope> - </dependency> - <dependency> <!-- todo api? --> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> Modified: branches/RF-9040_build_updated_m2/ui/core/ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/core/ui/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/ui/core/ui/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -62,11 +62,6 @@ <!-- JSF with dependencies --> <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> @@ -89,11 +84,6 @@ <!-- tests --> <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>test</scope> - </dependency> - <dependency> <!-- todo api? --> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> Modified: branches/RF-9040_build_updated_m2/ui/dist/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/dist/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/ui/dist/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -20,9 +20,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>9</version> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-parent</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui</groupId> @@ -32,10 +33,7 @@ <name>Richfaces UI Assembler</name> <modules> - <!--<module>bom</module>--> - <!--<module>parent</module>--> <module>richfaces-components-api</module> - <!--<module>richfaces-components-impl</module>--> <module>richfaces-components-ui</module> </modules> @@ -77,7 +75,8 @@ <profiles> <profile> <id>build-force</id> - + + <!-- TODO these are out of date --> <modules> <module>../../core</module> <module>../../misc/dist</module> Modified: branches/RF-9040_build_updated_m2/ui/dist/richfaces-components-api/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/dist/richfaces-components-api/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/ui/dist/richfaces-components-api/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -25,6 +25,7 @@ <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui</groupId> @@ -66,14 +67,6 @@ <artifactId>richfaces-commons-api</artifactId> </dependency> <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - </dependency> - <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - </dependency> - <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> </dependency> Modified: branches/RF-9040_build_updated_m2/ui/dist/richfaces-components-ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/dist/richfaces-components-ui/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/ui/dist/richfaces-components-ui/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -25,6 +25,7 @@ <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui</groupId> @@ -75,16 +76,6 @@ <artifactId>richfaces-commons-api</artifactId> </dependency> <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> </dependency> Modified: branches/RF-9040_build_updated_m2/ui/iteration/api/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/iteration/api/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/ui/iteration/api/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -25,6 +25,7 @@ <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -36,11 +37,6 @@ <dependencies> <!-- JSF with dependencies --> <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> @@ -71,11 +67,6 @@ <!-- tests --> <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>test</scope> - </dependency> - <dependency> <!-- todo api? --> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> Modified: branches/RF-9040_build_updated_m2/ui/iteration/ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/iteration/ui/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/ui/iteration/ui/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -27,6 +27,7 @@ <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui.iteration</groupId> @@ -35,7 +36,6 @@ <packaging>jar</packaging> <properties> - <org.richfaces.cdk.version>4.0.0-SNAPSHOT</org.richfaces.cdk.version> </properties> <build> @@ -72,23 +72,16 @@ <artifactId>richfaces-core-impl</artifactId> </dependency> <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-api</artifactId> - <version>${project.version}</version> </dependency> - - <!-- JSF with dependencies --> <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> + <groupId>org.richfaces.cdk</groupId> + <artifactId>annotations</artifactId> <scope>provided</scope> </dependency> + + <!-- JSF with dependencies --> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> @@ -112,11 +105,6 @@ <!-- tests --> <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>test</scope> - </dependency> - <dependency> <!-- todo api? --> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> @@ -142,11 +130,6 @@ <artifactId>jsf-mock</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <version>${org.richfaces.cdk.version}</version> - </dependency> </dependencies> <scm> Modified: branches/RF-9040_build_updated_m2/ui/misc/ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/misc/ui/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/ui/misc/ui/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -26,6 +26,7 @@ <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui.misc</groupId> @@ -55,16 +56,11 @@ <properties> <assembly.projects.group>org.richfaces.ui.misc</assembly.projects.group> <faces-shade-transformers.version>2</faces-shade-transformers.version> - <org.richfaces.cdk.version>4.0.0-SNAPSHOT</org.richfaces.cdk.version> </properties> <dependencies> <!-- artifacts for javadoc generation --> <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - </dependency> - <dependency> <groupId>org.richfaces.cdk</groupId> <artifactId>annotations</artifactId> </dependency> @@ -79,11 +75,6 @@ <!-- JSF with dependencies --> <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> @@ -106,11 +97,6 @@ <!-- tests --> <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>test</scope> - </dependency> - <dependency> <!-- todo api? --> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> Modified: branches/RF-9040_build_updated_m2/ui/output/api/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/output/api/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/ui/output/api/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -26,6 +26,7 @@ <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -47,11 +48,6 @@ <!-- JSF with dependencies --> <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> @@ -74,11 +70,6 @@ <!-- tests --> <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>test</scope> - </dependency> - <dependency> <!-- todo api? --> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> Modified: branches/RF-9040_build_updated_m2/ui/output/ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/output/ui/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/ui/output/ui/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -27,6 +27,7 @@ <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui.output</groupId> @@ -71,16 +72,10 @@ <dependency> <groupId>org.richfaces.ui.output</groupId> <artifactId>richfaces-ui-output-api</artifactId> - <version>${project.version}</version> </dependency> <!-- JSF with dependencies --> <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> @@ -103,11 +98,6 @@ <!-- tests --> <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>test</scope> - </dependency> - <dependency> <!-- todo api? --> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> Modified: branches/RF-9040_build_updated_m2/ui/parent/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/parent/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/ui/parent/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -25,110 +25,20 @@ <parent> <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>9</version> + <artifactId>richfaces-bom</artifactId> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> <version>4.0.0-SNAPSHOT</version> - <name>Richfaces UI Components: Miscellanous Parent</name> + <name>Richfaces UI Components Parent</name> <packaging>pom</packaging> <properties> <richfaces.checkstyle.version>1</richfaces.checkstyle.version> - <org.richfaces.cdk.version>4.0.0-SNAPSHOT</org.richfaces.cdk.version> - <org.richfaces.core.version>4.0.0-SNAPSHOT</org.richfaces.core.version> - <org.richfaces.commons.version>4.0.0-SNAPSHOT</org.richfaces.commons.version> - <org.richfaces.ui.common.version>4.0.0-SNAPSHOT</org.richfaces.ui.common.version> - <org.richfaces.ui.core.version>4.0.0-SNAPSHOT</org.richfaces.ui.core.version> - <org.richfaces.ui.misc.version>4.0.0-SNAPSHOT</org.richfaces.ui.misc.version> - <org.richfaces.ui.iteration.version>4.0.0-SNAPSHOT</org.richfaces.ui.iteration.version> - <org.richfaces.ui.output.version>4.0.0-SNAPSHOT</org.richfaces.ui.output.version> </properties> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-bom</artifactId> - <version>${org.richfaces.core.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - <dependency> - <groupId>org.richfaces.commons</groupId> - <artifactId>richfaces-commons-bom</artifactId> - <version>${org.richfaces.commons.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - - <dependency> - <groupId>org.richfaces.ui.common</groupId> - <artifactId>richfaces-ui-common-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui.common</groupId> - <artifactId>richfaces-ui-common-ui</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.richfaces.ui.core</groupId> - <artifactId>richfaces-ui-core-ui</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.richfaces.ui.iteration</groupId> - <artifactId>richfaces-ui-iteration-ui</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui.iteration</groupId> - <artifactId>richfaces-ui-iteration-api</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.richfaces.ui.output</groupId> - <artifactId>richfaces-ui-output-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui.output</groupId> - <artifactId>richfaces-ui-output-ui</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.richfaces.ui.misc</groupId> - <artifactId>richfaces-ui-misc-ui</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-components-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-components-ui</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <version>${org.richfaces.cdk.version}</version> - </dependency> - </dependencies> - - </dependencyManagement> - + <build> <pluginManagement> <plugins> @@ -151,7 +61,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>${org.richfaces.cdk.version}</version> + <version>${project.version}</version> <configuration> <library> <prefix>org.richfaces</prefix> @@ -220,11 +130,6 @@ <!-- JSF with dependencies --> <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> @@ -247,11 +152,6 @@ <!-- tests --> <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>test</scope> - </dependency> - <dependency> <!-- todo api? --> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> @@ -325,8 +225,8 @@ <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/m... - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/p... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... <url>http://fisheye.jboss.org/browse/richfaces/</url> </scm> </project> Modified: branches/RF-9040_build_updated_m2/ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/ui/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -28,7 +28,7 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-parent</artifactId> - <version>9</version> + <version>10-SNAPSHOT</version> </parent> <groupId>org.richfaces.ui</groupId>