Author: Alex.Kolonitsky Date: 2010-05-18 10:57:32 -0400 (Tue, 18 May 2010) New Revision: 17098 Modified: root/build/parent/trunk/pom.xml root/commons/trunk/api/pom.xml root/commons/trunk/parent/pom.xml root/commons/trunk/pom.xml root/core/trunk/parent/pom.xml root/examples/repeater-demo/trunk/pom.xml root/pom.xml root/ui-sandbox/componentcontrol/trunk/pom.xml root/ui-sandbox/datascroller/trunk/parent/pom.xml root/ui-sandbox/datascroller/trunk/pom.xml root/ui-sandbox/datascroller/trunk/ui/pom.xml root/ui-sandbox/pom.xml root/ui-sandbox/tables/trunk/pom.xml root/ui/core/trunk/parent/pom.xml Log: correct bom/parent model Modified: root/build/parent/trunk/pom.xml =================================================================== --- root/build/parent/trunk/pom.xml 2010-05-18 14:13:33 UTC (rev 17097) +++ root/build/parent/trunk/pom.xml 2010-05-18 14:57:32 UTC (rev 17098) @@ -99,6 +99,39 @@ </pluginRepository> </pluginRepositories> + <dependencyManagement> + <dependencies> + <!-- Archetypes dependency --> + <dependency> + <groupId>org.apache.maven.archetype</groupId> + <artifactId>archetype-packaging</artifactId> + <version>2.0-alpha-4</version> + </dependency> + + <!-- tests --> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>htmlunit-client</artifactId> + <version>1.0.3</version> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-mock</artifactId> + <version>1.0.3</version> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-test-stage</artifactId> + <version>1.0.3</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.4</version> + </dependency> + </dependencies> + </dependencyManagement> + <!-- Build --> <build> <!-- Modified: root/commons/trunk/api/pom.xml =================================================================== --- root/commons/trunk/api/pom.xml 2010-05-18 14:13:33 UTC (rev 17097) +++ root/commons/trunk/api/pom.xml 2010-05-18 14:57:32 UTC (rev 17098) @@ -63,12 +63,12 @@ </dependency> </dependencies> -<!-- <build> + <build> <plugins> - &lt;!&ndash; Trigger checkstyle checking for this module &ndash;&gt; + <!-- Trigger checkstyle checking for this module --> <plugin> <artifactId>maven-checkstyle-plugin</artifactId> </plugin> </plugins> - </build>--> + </build> </project> \ No newline at end of file Modified: root/commons/trunk/parent/pom.xml =================================================================== --- root/commons/trunk/parent/pom.xml 2010-05-18 14:13:33 UTC (rev 17097) +++ root/commons/trunk/parent/pom.xml 2010-05-18 14:57:32 UTC (rev 17098) @@ -53,16 +53,6 @@ <!-- Test Dependencies --> <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.6</version> - </dependency> - <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> <version>2.5.2</version> Modified: root/commons/trunk/pom.xml =================================================================== --- root/commons/trunk/pom.xml 2010-05-18 14:13:33 UTC (rev 17097) +++ root/commons/trunk/pom.xml 2010-05-18 14:57:32 UTC (rev 17098) @@ -42,13 +42,5 @@ <module>parent</module> <module>api</module> </modules> - - <build> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - </plugins> - </build> </project> Modified: root/core/trunk/parent/pom.xml =================================================================== --- root/core/trunk/parent/pom.xml 2010-05-18 14:13:33 UTC (rev 17097) +++ root/core/trunk/parent/pom.xml 2010-05-18 14:57:32 UTC (rev 17098) @@ -52,21 +52,6 @@ </dependency> <!-- Test Dependencies --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.6</version> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <version>1.0.3</version> - </dependency> <!-- These dependencies are usually provided by org.jboss.test-jsf:htmlunit-client, but the latest 2.7 Modified: root/examples/repeater-demo/trunk/pom.xml =================================================================== --- root/examples/repeater-demo/trunk/pom.xml 2010-05-18 14:13:33 UTC (rev 17097) +++ root/examples/repeater-demo/trunk/pom.xml 2010-05-18 14:57:32 UTC (rev 17098) @@ -39,7 +39,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>3.8.1</version> <scope>test</scope> </dependency> </dependencies> Modified: root/pom.xml =================================================================== --- root/pom.xml 2010-05-18 14:13:33 UTC (rev 17097) +++ root/pom.xml 2010-05-18 14:57:32 UTC (rev 17098) @@ -30,8 +30,8 @@ <modules> <!-- These trunk settings, and this pom.xml will be removed --> <!-- Added bom, parent, for temp integration --> - <module>build/bom/trunk</module> - <module>build/parent/trunk</module> + <module>build/parent/trunk</module> + <module>build/bom/trunk</module> <module>build/resources/trunk/checkstyle</module> <module>commons/${commons.svn.dir}</module> <module>core/${core.svn.dir}</module> Modified: root/ui/core/trunk/parent/pom.xml =================================================================== --- root/ui/core/trunk/parent/pom.xml 2010-05-18 14:13:33 UTC (rev 17097) +++ root/ui/core/trunk/parent/pom.xml 2010-05-18 14:57:32 UTC (rev 17098) @@ -55,35 +55,6 @@ <artifactId>annotations</artifactId> <version>4.0.0-SNAPSHOT</version> </dependency> - - <!-- Archetypes dependency --> - <dependency> - <groupId>org.apache.maven.archetype</groupId> - <artifactId>archetype-packaging</artifactId> - <version>2.0-alpha-4</version> - </dependency> - - <!-- tests --> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-test-stage</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - </dependency> </dependencies> </dependencyManagement> Modified: root/ui-sandbox/componentcontrol/trunk/pom.xml =================================================================== --- root/ui-sandbox/componentcontrol/trunk/pom.xml 2010-05-18 14:13:33 UTC (rev 17097) +++ root/ui-sandbox/componentcontrol/trunk/pom.xml 2010-05-18 14:57:32 UTC (rev 17098) @@ -26,7 +26,7 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces.sandbox.ui</groupId> + <groupId>org.richfaces.ui-sandbox</groupId> <artifactId>components</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> Modified: root/ui-sandbox/datascroller/trunk/parent/pom.xml =================================================================== --- root/ui-sandbox/datascroller/trunk/parent/pom.xml 2010-05-18 14:13:33 UTC (rev 17097) +++ root/ui-sandbox/datascroller/trunk/parent/pom.xml 2010-05-18 14:57:32 UTC (rev 17098) @@ -55,35 +55,6 @@ <artifactId>annotations</artifactId> <version>4.0.0-SNAPSHOT</version> </dependency> - - <!-- Archetypes dependency --> - <dependency> - <groupId>org.apache.maven.archetype</groupId> - <artifactId>archetype-packaging</artifactId> - <version>2.0-alpha-4</version> - </dependency> - - <!-- tests --> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-test-stage</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - </dependency> </dependencies> </dependencyManagement> Modified: root/ui-sandbox/datascroller/trunk/pom.xml =================================================================== --- root/ui-sandbox/datascroller/trunk/pom.xml 2010-05-18 14:13:33 UTC (rev 17097) +++ root/ui-sandbox/datascroller/trunk/pom.xml 2010-05-18 14:57:32 UTC (rev 17098) @@ -26,7 +26,7 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces.sandbox.ui</groupId> + <groupId>org.richfaces.ui-sandbox</groupId> <artifactId>components</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> Modified: root/ui-sandbox/datascroller/trunk/ui/pom.xml =================================================================== --- root/ui-sandbox/datascroller/trunk/ui/pom.xml 2010-05-18 14:13:33 UTC (rev 17097) +++ root/ui-sandbox/datascroller/trunk/ui/pom.xml 2010-05-18 14:57:32 UTC (rev 17098) @@ -23,13 +23,14 @@ 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.ui-sandbox</groupId> <artifactId>datascroller-parent</artifactId> <version>4.0.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui-sandbox</groupId> <artifactId>datascroller-ui</artifactId> <name>Richfaces UI Components: Datascroller UI</name> Modified: root/ui-sandbox/pom.xml =================================================================== --- root/ui-sandbox/pom.xml 2010-05-18 14:13:33 UTC (rev 17097) +++ root/ui-sandbox/pom.xml 2010-05-18 14:57:32 UTC (rev 17098) @@ -29,7 +29,7 @@ <version>1-SNAPSHOT</version> </parent> - <groupId>org.richfaces.sandbox.ui</groupId> + <groupId>org.richfaces.ui-sandbox</groupId> <artifactId>components</artifactId> <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> @@ -48,35 +48,6 @@ <artifactId>annotations</artifactId> <version>4.0.0-SNAPSHOT</version> </dependency> - - <!-- Archetypes dependency --> - <dependency> - <groupId>org.apache.maven.archetype</groupId> - <artifactId>archetype-packaging</artifactId> - <version>2.0-alpha-4</version> - </dependency> - - <!-- tests --> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>htmlunit-client</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-test-stage</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - </dependency> </dependencies> </dependencyManagement> Modified: root/ui-sandbox/tables/trunk/pom.xml =================================================================== --- root/ui-sandbox/tables/trunk/pom.xml 2010-05-18 14:13:33 UTC (rev 17097) +++ root/ui-sandbox/tables/trunk/pom.xml 2010-05-18 14:57:32 UTC (rev 17098) @@ -24,7 +24,7 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces.sandbox.ui</groupId> + <groupId>org.richfaces.ui-sandbox</groupId> <artifactId>components</artifactId> <version>4.0.0-SNAPSHOT</version> </parent>