Author: nbelaevski Date: 2009-06-04 14:55:59 -0400 (Thu, 04 Jun 2009) New Revision: 14521 Added: branches/sandbox/rf4_build/examples-sandbox/trunk/testapps/ Modified: branches/sandbox/rf4_build/version-matrix/trunk/cdk/pom.xml branches/sandbox/rf4_build/version-matrix/trunk/examples/pom.xml branches/sandbox/rf4_build/version-matrix/trunk/framework/pom.xml branches/sandbox/rf4_build/version-matrix/trunk/pom.xml branches/sandbox/rf4_build/version-matrix/trunk/ui/pom.xml Log: Build system: version-matrix - dependencies for downstream projects aggregated Modified: branches/sandbox/rf4_build/version-matrix/trunk/cdk/pom.xml =================================================================== --- branches/sandbox/rf4_build/version-matrix/trunk/cdk/pom.xml 2009-06-04 18:19:36 UTC (rev 14520) +++ branches/sandbox/rf4_build/version-matrix/trunk/cdk/pom.xml 2009-06-04 18:55:59 UTC (rev 14521) @@ -6,7 +6,7 @@ <parent> <groupId>org.richfaces</groupId> - <artifactId>parent-version-matrix</artifactId> + <artifactId>version-matrix</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> @@ -16,42 +16,4 @@ <artifactId>cdk-version-matrix</artifactId> <packaging>pom</packaging> - <repositories> - <repository> - <id>repository.jboss.org</id> - <releases><enabled>true</enabled></releases> - <snapshots><enabled>false</enabled></snapshots> - <url>http://repository.jboss.org/maven2</url> - </repository> - </repositories> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - <scope>test</scope> - </dependency> - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> </project> \ No newline at end of file Modified: branches/sandbox/rf4_build/version-matrix/trunk/examples/pom.xml =================================================================== --- branches/sandbox/rf4_build/version-matrix/trunk/examples/pom.xml 2009-06-04 18:19:36 UTC (rev 14520) +++ branches/sandbox/rf4_build/version-matrix/trunk/examples/pom.xml 2009-06-04 18:55:59 UTC (rev 14521) @@ -6,7 +6,7 @@ <parent> <groupId>org.richfaces</groupId> - <artifactId>parent-version-matrix</artifactId> + <artifactId>version-matrix</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> @@ -17,23 +17,10 @@ <packaging>pom</packaging> <properties> - <jsf.version>2.0.0-PR2_3</jsf.version> <framework.version>${project.version}</framework.version> <ui.version>${project.version}</ui.version> </properties> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> - <dependencyManagement> <dependencies> <dependency> @@ -55,34 +42,12 @@ <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> - <version>${jsf.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-impl</artifactId> - <version>${jsf.version}</version> - <scope>provided</scope> </dependency> <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> </dependency> Modified: branches/sandbox/rf4_build/version-matrix/trunk/framework/pom.xml =================================================================== --- branches/sandbox/rf4_build/version-matrix/trunk/framework/pom.xml 2009-06-04 18:19:36 UTC (rev 14520) +++ branches/sandbox/rf4_build/version-matrix/trunk/framework/pom.xml 2009-06-04 18:55:59 UTC (rev 14521) @@ -6,7 +6,7 @@ <parent> <groupId>org.richfaces</groupId> - <artifactId>parent-version-matrix</artifactId> + <artifactId>version-matrix</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> @@ -16,59 +16,10 @@ <artifactId>framework-version-matrix</artifactId> <packaging>pom</packaging> - <properties> - <jsf.version>2.0.0-PR2_3</jsf.version> - </properties> - - <repositories> - <repository> - <id>repository.jboss.org</id> - <releases><enabled>true</enabled></releases> - <snapshots><enabled>false</enabled></snapshots> - <url>http://repository.jboss.org/maven2</url> - </repository> - </repositories> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>${jsf.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>${jsf.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - <scope>test</scope> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> - <!-- all projects will consume JUnit --> <dependency> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - </dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> </project> \ No newline at end of file Modified: branches/sandbox/rf4_build/version-matrix/trunk/pom.xml =================================================================== --- branches/sandbox/rf4_build/version-matrix/trunk/pom.xml 2009-06-04 18:19:36 UTC (rev 14520) +++ branches/sandbox/rf4_build/version-matrix/trunk/pom.xml 2009-06-04 18:55:59 UTC (rev 14521) @@ -7,8 +7,62 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> <!-- TODO: should artifactId start with 'richfaces'? --> - <artifactId>parent-version-matrix</artifactId> + <artifactId>version-matrix</artifactId> <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> + <properties> + <jsf.version>2.0.0-PR2_3</jsf.version> + </properties> + + <repositories> + <repository> + <id>repository.jboss.org</id> + <releases><enabled>true</enabled></releases> + <snapshots><enabled>false</enabled></snapshots> + <url>http://repository.jboss.org/maven2</url> + </repository> + </repositories> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>${jsf.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>${jsf.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> + </dependencyManagement> + + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: branches/sandbox/rf4_build/version-matrix/trunk/ui/pom.xml =================================================================== --- branches/sandbox/rf4_build/version-matrix/trunk/ui/pom.xml 2009-06-04 18:19:36 UTC (rev 14520) +++ branches/sandbox/rf4_build/version-matrix/trunk/ui/pom.xml 2009-06-04 18:55:59 UTC (rev 14521) @@ -6,7 +6,7 @@ <parent> <groupId>org.richfaces</groupId> - <artifactId>parent-version-matrix</artifactId> + <artifactId>version-matrix</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> @@ -17,7 +17,6 @@ <packaging>pom</packaging> <properties> - <jsf.version>2.0.0-PR2_3</jsf.version> <framework.version>${project.version}</framework.version> <cdk.version>${project.version}</cdk.version> </properties> @@ -44,13 +43,6 @@ </execution> </executions> </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> </plugins> </build> @@ -74,28 +66,8 @@ <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> - <version>${jsf.version}</version> - <scope>provided</scope> </dependency> <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> </dependency>