geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From viol...@apache.org
Subject svn commit: r1197490 - in /geronimo/samples/trunk: pom.xml samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/pom.xml
Date Fri, 04 Nov 2011 10:25:21 GMT
Author: violalu
Date: Fri Nov  4 10:25:20 2011
New Revision: 1197490

URL: http://svn.apache.org/viewvc?rev=1197490&view=rev
Log:
update myfaces bundle name and version

Modified:
    geronimo/samples/trunk/pom.xml
    geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/pom.xml

Modified: geronimo/samples/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/pom.xml?rev=1197490&r1=1197489&r2=1197490&view=diff
==============================================================================
--- geronimo/samples/trunk/pom.xml (original)
+++ geronimo/samples/trunk/pom.xml Fri Nov  4 10:25:20 2011
@@ -160,6 +160,7 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            
             <!-- Import MyFaces dependency versions -->
             <dependency>
                 <groupId>org.apache.geronimo.plugins</groupId>
@@ -167,19 +168,47 @@
                 <version>${geronimoVersion}</version>
                 <type>pom</type>
                 <scope>import</scope>
-            </dependency>
+            </dependency> 
             
-            <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-api</artifactId>
-            <version>${myfacesVersion}</version>
-        </dependency>
-        
-         <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-bundle</artifactId>
-            <version>${myfacesVersion}</version>
-        </dependency>
+        <dependency>
+                <groupId>org.apache.geronimo.bundles</groupId>
+                <artifactId>myfaces-bundle</artifactId>
+                <version>${myfacesVersion}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.validation</groupId>
+                        <artifactId>validation-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.el</groupId>
+                        <artifactId>el-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-digester</groupId>
+                        <artifactId>commons-digester</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-discovery</groupId>
+                        <artifactId>commons-discovery</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-codec</groupId>
+                        <artifactId>commons-codec</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-beanutils</groupId>
+                        <artifactId>commons-beanutils</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
         
         <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/pom.xml?rev=1197490&r1=1197489&r2=1197490&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/pom.xml Fri Nov 
4 10:25:20 2011
@@ -274,7 +274,7 @@
             <version>1.3</version>
         </dependency>-->
         <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>myfaces-bundle</artifactId>
             <scope>provided</scope>        
         </dependency>



Mime
View raw message