Author: jbalunas(a)redhat.com Date: 2010-06-02 21:04:09 -0400 (Wed, 02 Jun 2010) New Revision: 17474 Added: root/ui/dist/trunk/parent/ root/ui/dist/trunk/parent/pom.xml Modified: root/ui/dist/trunk/bom/pom.xml root/ui/dist/trunk/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: Updated ui/dist with parent, and used bom dependencies to make it easier to work with, and release Modified: root/ui/dist/trunk/bom/pom.xml =================================================================== --- root/ui/dist/trunk/bom/pom.xml 2010-06-02 23:32:48 UTC (rev 17473) +++ root/ui/dist/trunk/bom/pom.xml 2010-06-03 01:04:09 UTC (rev 17474) @@ -20,7 +20,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.dist</groupId> <artifactId>richfaces-components-bom</artifactId> <packaging>pom</packaging> <version>4.0.0-SNAPSHOT</version> @@ -39,9 +39,11 @@ <url>http://www.jboss.org/richfaces</url> <properties> - <richfaces.commons.version>4.0.0-SNAPSHOT</richfaces.commons.version> - <richfaces.core.version>4.0.0-SNAPSHOT</richfaces.core.version> - <richfaces.bom.version>4.0.0-SNAPSHOT</richfaces.bom.version> + <org.richfaces.commons.version>4.0.0-SNAPSHOT</org.richfaces.commons.version> + <org.richfaces.core.version>4.0.0-SNAPSHOT</org.richfaces.core.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> </properties> <!-- Runtime dependency management --> @@ -50,34 +52,54 @@ <dependency> <groupId>org.richfaces.commons</groupId> <artifactId>richfaces-commons-bom</artifactId> - <version>${richfaces.commons.version}</version> + <version>${org.richfaces.commons.version}</version> <scope>import</scope> <type>pom</type> </dependency> <dependency> <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-bom</artifactId> - <version>${richfaces.core.version}</version> + <version>${org.richfaces.core.version}</version> <scope>import</scope> <type>pom</type> </dependency> + <dependency> + <groupId>org.richfaces.ui.core</groupId> + <artifactId>richfaces-ui-core-bom</artifactId> + <version>${org.richfaces.ui.core.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + <dependency> + <groupId>org.richfaces.ui.misc</groupId> + <artifactId>richfaces-ui-misc-bom</artifactId> + <version>${org.richfaces.ui.misc.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + <dependency> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>richfaces-ui-iteration-bom</artifactId> + <version>${org.richfaces.ui.iteration.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.dist</groupId> <artifactId>richfaces-components-api</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.dist</groupId> <artifactId>richfaces-components-impl</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.dist</groupId> <artifactId>richfaces-components-ui</artifactId> <version>${project.version}</version> </dependency> - </dependencies> </dependencyManagement> Added: root/ui/dist/trunk/parent/pom.xml =================================================================== --- root/ui/dist/trunk/parent/pom.xml (rev 0) +++ root/ui/dist/trunk/parent/pom.xml 2010-06-03 01:04:09 UTC (rev 17474) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + JBoss, Home of Professional Open Source Copyright 2010, Red Hat, + Inc. and individual contributors by the @authors tag. See the + copyright.txt in the distribution for a full listing of + individual contributors. This is free software; you can + redistribute it and/or modify it under the terms of the GNU + Lesser General Public License as published by the Free Software + Foundation; either version 2.1 of the License, or (at your + option) any later version. This software is distributed in the + hope that it will be useful, but WITHOUT ANY WARRANTY; without + even the implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU Lesser General Public License + for more details. You should have received a copy of the GNU + Lesser General Public License along with this software; if not, + write to the Free Software Foundation, Inc., 51 Franklin St, + Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: + http://www.fsf.org. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + 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> + + <parent> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>7</version> + </parent> + + <groupId>org.richfaces.ui.dist</groupId> + <artifactId>richfaces-ui-dist-parent</artifactId> + <version>4.0.0-SNAPSHOT</version> + <name>Richfaces UI Components: Parent</name> + <packaging>pom</packaging> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.richfaces.ui.dist</groupId> + <artifactId>richfaces-components-bom</artifactId> + <version>${project.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + </dependencies> + </dependencyManagement> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/di... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces/</url> + </scm> +</project> Modified: root/ui/dist/trunk/pom.xml =================================================================== --- root/ui/dist/trunk/pom.xml 2010-06-02 23:32:48 UTC (rev 17473) +++ root/ui/dist/trunk/pom.xml 2010-06-03 01:04:09 UTC (rev 17474) @@ -1,24 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - JBoss, Home of Professional Open Source Copyright 2010, Red Hat, - Inc. and individual contributors by the @authors tag. See the - copyright.txt in the distribution for a full listing of - individual contributors. This is free software; you can - redistribute it and/or modify it under the terms of the GNU - Lesser General Public License as published by the Free Software - Foundation; either version 2.1 of the License, or (at your - option) any later version. This software is distributed in the - hope that it will be useful, but WITHOUT ANY WARRANTY; without - even the implied warranty of MERCHANTABILITY or FITNESS FOR A - PARTICULAR PURPOSE. See the GNU Lesser General Public License - for more details. You should have received a copy of the GNU - Lesser General Public License along with this software; if not, - write to the Free Software Foundation, Inc., 51 Franklin St, - Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: - http://www.fsf.org. ---> + <!-- + JBoss, Home of Professional Open Source Copyright 2010, Red Hat, Inc. + and individual contributors by the @authors tag. See the copyright.txt + in the distribution for a full listing of individual contributors. This + is free software; you can redistribute it and/or modify it under the + terms of the GNU Lesser General Public License as published by the Free + Software Foundation; either version 2.1 of the License, or (at your + option) any later version. This software is distributed in the hope that + it will be useful, but WITHOUT ANY WARRANTY; without even the implied + warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. You should have + received a copy of the GNU Lesser General Public License along with this + software; if not, write to the Free Software Foundation, Inc., 51 + Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF + site: http://www.fsf.org. + --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 + 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> @@ -36,13 +34,13 @@ <name>Richfaces UI Assembler</name> <modules> - <module>bom</module> - <!-- aggregate modules --> + <module>bom</module> + <module>parent</module> <module>richfaces-components-api</module> <module>richfaces-components-impl</module> <module>richfaces-components-ui</module> </modules> - + <build> <pluginManagement> <plugins> @@ -89,7 +87,7 @@ </modules> </profile> </profiles> - + <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/di... <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... Modified: root/ui/dist/trunk/richfaces-components-api/pom.xml =================================================================== --- root/ui/dist/trunk/richfaces-components-api/pom.xml 2010-06-02 23:32:48 UTC (rev 17473) +++ root/ui/dist/trunk/richfaces-components-api/pom.xml 2010-06-03 01:04:09 UTC (rev 17474) @@ -25,9 +25,9 @@ <parent> <groupId>org.richfaces.ui.dist</groupId> - <artifactId>richfaces-ui-assembler</artifactId> + <artifactId>richfaces-ui-dist-parent</artifactId> <version>4.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui.dist</groupId> @@ -41,19 +41,6 @@ <faces-shade-transformers.version>1</faces-shade-transformers.version> </properties> - <dependencyManagement> - <!-- TODO these must be updated to follow release script property naming --> - <dependencies> - <dependency> - <groupId>org.richfaces.ui.iteration</groupId> - <artifactId>richfaces-ui-iteration-bom</artifactId> - <version>${project.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> <dependency> <groupId>org.richfaces.ui.iteration</groupId> Modified: root/ui/dist/trunk/richfaces-components-impl/pom.xml =================================================================== --- root/ui/dist/trunk/richfaces-components-impl/pom.xml 2010-06-02 23:32:48 UTC (rev 17473) +++ root/ui/dist/trunk/richfaces-components-impl/pom.xml 2010-06-03 01:04:09 UTC (rev 17474) @@ -25,9 +25,9 @@ <parent> <groupId>org.richfaces.ui.dist</groupId> - <artifactId>richfaces-ui-assembler</artifactId> + <artifactId>richfaces-ui-dist-parent</artifactId> <version>4.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui.dist</groupId> @@ -41,19 +41,6 @@ <faces-shade-transformers.version>1</faces-shade-transformers.version> </properties> - <dependencyManagement> - <dependencies> - <!-- TODO these must be updated to follow release script property naming --> - <dependency> - <groupId>org.richfaces.ui.iteration</groupId> - <artifactId>richfaces-ui-iteration-bom</artifactId> - <version>${project.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> <dependency> <groupId>org.richfaces.ui.iteration</groupId> @@ -63,7 +50,6 @@ <dependency> <groupId>org.richfaces.ui.dist</groupId> <artifactId>richfaces-components-api</artifactId> - <version>${project.version}</version> </dependency> <dependency> Modified: root/ui/dist/trunk/richfaces-components-ui/pom.xml =================================================================== --- root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-06-02 23:32:48 UTC (rev 17473) +++ root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-06-03 01:04:09 UTC (rev 17474) @@ -25,9 +25,9 @@ <parent> <groupId>org.richfaces.ui.dist</groupId> - <artifactId>richfaces-ui-assembler</artifactId> + <artifactId>richfaces-ui-dist-parent</artifactId> <version>4.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui.dist</groupId> @@ -41,33 +41,6 @@ <assembly.projects.group>org.richfaces.ui</assembly.projects.group> </properties> - <dependencyManagement> - <dependencies> - <!-- TODO these must be updated to follow release script property naming --> - <dependency> - <groupId>org.richfaces.ui.core</groupId> - <artifactId>richfaces-ui-core-bom</artifactId> - <version>${project.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - <dependency> - <groupId>org.richfaces.ui.misc</groupId> - <artifactId>richfaces-ui-misc-bom</artifactId> - <version>${project.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - <dependency> - <groupId>org.richfaces.ui.iteration</groupId> - <artifactId>richfaces-ui-iteration-bom</artifactId> - <version>${project.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> <!-- artifacts for aggregation --> <dependency> @@ -87,7 +60,6 @@ <dependency> <groupId>org.richfaces.ui.dist</groupId> <artifactId>richfaces-components-impl</artifactId> - <version>${project.version}</version> </dependency> <dependency>