Return-Path: 
 <scm-return-44714-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 85056 invoked from network); 26 Nov 2010 18:35:27 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 26 Nov 2010 18:35:27 -0000
Received: (qmail 15995 invoked by uid 500); 26 Nov 2010 18:35:27 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 15942 invoked by uid 500); 26 Nov 2010 18:35:26 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 15935 invoked by uid 99); 26 Nov 2010 18:35:26 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Nov 2010 18:35:26 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Nov 2010 18:35:25 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 8435223888E7; Fri, 26 Nov 2010 18:33:54 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1039498 - in /geronimo/server/trunk/plugins:
 myfaces/geronimo-myfaces/pom.xml myfaces/myfaces/pom.xml myfaces/pom.xml
 openwebbeans/geronimo-openwebbeans/pom.xml
Date: Fri, 26 Nov 2010 18:33:54 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101126183354.8435223888E7@eris.apache.org>

Author: djencks
Date: Fri Nov 26 18:33:54 2010
New Revision: 1039498

URL: http://svn.apache.org/viewvc?rev=1039498&view=rev
Log:
GERONIMO-5713, MYFACES-2976 use myfaces 2.0.3-SNAPSHOT myfaces-bundle all-in-one packaging

Modified:
    geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/pom.xml
    geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml
    geronimo/server/trunk/plugins/myfaces/pom.xml
    geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml

Modified: geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/pom.xml?rev=1039498&r1=1039497&r2=1039498&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/pom.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/pom.xml Fri Nov 26 18:33:54 2010
@@ -60,7 +60,7 @@
         
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-impl</artifactId>
+            <artifactId>myfaces-bundle</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml?rev=1039498&r1=1039497&r2=1039498&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml Fri Nov 26 18:33:54 2010
@@ -72,7 +72,7 @@
 
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-api</artifactId>
+            <artifactId>myfaces-bundle</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/pom.xml?rev=1039498&r1=1039497&r2=1039498&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/pom.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/pom.xml Fri Nov 26 18:33:54 2010
@@ -34,7 +34,7 @@
     </description>
 
     <properties>
-        <myfacesVersion>2.0.2</myfacesVersion>
+        <myfacesVersion>2.0.3-SNAPSHOT</myfacesVersion>
     </properties>
     
     <modules>
@@ -66,7 +66,7 @@
         <dependencies>
             <dependency>
                 <groupId>org.apache.myfaces.core</groupId>
-                <artifactId>myfaces-api</artifactId>
+                <artifactId>myfaces-bundle</artifactId>
                 <version>${myfacesVersion}</version>
                 <exclusions>
                     <exclusion>
@@ -81,14 +81,6 @@
                         <groupId>javax.el</groupId>
                         <artifactId>el-api</artifactId>
                     </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.myfaces.core</groupId>
-                <artifactId>myfaces-impl</artifactId>
-                <version>${myfacesVersion}</version>
-                <exclusions>
                     <exclusion>
                         <groupId>commons-logging</groupId>
                         <artifactId>commons-logging</artifactId>
@@ -111,8 +103,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-
-            
         </dependencies>
     </dependencyManagement>
                 

Modified: geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml?rev=1039498&r1=1039497&r2=1039498&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml (original)
+++ geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml Fri Nov 26 18:33:54 2010
@@ -104,12 +104,7 @@
 
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-impl</artifactId>
+            <artifactId>myfaces-bundle</artifactId>
         </dependency>
 
         <dependency>
@@ -184,11 +179,6 @@
 
         <dependency>
             <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-osgi</artifactId>        
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
             <artifactId>openwebbeans-resource</artifactId>
         </dependency>