geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r944558 - in /geronimo/server/trunk: ./ plugins/axis2/ plugins/axis2/axis2/ plugins/axis2/axis2/src/main/history/ plugins/axis2/geronimo-axis2/ plugins/cxf/cxf/ plugins/cxf/cxf/src/main/history/
Date Sat, 15 May 2010 04:48:18 GMT
Author: xuhaihong
Date: Sat May 15 04:48:18 2010
New Revision: 944558

URL: http://svn.apache.org/viewvc?rev=944558&view=rev
Log:
use Geronimo Axis2 and axiom-api bundle

Modified:
    geronimo/server/trunk/plugins/axis2/axis2/pom.xml
    geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml
    geronimo/server/trunk/plugins/axis2/pom.xml
    geronimo/server/trunk/plugins/cxf/cxf/pom.xml
    geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.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=944558&r1=944557&r2=944558&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/pom.xml Sat May 15 04:48:18 2010
@@ -92,29 +92,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-kernel</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-jaxws</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-metadata</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-saaj</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>addressing</artifactId>
-            <type>mar</type>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>axis2</artifactId>        
         </dependency>
 
         <dependency>
@@ -123,7 +102,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>axiom-api</artifactId>
         </dependency>
 
@@ -185,7 +164,32 @@
          <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.commons-io</artifactId>
-         </dependency>            
+         </dependency>
+         
+         <dependency>
+            <groupId>org.apache.woden</groupId>
+            <artifactId>woden-api</artifactId>
+         </dependency>
+         
+         <dependency>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>woodstox</artifactId>               
+         </dependency>
+
+         <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.2_spec</artifactId>         
+         </dependency>
+
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>   
           
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>          
 
+        </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml?rev=944558&r1=944557&r2=944558&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml Sat May 15
04:48:18 2010
@@ -12,38 +12,13 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.axis2</groupId>
-        <artifactId>addressing</artifactId>
-        <type>mar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-jaxws</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-kernel</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-metadata</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-saaj</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-transport-http</artifactId>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>axiom-api</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-transport-local</artifactId>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>axis2</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -147,11 +122,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>httpcore</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.neethi</groupId>
         <artifactId>neethi</artifactId>
         <type>jar</type>
@@ -188,11 +158,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.ws.commons.axiom</groupId>
-        <artifactId>axiom-api</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.ws.commons.axiom</groupId>
         <artifactId>axiom-dom</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml?rev=944558&r1=944557&r2=944558&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml Sat May 15 04:48:18 2010
@@ -70,22 +70,12 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-jaxws</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-kernel</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-metadata</artifactId>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>axis2</artifactId>        
         </dependency>
 
         <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>axiom-api</artifactId>
         </dependency>
 
@@ -118,16 +108,6 @@
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.commons-codec</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-transport-http</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-transport-local</artifactId>
-        </dependency>
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/plugins/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/pom.xml?rev=944558&r1=944557&r2=944558&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/pom.xml Sat May 15 04:48:18 2010
@@ -49,278 +49,10 @@
 
     <dependencyManagement>
         <dependencies>
-            <!--Axis2 modules dependencies-->
             <dependency>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-kernel</artifactId>
