[richfaces-svn-commits] JBoss Rich Faces SVN: r18970 - trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources.

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

Author: jbalunas at redhat.com
Date: 2010-08-25 10:22:10 -0400 (Wed, 25 Aug 2010)
New Revision: 18970

Modified:
   trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml
Log:
RF-9134, RF-9135 fixed dependencies for archetype

Modified: trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml
===================================================================
--- trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml	2010-08-25 13:09:52 UTC (rev 18969)
+++ trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml	2010-08-25 14:22:10 UTC (rev 18970)
@@ -1,6 +1,8 @@
+
 #set( $symbol_pound = '#' )
 #set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
+#set(
+$symbol_escape = '\' )
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -73,13 +75,26 @@
 
             <dependencies>
                 <dependency>
-                    <groupId>${jsf2.api.groupid}</groupId>
-                    <artifactId>${jsf2.api.artifactid}</artifactId>
+                    <groupId>org.richfaces.ui</groupId>
+                    <artifactId>richfaces-components-ui</artifactId>
+                    <!-- For JBoss AS 6 integration there is a conflict with
+                         guava, and google-collections.  So this is required
+                         until this is resolved. -->
+                    <exclusions>
+                        <exclusion>
+                            <artifactId>guava</artifactId>
+                            <groupId>com.google.guava</groupId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>com.sun.faces</groupId>
+                    <artifactId>jsf-api</artifactId>
                     <scope>provided</scope>
                 </dependency>
                 <dependency>
-                    <groupId>${jsf2.impl.groupid}</groupId>
-                    <artifactId>${jsf2.impl.artifactid}</artifactId>
+                    <groupId>com.sun.faces</groupId>
+                    <artifactId>jsf-impl</artifactId>
                     <scope>provided</scope>
                 </dependency>
                 <dependency>
@@ -128,7 +143,7 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.richfaces.ui</groupId>
+                <groupId>org.richfaces</groupId>
                 <artifactId>richfaces-bom</artifactId>
                 <version>${org.richfaces.bom.version}</version>
                 <scope>import</scope>
@@ -180,7 +195,10 @@
             <artifactId>ehcache</artifactId>
         </dependency>
 
-        <!-- simple logger binding: only messages of level INFO and higher are printed-->
+        <!--
+            simple logger binding: only messages of level INFO and
+            higher are printed
+        -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>