2:12 a.m.
Author: Alex.Kolonitsky
Date: 2010-05-15 03:12:11 -0400 (Sat, 15 May 2010)
New Revision: 17058
Modified:
root/ui/core/trunk/parent/pom.xml
root/ui/core/trunk/pom.xml
Log:
correct pom structure
Modified: root/ui/core/trunk/parent/pom.xml
===================================================================
--- root/ui/core/trunk/parent/pom.xml 2010-05-15 06:18:40 UTC (rev 17057)
+++ root/ui/core/trunk/parent/pom.xml 2010-05-15 07:12:11 UTC (rev 17058)
@@ -25,16 +25,65 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>core-bom</artifactId>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.richfaces.ui</groupId>
<artifactId>core-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
<name>Richfaces UI Components: Core Parent</name>
<packaging>pom</packaging>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>core-bom</artifactId>
+ <version>${project.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.richfaces.cdk</groupId>
+ <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>
+
+
<build>
<pluginManagement>
<plugins>
@@ -97,43 +146,4 @@
</plugins>
</build>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.richfaces.cdk</groupId>
- <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>
-
</project>
Modified: root/ui/core/trunk/pom.xml
===================================================================
--- root/ui/core/trunk/pom.xml 2010-05-15 06:18:40 UTC (rev 17057)
+++ root/ui/core/trunk/pom.xml 2010-05-15 07:12:11 UTC (rev 17058)
@@ -24,12 +24,24 @@
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+
<groupId>org.richfaces.ui</groupId>
<artifactId>core-aggregator</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Richfaces UI Components: Core Aggregator</name>
+ <modules>
+ <module>bom</module>
+ <module>parent</module>
+ <module>api</module>
+ </modules>
+
<build>
<plugins>
<plugin>
@@ -43,14 +55,6 @@
</plugins>
</build>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
-
<profiles>
<profile>
<id>release</id>
@@ -95,10 +99,4 @@
</profile>
</profiles>
- <modules>
- <module>bom</module>
- <module>parent</module>
- <module>api</module>
- </modules>
-
</project>
\ No newline at end of file