-                <version>${axis2Version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.mail</groupId>
-                        <artifactId>mail</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>servlet-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xalan</groupId>
-                        <artifactId>xalan</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-io</groupId>
-                        <artifactId>commons-io</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.woden</groupId>
-                        <artifactId>woden-impl-dom</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-fileupload</groupId>
-                        <artifactId>commons-fileupload</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-httpclient</groupId>
-                        <artifactId>commons-httpclient</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.geronimo.specs</groupId>
-                        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-jaxws</artifactId>
-                <version>${axis2Version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.mail</groupId>
-                        <artifactId>mail</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xalan</groupId>
-                        <artifactId>xalan</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-io</groupId>
-                        <artifactId>commons-io</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>jaxen</groupId>
-                        <artifactId>jaxen</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.sun.xml.bind</groupId>
-                        <artifactId>jaxb-xjc</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jaxb-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.sun.xml.bind</groupId>
-                        <artifactId>jaxb-impl</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xml-resolver</groupId>
-                        <artifactId>xml-resolver</artifactId>
-                    </exclusion>    
-                    <exclusion>
-                        <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-annotation_1.0_spec</artifactId>
-                    </exclusion>                    
-                    <exclusion>
-                        <groupId>org.codehaus.woodstox</groupId>
-                        <artifactId>wstx-asl</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-metadata</artifactId>
-                <version>${axis2Version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.mail</groupId>
-                        <artifactId>mail</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xalan</groupId>
-                        <artifactId>xalan</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-io</groupId>
-                        <artifactId>commons-io</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.sun.xml.bind</groupId>
-                        <artifactId>jaxb-xjc</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jaxb-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.sun.xml.bind</groupId>
-                        <artifactId>jaxb-impl</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>log4j</groupId>
-                        <artifactId>log4j</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xml-resolver</groupId>
-                        <artifactId>xml-resolver</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-jaxws_2.1_spec</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.codehaus.woodstox</groupId>
-                        <artifactId>wstx-asl</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-saaj</artifactId>
-                <version>${axis2Version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.mail</groupId>
-                        <artifactId>mail</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xalan</groupId>
-                        <artifactId>xalan</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-io</groupId>
-                        <artifactId>commons-io</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-saaj_1.3_spec</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.codehaus.woodstox</groupId>
-                        <artifactId>wstx-asl</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>addressing</artifactId>
-                <version>${axis2Version}</version>
-                <type>mar</type>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.mail</groupId>
-                        <artifactId>mail</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xalan</groupId>
-                        <artifactId>xalan</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-io</groupId>
-                        <artifactId>commons-io</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.codehaus.woodstox</groupId>
-                        <artifactId>wstx-asl</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-transport-http</artifactId>
-                <version>${axis2Version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.mail</groupId>
-                        <artifactId>mail</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xalan</groupId>
-                        <artifactId>xalan</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-io</groupId>
-                        <artifactId>commons-io</artifactId>
-                    </exclusion>                    
-                    <exclusion>
-                        <groupId>org.codehaus.woodstox</groupId>
-                        <artifactId>wstx-asl</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-transport-local</artifactId>
-                <version>${axis2Version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.mail</groupId>
-                        <artifactId>mail</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xalan</groupId>
-                        <artifactId>xalan</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-io</groupId>
-                         <artifactId>commons-io</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.codehaus.woodstox</groupId>
-                        <artifactId>wstx-asl</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>org.apache.geronimo.bundles</groupId>
+                <artifactId>axis2</artifactId>
+                <version>${axis2Version}_1-SNAPSHOT</version>
             </dependency>
 
             <dependency>

Modified: geronimo/server/trunk/plugins/cxf/cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf/pom.xml?rev=944558&r1=944557&r2=944558&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf/pom.xml Sat May 15 04:48:18 2010
@@ -73,7 +73,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>axiom-api</artifactId>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml?rev=944558&r1=944557&r2=944558&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml Sat May 15 04:48:18
2010
@@ -17,6 +17,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>axiom-api</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>transaction-1_6</artifactId>
         <type>car</type>
@@ -88,11 +93,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.ws.commons.axiom</groupId>
-        <artifactId>axiom-api</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.ws.commons.axiom</groupId>
         <artifactId>axiom-impl</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=944558&r1=944557&r2=944558&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Sat May 15 04:48:18 2010
@@ -303,17 +303,6 @@
                 <version>1.1.3</version>
             </dependency>
 
-
-            <!--
-            NOTE: The full source for this artifact is private due to Sun licensing issues.
-                  To view the generated XmlBeans source please see the -src artifact in the
repository:
-
-                  http://people.apache.org/repo/m2-snapshot-repository/org/apache/geronimo/schema
-
-                  The full source is here with restricted access:
-
-                  https://svn.apache.org/repos/tck/geronimo-tck/schema/geronimo-schema-jee_5/trunk
-            -->
             <dependency>
                 <groupId>org.apache.geronimo.schema</groupId>
                 <artifactId>geronimo-schema-jee_5</artifactId>
@@ -326,16 +315,6 @@
                 </exclusions>
             </dependency>
 
-            <!--
-            NOTE: The full source for this artifact is private due to Sun licensing issues.
-                  To view the generated XmlBeans source please see the -src artifact in the
repository:
-
-                  http://people.apache.org/repo/m2-snapshot-repository/org/apache/geronimo/schema
-
-                  The full source is here with restricted access:
-
-                  https://svn.apache.org/repos/tck/geronimo-tck/schema/geronimo-schema-j2ee_1.4/trunk
-            -->
             <dependency>
                 <groupId>org.apache.geronimo.schema</groupId>
                 <artifactId>geronimo-schema-j2ee_1.4</artifactId>
@@ -1386,47 +1365,9 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.ws.commons.axiom</groupId>
+                <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>axiom-api</artifactId>
-                <version>${axiomVersion}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>log4j</groupId>
-                        <artifactId>log4j</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.mail</groupId>
-                        <artifactId>mail</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>stax</groupId>
-                        <artifactId>stax-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xml-apis</groupId>
-                        <artifactId>xml-apis</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-javamail_1.4_spec</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>jaxen</groupId>
-                        <artifactId>jaxen</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.codehaus.woodstox</groupId>
-                        <artifactId>wstx-asl</artifactId>
-                    </exclusion>
-                </exclusions>
+                <version>${axiomVersion}_1-SNAPSHOT</version>               

             </dependency>
 
             <dependency>
@@ -1462,6 +1403,10 @@
                         <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>
 
@@ -1498,6 +1443,10 @@
                         <groupId>org.apache.geronimo.specs</groupId>
                         <artifactId>geronimo-stax-api_1.0_spec</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.ws.commons.axiom</groupId>
+                        <artifactId>axiom-api</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 
@@ -1607,8 +1556,16 @@
                         <artifactId>xmlParserAPIs</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>wsdl</groupId>
-                        <artifactId>wsdl</artifactId>
+                        <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>



Mime
View raw message