[richfaces-svn-commits] JBoss Rich Faces SVN: r18930 - in modules/tests/metamer/trunk: application and 1 other directory.

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

Author: ppitonak at redhat.com
Date: 2010-08-23 11:12:52 -0400 (Mon, 23 Aug 2010)
New Revision: 18930

Modified:
   modules/tests/metamer/trunk/application/pom.xml
   modules/tests/metamer/trunk/pom.xml
Log:
* project refactored to use richfaces-parent 10 (indirectly)


Modified: modules/tests/metamer/trunk/application/pom.xml
===================================================================
--- modules/tests/metamer/trunk/application/pom.xml	2010-08-23 15:08:36 UTC (rev 18929)
+++ modules/tests/metamer/trunk/application/pom.xml	2010-08-23 15:12:52 UTC (rev 18930)
@@ -54,17 +54,7 @@
             <artifactId>annotations</artifactId>
         </dependency>
 
-        <!-- Java Server Faces 2 -->
         <dependency>
-            <groupId>${jsf2.api.groupid}</groupId>
-            <artifactId>${jsf2.api.artifactid}</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${jsf2.impl.groupid}</groupId>
-            <artifactId>${jsf2.impl.artifactid}</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
             <scope>provided</scope>
@@ -79,15 +69,15 @@
             <artifactId>jstl</artifactId>
         </dependency>
 
-        <!-- Logging -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
+        </dependency><dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-        </dependency>
+        </dependency><!-- Logging -->
+
+
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
@@ -136,7 +126,6 @@
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.18</version>
                 <configuration>
                     <scanIntervalSeconds>10</scanIntervalSeconds>
                     <connectors>
@@ -258,13 +247,13 @@
 
             <dependencies>
                 <dependency>
-                    <groupId>${jsf2.api.groupid}</groupId>
-                    <artifactId>${jsf2.api.artifactid}</artifactId>
+                    <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>

Modified: modules/tests/metamer/trunk/pom.xml
===================================================================
--- modules/tests/metamer/trunk/pom.xml	2010-08-23 15:08:36 UTC (rev 18929)
+++ modules/tests/metamer/trunk/pom.xml	2010-08-23 15:12:52 UTC (rev 18930)
@@ -24,9 +24,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.richfaces</groupId>
-        <artifactId>richfaces-parent</artifactId>
-        <version>9</version>
+        <groupId>org.richfaces.examples</groupId>
+        <artifactId>richfaces-example-parent</artifactId>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.richfaces.tests</groupId>
@@ -94,13 +94,21 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <richfaces.checkstyle.version>1</richfaces.checkstyle.version>
+        <richfaces.checkstyle.version>2</richfaces.checkstyle.version>
         <version.richfaces>4.0.0-SNAPSHOT</version.richfaces>
     </properties>
 
     <dependencyManagement>
         <dependencies>
             <dependency>
+                <groupId>org.richfaces</groupId>
+                <artifactId>richfaces-bom</artifactId>
+                <version>${project.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+            
+            <dependency>
                 <groupId>javax.el</groupId>
                 <artifactId>el-api</artifactId>
                 <version>2.2</version>