[jbossws-commits] JBossWS SVN: r11239 - in stack/cxf/branches/jbossws-cxf-3.1.2: modules/client and 2 other directories.

[jbossws-commits at lists.jboss.org]

Author: fnasser at redhat.com
Date: 2009-12-09 15:56:08 -0500 (Wed, 09 Dec 2009)
New Revision: 11239

Modified:
   stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml
   stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml
   stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
   stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
Log:
Align log4j groupId, use another stax-api source and exclude some unwanted indirect dependencies

Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml	2009-12-09 20:46:03 UTC (rev 11238)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/pom.xml	2009-12-09 20:56:08 UTC (rev 11239)
@@ -119,8 +119,8 @@
       <artifactId>commons-lang</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+      <groupId>stax</groupId>
+      <artifactId>stax-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.santuario</groupId>
@@ -154,7 +154,7 @@
       <artifactId>jboss-ejb-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>apache-log4j</groupId>
+      <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
     </dependency>
   </dependencies>

Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml	2009-12-09 20:46:03 UTC (rev 11238)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/pom.xml	2009-12-09 20:56:08 UTC (rev 11239)
@@ -123,8 +123,8 @@
       <artifactId>jaxrpc-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+      <groupId>stax</groupId>
+      <artifactId>stax-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.santuario</groupId>

Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml	2009-12-09 20:46:03 UTC (rev 11238)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml	2009-12-09 20:56:08 UTC (rev 11239)
@@ -53,7 +53,7 @@
     -->
     <!-- END -->
     <cxf.version>2.2.2</cxf.version>
-    <cxf.stax.version>1.0.1</cxf.stax.version>
+    <cxf.stax.version>1.0</cxf.stax.version>
     <cxf.asm.version>3.1</cxf.asm.version>
     <fastinfoset.api.version>1.2.7</fastinfoset.api.version>
     <jboss.common.core.version>2.2.16.GA</jboss.common.core.version>
@@ -87,6 +87,10 @@
             <groupId>sun-jaxb</groupId>
             <artifactId>jaxb-api</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -382,8 +386,8 @@
         <version>${commons-lang.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+        <groupId>stax</groupId>
+        <artifactId>stax-api</artifactId>
         <version>${cxf.stax.version}</version>
       </dependency>
       <dependency>
@@ -407,7 +411,7 @@
       
       <!-- transitve dependencies -->
       <dependency>
-        <groupId>apache-log4j</groupId>
+        <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
         <version>${log4j.version}</version>
       </dependency>
@@ -484,6 +488,16 @@
         <groupId>org.jboss.javaee</groupId>
         <artifactId>jboss-ejb3-api</artifactId>
         <version>3.0.0.GA</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.jboss.ws.native</groupId>
+            <artifactId>jbossws-native-jaxrpc</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.jboss.ws.native</groupId>
+            <artifactId>jbossws-native-saaj</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
     </dependencies>
   </dependencyManagement>

Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml	2009-12-09 20:46:03 UTC (rev 11238)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml	2009-12-09 20:56:08 UTC (rev 11239)
@@ -62,7 +62,7 @@
             <outputFileNameMapping>stax-api.jar</outputFileNameMapping>
             <useStrictFiltering>true</useStrictFiltering>
             <includes>
-              <include>org.apache.geronimo.specs:geronimo-stax-api_1.0_spec</include>
+              <include>stax:stax-api</include>
             </includes>
           </dependencySet>
           <dependencySet>