Author: nbelaevski Date: 2009-06-04 17:26:09 -0400 (Thu, 04 Jun 2009) New Revision: 14522 Removed: branches/sandbox/rf4_build/version-matrix/trunk/cdk/ branches/sandbox/rf4_build/version-matrix/trunk/examples/ branches/sandbox/rf4_build/version-matrix/trunk/framework/ branches/sandbox/rf4_build/version-matrix/trunk/ui/ Modified: branches/sandbox/rf4_build/cdk/trunk/pom.xml branches/sandbox/rf4_build/examples/trunk/pom.xml branches/sandbox/rf4_build/framework/trunk/pom.xml branches/sandbox/rf4_build/ui/trunk/pom.xml branches/sandbox/rf4_build/version-matrix/trunk/pom.xml Log: Build system: separate version matrixes for modules removed Modified: branches/sandbox/rf4_build/cdk/trunk/pom.xml =================================================================== --- branches/sandbox/rf4_build/cdk/trunk/pom.xml 2009-06-04 18:55:59 UTC (rev 14521) +++ branches/sandbox/rf4_build/cdk/trunk/pom.xml 2009-06-04 21:26:09 UTC (rev 14522) @@ -6,7 +6,7 @@ <parent> <groupId>org.richfaces</groupId> - <artifactId>cdk-version-matrix</artifactId> + <artifactId>version-matrix</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> Modified: branches/sandbox/rf4_build/examples/trunk/pom.xml =================================================================== --- branches/sandbox/rf4_build/examples/trunk/pom.xml 2009-06-04 18:55:59 UTC (rev 14521) +++ branches/sandbox/rf4_build/examples/trunk/pom.xml 2009-06-04 21:26:09 UTC (rev 14522) @@ -6,7 +6,7 @@ <parent> <groupId>org.richfaces</groupId> - <artifactId>examples-version-matrix</artifactId> + <artifactId>version-matrix</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> @@ -15,6 +15,27 @@ <artifactId>examples</artifactId> <packaging>pom</packaging> + <dependencies> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + </dependency> + + <!-- TODO: uncomment when assembly will be ready --> + <!-- dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui</artifactId> + </dependency --> + </dependencies> + <modules> <module>components</module> <module>richfaces-demo</module> Modified: branches/sandbox/rf4_build/framework/trunk/pom.xml =================================================================== --- branches/sandbox/rf4_build/framework/trunk/pom.xml 2009-06-04 18:55:59 UTC (rev 14521) +++ branches/sandbox/rf4_build/framework/trunk/pom.xml 2009-06-04 21:26:09 UTC (rev 14522) @@ -6,7 +6,7 @@ <parent> <groupId>org.richfaces</groupId> - <artifactId>framework-version-matrix</artifactId> + <artifactId>version-matrix</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> @@ -15,6 +15,13 @@ <artifactId>framework</artifactId> <packaging>pom</packaging> + <dependencies> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </dependency> + </dependencies> + <modules> <module>api</module> <module>test-base</module> Modified: branches/sandbox/rf4_build/ui/trunk/pom.xml =================================================================== --- branches/sandbox/rf4_build/ui/trunk/pom.xml 2009-06-04 18:55:59 UTC (rev 14521) +++ branches/sandbox/rf4_build/ui/trunk/pom.xml 2009-06-04 21:26:09 UTC (rev 14522) @@ -6,16 +6,55 @@ <parent> <groupId>org.richfaces</groupId> - <artifactId>ui-version-matrix</artifactId> + <artifactId>version-matrix</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <artifactId>ui</artifactId> - <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> + <build> + <plugins> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>${cdk.version}</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-test-base</artifactId> + </dependency> + </dependencies> + <modules> <module>components</module> <module>skins</module> Modified: branches/sandbox/rf4_build/version-matrix/trunk/pom.xml =================================================================== --- branches/sandbox/rf4_build/version-matrix/trunk/pom.xml 2009-06-04 18:55:59 UTC (rev 14521) +++ branches/sandbox/rf4_build/version-matrix/trunk/pom.xml 2009-06-04 21:26:09 UTC (rev 14522) @@ -4,6 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <scm> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/<... + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/</conne... + <url>http://fisheye.jboss.org/browse/RichFaces</url> + </scm> + <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <!-- TODO: should artifactId start with 'richfaces'? --> @@ -13,6 +19,9 @@ <properties> <jsf.version>2.0.0-PR2_3</jsf.version> + <framework.version>${project.version}</framework.version> + <ui.version>${project.version}</ui.version> + <cdk.version>${project.version}</cdk.version> </properties> <repositories> @@ -32,7 +41,31 @@ <version>4.4</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <version>${framework.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>${framework.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-test-base</artifactId> + <version>${framework.version}</version> + <scope>test</scope> + </dependency> + <!-- TODO: uncomment when assembly will be ready --> + <!-- dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui</artifactId> + <version>${ui.version}</version> + </dependency --> + + <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> <version>${jsf.version}</version> @@ -44,6 +77,7 @@ <version>${jsf.version}</version> <scope>provided</scope> </dependency> + </dependencies> </dependencyManagement>