[richfaces-svn-commits] JBoss Rich Faces SVN: r18792 - in branches/RF-9112/cdk: generator and 1 other directories.

[richfaces-svn-commits at lists.jboss.org]

Author: jbalunas at redhat.com
Date: 2010-08-18 21:31:22 -0400 (Wed, 18 Aug 2010)
New Revision: 18792

Modified:
   branches/RF-9112/cdk/annotations/pom.xml
   branches/RF-9112/cdk/generator/pom.xml
   branches/RF-9112/cdk/parent/pom.xml
Log:
RF-9112 updates to build so that bootstrap works.  Note offline mode does not because richface-root aggregator must have access to richfaces-parent

Modified: branches/RF-9112/cdk/annotations/pom.xml
===================================================================
--- branches/RF-9112/cdk/annotations/pom.xml	2010-08-19 00:48:15 UTC (rev 18791)
+++ branches/RF-9112/cdk/annotations/pom.xml	2010-08-19 01:31:22 UTC (rev 18792)
@@ -13,9 +13,5 @@
   <description>That project contains annotations for JSF classes</description>
   <name>annotations</name>
   <dependencies>
-		<dependency>
-            <groupId>${jsf2.api.groupid}</groupId>
-            <artifactId>${jsf2.api.artifactid}</artifactId>
-        </dependency>
   </dependencies>
 </project>

Modified: branches/RF-9112/cdk/generator/pom.xml
===================================================================
--- branches/RF-9112/cdk/generator/pom.xml	2010-08-19 00:48:15 UTC (rev 18791)
+++ branches/RF-9112/cdk/generator/pom.xml	2010-08-19 01:31:22 UTC (rev 18792)
@@ -124,9 +124,15 @@
 			<groupId>com.sun.xml.bind</groupId>
 			<artifactId>jaxb-impl</artifactId>
 		</dependency>
-		<dependency>
-            <groupId>${jsf2.api.groupid}</groupId>
-            <artifactId>${jsf2.api.artifactid}</artifactId>
+        <dependency>
+           <!-- This must not be inherited from parent/bom it must be set to
+                not be "provided" even though it is provided by container
+                this is building a maven plugin that runs outside of container
+                TODO A better place for this may be needed, cdk-parent/cdk-bom?
+           -->
+           <groupId>com.sun.faces</groupId>
+           <artifactId>jsf-api</artifactId>
+           <version>2.0.2</version>
         </dependency>
 		<dependency>
 			<groupId>javax.servlet.jsp</groupId>

Modified: branches/RF-9112/cdk/parent/pom.xml
===================================================================
--- branches/RF-9112/cdk/parent/pom.xml	2010-08-19 00:48:15 UTC (rev 18791)
+++ branches/RF-9112/cdk/parent/pom.xml	2010-08-19 01:31:22 UTC (rev 18792)
@@ -5,8 +5,8 @@
 
 	<parent>
 		<groupId>org.richfaces</groupId>
-		<artifactId>richfaces-parent</artifactId>
-		<version>9</version>
+		<artifactId>richfaces-bom</artifactId>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,6 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<richfaces.checkstyle.version>1</richfaces.checkstyle.version>
 	</properties>
 	<scm>
 		<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/cdk/parent</connection>
@@ -146,12 +145,6 @@
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>${jsf2.api.groupid}</groupId>
-				<artifactId>${jsf2.api.artifactid}</artifactId>
-				<version>${jsf2.api.version}</version>
-			</dependency>
-
-			<dependency>
 				<groupId>javax.servlet.jsp</groupId>
 				<artifactId>jsp-api</artifactId>
 				<version>2.1</version>