Return-Path: 
 <scm-return-45887-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 29652 invoked from network); 23 Mar 2011 07:32:12 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 23 Mar 2011 07:32:12 -0000
Received: (qmail 18948 invoked by uid 500); 23 Mar 2011 07:32:12 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 18890 invoked by uid 500); 23 Mar 2011 07:32:12 -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 18883 invoked by uid 99); 23 Mar 2011 07:32:12 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Mar 2011 07:32:12 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Wed, 23 Mar 2011 07:32:11 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 5A3AE238899C; Wed, 23 Mar 2011 07:31:50 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1084489 - in /geronimo/server/trunk:
 plugins/axis2/axis2/pom.xml plugins/axis2/pom.xml pom.xml
Date: Wed, 23 Mar 2011 07:31:50 -0000
To: scm@geronimo.apache.org
From: xuhaihong@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110323073150.5A3AE238899C@eris.apache.org>

Author: xuhaihong
Date: Wed Mar 23 07:31:49 2011
New Revision: 1084489

URL: http://svn.apache.org/viewvc?rev=1084489&view=rev
Log:
a. Update Axis2 version to 1.6.0
b. Update woden version to 1.0M9, we should not need to package woden-impl-dom now

Modified:
    geronimo/server/trunk/plugins/axis2/axis2/pom.xml
    geronimo/server/trunk/plugins/axis2/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/axis2/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/pom.xml?rev=1084489&r1=1084488&r2=1084489&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/pom.xml Wed Mar 23 07:31:49 2011
@@ -132,11 +132,16 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
+            <groupId>org.apache.woden</groupId>
             <artifactId>woden-impl-dom</artifactId>
         </dependency>
 
         <dependency>
+            <groupId>org.apache.woden</groupId>
+            <artifactId>woden-impl-commons</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
         </dependency>

Modified: geronimo/server/trunk/plugins/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/pom.xml?rev=1084489&r1=1084488&r2=1084489&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/pom.xml Wed Mar 23 07:31:49 2011
@@ -37,7 +37,8 @@
     </description>
     
     <properties>
-        <axis2Version>1.5.4</axis2Version>
+        <axis2Version>1.6.0</axis2Version>
+        <wodenVersion>1.0M9</wodenVersion>
     </properties>
     
     <modules>
@@ -87,7 +88,36 @@
                 <version>4.0.1_1</version>
             </dependency>
 
-        </dependencies>
+            <dependency>
+                <groupId>org.apache.woden</groupId>
+                <artifactId>woden-api</artifactId>
+                <version>${wodenVersion}</version>
+                <exclusions>
+                    <exclusion>
+            			<groupId>org.apache.ws.commons.schema</groupId>
+            			<artifactId>XmlSchema</artifactId>
+		            </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.woden</groupId>
+                <artifactId>woden-impl-dom</artifactId>
+                <version>${wodenVersion}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.woden</groupId>
+                <artifactId>woden-impl-commons</artifactId>
+                <version>${wodenVersion}</version>
+                <exclusions>
+                    <exclusion>
+            			<groupId>commons-logging</groupId>
+		                <artifactId>commons-logging</artifactId>
+		            </exclusion>
+                </exclusions>
+            </dependency>
+        </dependencies>        
     </dependencyManagement>
 
 </project>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1084489&r1=1084488&r2=1084489&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Mar 23 07:31:49 2011
@@ -1451,44 +1451,6 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.woden</groupId>
-                <artifactId>woden-api</artifactId>
-                <version>1.0M8</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.ant</groupId>
-                        <artifactId>ant</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xerces</groupId>
-                        <artifactId>xercesImpl</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xerces</groupId>
-                        <artifactId>xmlParserAPIs</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>wsdl4j</groupId>
-                        <artifactId>wsdl4j</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.codehaus.woodstox</groupId>
-                        <artifactId>wstx-asl</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.ws.commons.axiom</groupId>
-                        <artifactId>axiom-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.bundles</groupId>
-                <artifactId>woden-impl-dom</artifactId>
-                <version>1.0M8_1</version>
-            </dependency>
-
-            <dependency>
                 <groupId>jline</groupId>
                 <artifactId>jline</artifactId>
                 <version>0.9.94</version>