[richfaces-svn-commits] JBoss Rich Faces SVN: r18555 - 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-11 10:49:02 -0400 (Wed, 11 Aug 2010)
New Revision: 18555

Modified:
   modules/tests/metamer/trunk/application/pom.xml
   modules/tests/metamer/trunk/pom.xml
Log:
* unnecessary dependencies removed from root pom.xml
* profile for glassfish 3 removed from application's pom.xml
* Mojarra exluded from dependencies in application's pom.xml so that Myfaces can be used



Modified: modules/tests/metamer/trunk/application/pom.xml
===================================================================
--- modules/tests/metamer/trunk/application/pom.xml	2010-08-11 14:40:55 UTC (rev 18554)
+++ modules/tests/metamer/trunk/application/pom.xml	2010-08-11 14:49:02 UTC (rev 18555)
@@ -44,20 +44,21 @@
         <dependency>
             <groupId>org.richfaces.ui</groupId>
             <artifactId>richfaces-components-ui</artifactId>
+            <!-- Mojarra has to be excluded because we want to be able to create also
+            binaries with MyFaces
+            see https://jira.jboss.org/browse/RFPL-719 -->
+            <exclusions>
+                <exclusion>
+                    <groupId>com.sun.faces</groupId>
+                    <artifactId>jsf-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.sun.faces</groupId>
+                    <artifactId>jsf-impl</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.richfaces.ui.iteration</groupId>
-            <artifactId>richfaces-ui-iteration-ui</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.richfaces.ui.output</groupId>
-            <artifactId>richfaces-ui-output-ui</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.richfaces.ui.misc</groupId>
-            <artifactId>richfaces-ui-misc-ui</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.richfaces.cdk</groupId>
             <artifactId>annotations</artifactId>
         </dependency>
@@ -287,64 +288,8 @@
                     <artifactId>el-api</artifactId>
                     <scope>provided</scope>
                 </dependency>
-
-                <dependency>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                    <version>1.2.16</version>
-                    <scope>provided</scope>
-                </dependency>
             </dependencies>
         </profile>
-        <profile>
-            <id>glassfish3</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-war-plugin</artifactId>
-                        <configuration>
-                            <webappDirectory>${project.build.directory}/${project.build.finalName}-glassfish3
-                            </webappDirectory>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-
-            <dependencies>
-                <dependency>
-                    <groupId>${jsf2.api.groupid}</groupId>
-                    <artifactId>${jsf2.api.artifactid}</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${jsf2.impl.groupid}</groupId>
-                    <artifactId>${jsf2.impl.artifactid}</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>javax.transaction</groupId>
-                    <artifactId>jta</artifactId>
-                    <version>1.1</version>
-                    <scope>provided</scope>
-                </dependency>
-
-                <dependency>
-                    <groupId>javax.el</groupId>
-                    <artifactId>el-api</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
     </profiles>
 </project>
 

Modified: modules/tests/metamer/trunk/pom.xml
===================================================================
--- modules/tests/metamer/trunk/pom.xml	2010-08-11 14:40:55 UTC (rev 18554)
+++ modules/tests/metamer/trunk/pom.xml	2010-08-11 14:49:02 UTC (rev 18555)
@@ -107,27 +107,12 @@
             </dependency>
             <dependency>
                 <groupId>org.richfaces.ui</groupId>
-                <artifactId>richfaces-components-bom</artifactId>
+                <artifactId>richfaces-ui-parent</artifactId>
                 <version>${version.richfaces}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
             <dependency>
-                <groupId>org.richfaces.ui.iteration</groupId>
-                <artifactId>richfaces-ui-iteration-bom</artifactId>
-                <version>${version.richfaces}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            
-            <dependency>
-                <groupId>org.richfaces.ui.output</groupId>
-                <artifactId>richfaces-ui-output-bom</artifactId>
-                <version>${version.richfaces}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            <dependency>
                 <groupId>org.richfaces.cdk</groupId>
                 <artifactId>annotations</artifactId>
                 <version>${version.richfaces}</version>