Author: Alex.Kolonitsky Date: 2010-05-19 08:35:46 -0400 (Wed, 19 May 2010) New Revision: 17120 Modified: root/examples-sandbox/trunk/pom.xml root/examples/pom.xml root/ui-sandbox/componentcontrol/trunk/bom/pom.xml root/ui-sandbox/componentcontrol/trunk/parent/pom.xml root/ui-sandbox/componentcontrol/trunk/pom.xml root/ui-sandbox/datascroller/trunk/bom/pom.xml root/ui-sandbox/datascroller/trunk/parent/pom.xml root/ui-sandbox/datascroller/trunk/pom.xml root/ui-sandbox/pom.xml root/ui-sandbox/tables/trunk/bom/pom.xml root/ui-sandbox/tables/trunk/parent/pom.xml root/ui-sandbox/tables/trunk/pom.xml root/ui-sandbox/tables/trunk/ui/pom.xml root/ui/core/trunk/bom/pom.xml root/ui/core/trunk/parent/pom.xml root/ui/core/trunk/pom.xml Log: correct bom/parent structure Modified: root/examples/pom.xml =================================================================== --- root/examples/pom.xml 2010-05-19 11:58:31 UTC (rev 17119) +++ root/examples/pom.xml 2010-05-19 12:35:46 UTC (rev 17120) @@ -26,7 +26,7 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-parent</artifactId> - <version>1-SNAPSHOT</version> + <version>1</version> </parent> <groupId>org.richfaces.examples</groupId> Modified: root/examples-sandbox/trunk/pom.xml =================================================================== --- root/examples-sandbox/trunk/pom.xml 2010-05-19 11:58:31 UTC (rev 17119) +++ root/examples-sandbox/trunk/pom.xml 2010-05-19 12:35:46 UTC (rev 17120) @@ -1,5 +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. +--> <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"> @@ -9,7 +26,7 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-parent</artifactId> - <version>1-SNAPSHOT</version> + <version>1</version> </parent> <groupId>org.richfaces</groupId> Modified: root/ui/core/trunk/bom/pom.xml =================================================================== --- root/ui/core/trunk/bom/pom.xml 2010-05-19 11:58:31 UTC (rev 17119) +++ root/ui/core/trunk/bom/pom.xml 2010-05-19 12:35:46 UTC (rev 17120) @@ -27,7 +27,7 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-parent</artifactId> - <version>1-SNAPSHOT</version> + <version>1</version> </parent> <groupId>org.richfaces.ui</groupId> Modified: root/ui/core/trunk/parent/pom.xml =================================================================== --- root/ui/core/trunk/parent/pom.xml 2010-05-19 11:58:31 UTC (rev 17119) +++ root/ui/core/trunk/parent/pom.xml 2010-05-19 12:35:46 UTC (rev 17120) @@ -25,9 +25,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces.ui</groupId> - <artifactId>core-aggregator</artifactId> - <version>4.0.0-SNAPSHOT</version> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>1</version> </parent> <groupId>org.richfaces.ui</groupId> @@ -36,10 +36,6 @@ <name>Richfaces UI Components: Core Parent</name> <packaging>pom</packaging> - <modules> - <module>../api</module> - </modules> - <dependencyManagement> <dependencies> <dependency> @@ -88,6 +84,14 @@ <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>1.0-beta-1</version> + <configuration> + <fail>false</fail> + </configuration> + </plugin> + <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> <configuration> Modified: root/ui/core/trunk/pom.xml =================================================================== --- root/ui/core/trunk/pom.xml 2010-05-19 11:58:31 UTC (rev 17119) +++ root/ui/core/trunk/pom.xml 2010-05-19 12:35:46 UTC (rev 17120) @@ -27,7 +27,7 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-parent</artifactId> - <version>1-SNAPSHOT</version> + <version>1</version> </parent> <groupId>org.richfaces.ui</groupId> @@ -39,6 +39,7 @@ <modules> <module>bom</module> <module>parent</module> + <module>api</module> </modules> <build> Modified: root/ui-sandbox/componentcontrol/trunk/bom/pom.xml =================================================================== --- root/ui-sandbox/componentcontrol/trunk/bom/pom.xml 2010-05-19 11:58:31 UTC (rev 17119) +++ root/ui-sandbox/componentcontrol/trunk/bom/pom.xml 2010-05-19 12:35:46 UTC (rev 17120) @@ -27,7 +27,7 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-parent</artifactId> - <version>1-SNAPSHOT</version> + <version>1</version> </parent> <groupId>org.richfaces.ui-sandbox</groupId> @@ -51,10 +51,10 @@ </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>core-api</artifactId> - <version>${richfaces.core.api.version}</version> - </dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>core-api</artifactId> + <version>${richfaces.core.api.version}</version> + </dependency> <dependency> <groupId>org.richfaces.ui-sandbox</groupId> <artifactId>component-control-api</artifactId> Modified: root/ui-sandbox/componentcontrol/trunk/parent/pom.xml =================================================================== --- root/ui-sandbox/componentcontrol/trunk/parent/pom.xml 2010-05-19 11:58:31 UTC (rev 17119) +++ root/ui-sandbox/componentcontrol/trunk/parent/pom.xml 2010-05-19 12:35:46 UTC (rev 17120) @@ -25,21 +25,17 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>component-control-aggregator</artifactId> - <version>4.0.0-SNAPSHOT</version> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>1</version> </parent> <groupId>org.richfaces.ui-sandbox</groupId> <artifactId>component-control-parent</artifactId> + <version>4.0.0-SNAPSHOT</version> <name>Richfaces UI Components: Component Control Parent Module</name> <packaging>pom</packaging> - <modules> - <!--module>../api</module--> - <module>../ui</module> - </modules> - <dependencyManagement> <dependencies> <dependency> Modified: root/ui-sandbox/componentcontrol/trunk/pom.xml =================================================================== --- root/ui-sandbox/componentcontrol/trunk/pom.xml 2010-05-19 11:58:31 UTC (rev 17119) +++ root/ui-sandbox/componentcontrol/trunk/pom.xml 2010-05-19 12:35:46 UTC (rev 17120) @@ -39,6 +39,8 @@ <modules> <module>bom</module> <module>parent</module> + <!--module>api</module--> + <module>ui</module> </modules> <build> Modified: root/ui-sandbox/datascroller/trunk/bom/pom.xml =================================================================== --- root/ui-sandbox/datascroller/trunk/bom/pom.xml 2010-05-19 11:58:31 UTC (rev 17119) +++ root/ui-sandbox/datascroller/trunk/bom/pom.xml 2010-05-19 12:35:46 UTC (rev 17120) @@ -27,7 +27,7 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-parent</artifactId> - <version>1-SNAPSHOT</version> + <version>1</version> </parent> <groupId>org.richfaces.ui-sandbox</groupId> Modified: root/ui-sandbox/datascroller/trunk/parent/pom.xml =================================================================== --- root/ui-sandbox/datascroller/trunk/parent/pom.xml 2010-05-19 11:58:31 UTC (rev 17119) +++ root/ui-sandbox/datascroller/trunk/parent/pom.xml 2010-05-19 12:35:46 UTC (rev 17120) @@ -25,21 +25,17 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>datascroller-aggregator</artifactId> - <version>4.0.0-SNAPSHOT</version> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>1</version> </parent> <groupId>org.richfaces.ui-sandbox</groupId> <artifactId>datascroller-parent</artifactId> + <version>4.0.0-SNAPSHOT</version> <name>Richfaces UI Components: Datascroller Parent Module</name> <packaging>pom</packaging> - <modules> - <module>../api</module> - <module>../ui</module> - </modules> - <dependencyManagement> <dependencies> <dependency> Modified: root/ui-sandbox/datascroller/trunk/pom.xml =================================================================== --- root/ui-sandbox/datascroller/trunk/pom.xml 2010-05-19 11:58:31 UTC (rev 17119) +++ root/ui-sandbox/datascroller/trunk/pom.xml 2010-05-19 12:35:46 UTC (rev 17120) @@ -39,6 +39,8 @@ <modules> <module>bom</module> <module>parent</module> + <module>api</module> + <module>ui</module> </modules> <build> Modified: root/ui-sandbox/pom.xml =================================================================== --- root/ui-sandbox/pom.xml 2010-05-19 11:58:31 UTC (rev 17119) +++ root/ui-sandbox/pom.xml 2010-05-19 12:35:46 UTC (rev 17120) @@ -26,7 +26,7 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-parent</artifactId> - <version>1-SNAPSHOT</version> + <version>1</version> </parent> <groupId>org.richfaces.ui-sandbox</groupId> Modified: root/ui-sandbox/tables/trunk/bom/pom.xml =================================================================== --- root/ui-sandbox/tables/trunk/bom/pom.xml 2010-05-19 11:58:31 UTC (rev 17119) +++ root/ui-sandbox/tables/trunk/bom/pom.xml 2010-05-19 12:35:46 UTC (rev 17120) @@ -27,7 +27,7 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-parent</artifactId> - <version>1-SNAPSHOT</version> + <version>1</version> </parent> <groupId>org.richfaces.ui-sandbox</groupId> Modified: root/ui-sandbox/tables/trunk/parent/pom.xml =================================================================== --- root/ui-sandbox/tables/trunk/parent/pom.xml 2010-05-19 11:58:31 UTC (rev 17119) +++ root/ui-sandbox/tables/trunk/parent/pom.xml 2010-05-19 12:35:46 UTC (rev 17120) @@ -25,22 +25,17 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces.ui-sandbox</groupId> - <artifactId>tables-aggregator</artifactId> - <version>4.0.0-SNAPSHOT</version> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>1</version> </parent> <groupId>org.richfaces.ui-sandbox</groupId> <artifactId>tables-parent</artifactId> + <version>4.0.0-SNAPSHOT</version> <name>Richfaces UI Components: Tables Parent</name> <packaging>pom</packaging> - <modules> - <module>../api</module> - <module>../impl</module> - <module>../ui</module> - </modules> - <dependencyManagement> <dependencies> <dependency> Modified: root/ui-sandbox/tables/trunk/pom.xml =================================================================== --- root/ui-sandbox/tables/trunk/pom.xml 2010-05-19 11:58:31 UTC (rev 17119) +++ root/ui-sandbox/tables/trunk/pom.xml 2010-05-19 12:35:46 UTC (rev 17120) @@ -37,7 +37,10 @@ <modules> <module>bom</module> <module>parent</module> - </modules> + <module>api</module> + <module>impl</module> + <module>ui</module> + </modules> <build> <plugins> Modified: root/ui-sandbox/tables/trunk/ui/pom.xml =================================================================== --- root/ui-sandbox/tables/trunk/ui/pom.xml 2010-05-19 11:58:31 UTC (rev 17119) +++ root/ui-sandbox/tables/trunk/ui/pom.xml 2010-05-19 12:35:46 UTC (rev 17120) @@ -39,6 +39,7 @@ <dependency> <groupId>org.richfaces.cdk</groupId> <artifactId>annotations</artifactId> + <version>4.0.0-SNAPSHOT</version> <scope>provided</scope> </dependency> @@ -107,5 +108,4 @@ <scope>test</scope> </dependency> </dependencies> - </project> \ No newline at end of file