Author: Alex.Kolonitsky Date: 2010-06-03 07:41:40 -0400 (Thu, 03 Jun 2010) New Revision: 17475 Modified: root/archetypes/richfaces-archetype-simpleapp/trunk/src/main/resources/archetype-resources/pom.xml root/cdk/trunk/pom.xml root/dist/trunk/pom.xml root/examples/core-demo/trunk/pom.xml root/examples/iteration-demo/trunk/pom.xml root/examples/misc-demo/trunk/pom.xml root/examples/repeater-demo/trunk/pom.xml root/examples/richfaces-showcase/trunk/pom.xml root/pom.xml root/ui/dist/trunk/richfaces-components-api/pom.xml root/ui/dist/trunk/richfaces-components-impl/pom.xml Log: fix build Modified: root/archetypes/richfaces-archetype-simpleapp/trunk/src/main/resources/archetype-resources/pom.xml =================================================================== --- root/archetypes/richfaces-archetype-simpleapp/trunk/src/main/resources/archetype-resources/pom.xml 2010-06-03 01:04:09 UTC (rev 17474) +++ root/archetypes/richfaces-archetype-simpleapp/trunk/src/main/resources/archetype-resources/pom.xml 2010-06-03 11:41:40 UTC (rev 17475) @@ -127,7 +127,7 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.dist</groupId> <artifactId>richfaces-components-bom</artifactId> <version>4.0.0-SNAPSHOT</version> <scope>import</scope> @@ -138,7 +138,7 @@ <dependencies> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.dist</groupId> <artifactId>richfaces-components-ui</artifactId> </dependency> Modified: root/cdk/trunk/pom.xml =================================================================== --- root/cdk/trunk/pom.xml 2010-06-03 01:04:09 UTC (rev 17474) +++ root/cdk/trunk/pom.xml 2010-06-03 11:41:40 UTC (rev 17475) @@ -70,7 +70,7 @@ <configuration> <skip>true</skip> </configuration> - </plugin> + </plugin> </plugins> </build> Modified: root/dist/trunk/pom.xml =================================================================== --- root/dist/trunk/pom.xml 2010-06-03 01:04:09 UTC (rev 17474) +++ root/dist/trunk/pom.xml 2010-06-03 11:41:40 UTC (rev 17475) @@ -37,17 +37,17 @@ <dependencies> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.dist</groupId> <artifactId>richfaces-components-api</artifactId> <version>4.0.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.dist</groupId> <artifactId>richfaces-components-impl</artifactId> <version>4.0.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.dist</groupId> <artifactId>richfaces-components-ui</artifactId> <version>4.0.0-SNAPSHOT</version> </dependency> @@ -102,7 +102,7 @@ <plugin> <artifactId>maven-dependency-plugin</artifactId> <configuration> - <includeGroupIds>org.richfaces.core,org.richfaces.commons,org.richfaces.ui</includeGroupIds> + <includeGroupIds>org.richfaces.core,org.richfaces.commons,org.richfaces.ui.dist</includeGroupIds> </configuration> <executions> <execution> Modified: root/examples/core-demo/trunk/pom.xml =================================================================== --- root/examples/core-demo/trunk/pom.xml 2010-06-03 01:04:09 UTC (rev 17474) +++ root/examples/core-demo/trunk/pom.xml 2010-06-03 11:41:40 UTC (rev 17475) @@ -46,21 +46,13 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.richfaces.ui</groupId> + <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</groupId> - <artifactId>richfaces-ui-misc-bom</artifactId> - <version>${project.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - <!-- simple logger binding: only messages of level INFO and higher are printed--> <dependency> <groupId>org.slf4j</groupId> @@ -106,7 +98,7 @@ <artifactId>jstl</artifactId> </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.core</groupId> <artifactId>richfaces-ui-core-ui</artifactId> </dependency> @@ -274,4 +266,4 @@ </snapshots> </repository> </repositories> -</project> \ No newline at end of file +</project> Modified: root/examples/iteration-demo/trunk/pom.xml =================================================================== --- root/examples/iteration-demo/trunk/pom.xml 2010-06-03 01:04:09 UTC (rev 17474) +++ root/examples/iteration-demo/trunk/pom.xml 2010-06-03 11:41:40 UTC (rev 17475) @@ -46,21 +46,7 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-core-bom</artifactId> - <version>${project.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-misc-bom</artifactId> - <version>${project.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-bom</artifactId> <version>${project.version}</version> <scope>import</scope> @@ -85,15 +71,15 @@ <dependencies> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-api</artifactId> </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-ui</artifactId> </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-impl</artifactId> </dependency> @@ -227,4 +213,4 @@ </snapshots> </repository> </repositories> -</project> \ No newline at end of file +</project> Modified: root/examples/misc-demo/trunk/pom.xml =================================================================== --- root/examples/misc-demo/trunk/pom.xml 2010-06-03 01:04:09 UTC (rev 17474) +++ root/examples/misc-demo/trunk/pom.xml 2010-06-03 11:41:40 UTC (rev 17475) @@ -46,15 +46,7 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-core-bom</artifactId> - <version>${project.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - - <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.misc</groupId> <artifactId>richfaces-ui-misc-bom</artifactId> <version>${project.version}</version> <scope>import</scope> @@ -79,7 +71,7 @@ <dependencies> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.misc</groupId> <artifactId>richfaces-ui-misc-ui</artifactId> </dependency> @@ -203,4 +195,4 @@ </snapshots> </repository> </repositories> -</project> \ No newline at end of file +</project> Modified: root/examples/repeater-demo/trunk/pom.xml =================================================================== --- root/examples/repeater-demo/trunk/pom.xml 2010-06-03 01:04:09 UTC (rev 17474) +++ root/examples/repeater-demo/trunk/pom.xml 2010-06-03 11:41:40 UTC (rev 17475) @@ -47,21 +47,13 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-core-bom</artifactId> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-bom</artifactId> <version>${project.version}</version> <scope>import</scope> <type>pom</type> </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-misc-bom</artifactId> - <version>${project.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - <!-- simple logger binding: only messages of level INFO and higher are printed--> <dependency> <groupId>org.slf4j</groupId> @@ -190,4 +182,4 @@ </snapshots> </repository> </repositories> -</project> \ No newline at end of file +</project> Modified: root/examples/richfaces-showcase/trunk/pom.xml =================================================================== --- root/examples/richfaces-showcase/trunk/pom.xml 2010-06-03 01:04:09 UTC (rev 17474) +++ root/examples/richfaces-showcase/trunk/pom.xml 2010-06-03 11:41:40 UTC (rev 17475) @@ -29,7 +29,7 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.dist</groupId> <artifactId>richfaces-components-bom</artifactId> <version>${project.version}</version> <scope>import</scope> @@ -40,7 +40,7 @@ <dependencies> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.dist</groupId> <artifactId>richfaces-components-ui</artifactId> </dependency> <dependency> Modified: root/pom.xml =================================================================== --- root/pom.xml 2010-06-03 01:04:09 UTC (rev 17474) +++ root/pom.xml 2010-06-03 11:41:40 UTC (rev 17475) @@ -14,13 +14,13 @@ <modules> <!-- These trunk settings, and this pom.xml will be removed --> <!-- Added bom, parent, for temp integration --> - <module>build/parent/tags/richfaces-parent-5</module> - <module>build/bom/trunk</module> + <!--<module>build/parent/tags/richfaces-parent-5</module>--> + <!--<module>build/bom/trunk</module>--> <!--<module>build/resources/trunk/checkstyle</module>--> - <module>build/resources/trunk/faces-shade-transformers</module> + <!--<module>build/resources/trunk/faces-shade-transformers</module>--> + <module>cdk/trunk</module> <module>commons/trunk</module> <module>core/trunk</module> - <module>cdk/trunk</module> <!-- richfaces ui --> <module>ui/core/trunk</module> @@ -31,7 +31,7 @@ <!--<module>ui-sandbox</module>--> <module>examples</module> <!--<module>doc/${doc.svn.dir}</module>--> - <module>archetypes</module> + <!--<module>archetypes</module>--> </modules> <profiles> Modified: root/ui/dist/trunk/richfaces-components-api/pom.xml =================================================================== --- root/ui/dist/trunk/richfaces-components-api/pom.xml 2010-06-03 01:04:09 UTC (rev 17474) +++ root/ui/dist/trunk/richfaces-components-api/pom.xml 2010-06-03 11:41:40 UTC (rev 17475) @@ -146,7 +146,7 @@ <configuration> <classifier>sources</classifier> - <includeGroupIds>${assembly.projects.group}.core, ${assembly.projects.group}.misc, ${assembly.projects.group}.iteration</includeGroupIds> + <includeGroupIds>org.richfaces.ui.iteration</includeGroupIds> <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact> <excludeTransitive>true</excludeTransitive> </configuration> Modified: root/ui/dist/trunk/richfaces-components-impl/pom.xml =================================================================== --- root/ui/dist/trunk/richfaces-components-impl/pom.xml 2010-06-03 01:04:09 UTC (rev 17474) +++ root/ui/dist/trunk/richfaces-components-impl/pom.xml 2010-06-03 11:41:40 UTC (rev 17475) @@ -180,7 +180,7 @@ <configuration> <classifier>sources</classifier> - <includeGroupIds>${assembly.projects.group}.core, ${assembly.projects.group}.misc, ${assembly.projects.group}.iteration</includeGroupIds> + <includeGroupIds>org.richfaces.ui.iteration</includeGroupIds> <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact> <excludeTransitive>true</excludeTransitive> </configuration>