7:48 p.m.
Author: jbalunas(a)redhat.com
Date: 2010-05-11 20:48:53 -0400 (Tue, 11 May 2010)
New Revision: 16998
Modified:
root/build/bom/trunk/pom.xml
root/build/parent/trunk/pom.xml
Log:
Coding in progress. Updates for core build integration with new structure.
Modified: root/build/bom/trunk/pom.xml
===================================================================
--- root/build/bom/trunk/pom.xml 2010-05-12 00:07:47 UTC (rev 16997)
+++ root/build/bom/trunk/pom.xml 2010-05-12 00:48:53 UTC (rev 16998)
@@ -1,3 +1,4 @@
+
<!--
JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
Inc. and individual contributors by the @authors tag. See the
@@ -40,16 +41,12 @@
<properties>
<!-- RichFaces Modules Versions -->
+
<richfaces.commons.version>4.0.0-SNAPSHOT</richfaces.commons.version>
<richfaces.core.version>4.0.0-SNAPSHOT</richfaces.core.version>
-
<richfaces.commons.version>4.0.0-SNAPSHOT</richfaces.commons.version>
<richfaces.ui.core.version>4.0.0-SNAPSHOT</richfaces.ui.core.version>
<richfaces.ui.input.version>4.0.0-SNAPSHOT</richfaces.ui.input.version>
<richfaces.ui.output.version>4.0.0-SNAPSHOT</richfaces.ui.output.version>
<richfaces.ui.iteration.version>4.0.0-SNAPSHOT</richfaces.ui.iteration.version>
- <!--
- cdk is not really a runtime dependency for RichFaces
- <richfaces.cdk.version>4.0.0-SNAPSHOT</richfaces.cdk.version>
- -->
</properties>
<!-- Runtime dependency management -->
@@ -57,15 +54,21 @@
<dependencies>
<!-- RichFaces -->
<dependency>
+ <groupId>org.richfaces.commons</groupId>
+ <artifactId>richfaces-commons-api</artifactId>
+ <version>${richfaces.commons.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.richfaces.core</groupId>
- <artifactId>core</artifactId>
+ <artifactId>richfaces-core-api</artifactId>
<version>${richfaces.core.version}</version>
</dependency>
<dependency>
- <groupId>org.richfaces.commons</groupId>
- <artifactId>commons</artifactId>
- <version>${richfaces.commons.version}</version>
+ <groupId>org.richfaces.core</groupId>
+ <artifactId>richfaces-core-impl</artifactId>
+ <version>${richfaces.core.version}</version>
</dependency>
<dependency>
@@ -92,14 +95,6 @@
<version>${richfaces.ui.iteration.version}</version>
</dependency>
- <!--
- cdk is not really a runtime dependency for RichFaces
- <dependency> <groupId>org.richfaces</groupId>
- <artifactId>cdk</artifactId>
- <version>${richfaces.cdk.version}</version>
- </dependency>
- -->
-
<!-- JSF 2 -->
<dependency>
<groupId>com.sun.faces</groupId>
@@ -118,6 +113,33 @@
<artifactId>el-api</artifactId>
<version>1.0</version>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ </dependency>
+
+ <!-- Logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.8</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: root/build/parent/trunk/pom.xml
===================================================================
--- root/build/parent/trunk/pom.xml 2010-05-12 00:07:47 UTC (rev 16997)
+++ root/build/parent/trunk/pom.xml 2010-05-12 00:48:53 UTC (rev 16998)
@@ -225,6 +225,44 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>clover</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.atlassian.maven.plugins</groupId>
+ <artifactId>maven-clover2-plugin</artifactId>
+ <configuration>
+ <licenseLocation>
+ ${clover.license.path}
+ </licenseLocation>
+ <jdk>1.5</jdk>
+ <generatePdf>false</generatePdf>
+ <generateXml>true</generateXml>
+ <generateHtml>true</generateHtml>
+ </configuration>
+ <executions>
+ <execution>
+ <id>instrument</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>instrument</goal>
+ <goal>check</goal>
+ <goal>clover</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>hudson</id>
+ <properties>
+
<clover.license.path>/home/hudson/config_repository/resources/richfaces/richfaces-clover-license.txt
+ </clover.license.path>
+ </properties>
+ </profile>
</profiles>
<!-- SCM and distribution management -->