cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1460818 - in /cxf/branches/2.6.x-fixes: api/pom.xml parent/pom.xml
Date Mon, 25 Mar 2013 18:31:31 GMT
Author: dkulp
Date: Mon Mar 25 18:31:31 2013
New Revision: 1460818

URL: http://svn.apache.org/r1460818
Log:
Merged revisions 1460790 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1460790 | dkulp | 2013-03-25 13:56:33 -0400 (Mon, 25 Mar 2013) | 10 lines

  Merged revisions 1460773 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk

  ........
    r1460773 | dkulp | 2013-03-25 13:34:31 -0400 (Mon, 25 Mar 2013) | 2 lines

    Woodstox is now a compile time dependency.

  ........

........

Modified:
    cxf/branches/2.6.x-fixes/api/pom.xml
    cxf/branches/2.6.x-fixes/parent/pom.xml

Modified: cxf/branches/2.6.x-fixes/api/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/pom.xml?rev=1460818&r1=1460817&r2=1460818&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/api/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/api/pom.xml Mon Mar 25 18:31:31 2013
@@ -104,7 +104,6 @@
         <dependency>
              <groupId>org.codehaus.woodstox</groupId>
              <artifactId>woodstox-core-asl</artifactId>
-             <scope>runtime</scope>
          </dependency>
 
         <dependency>

Modified: cxf/branches/2.6.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/parent/pom.xml?rev=1460818&r1=1460817&r2=1460818&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/parent/pom.xml Mon Mar 25 18:31:31 2013
@@ -147,9 +147,6 @@
         <cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
         <cxf.spring.ldap.version>1.3.1.RELEASE</cxf.spring.ldap.version>
         <cxf.spring.mock>spring-test</cxf.spring.mock>
-        <cxf.stax.impl.groupId>org.codehaus.woodstox</cxf.stax.impl.groupId>
-        <cxf.stax.impl.artifactId>woodstox-core-asl</cxf.stax.impl.artifactId>
-        <cxf.stax.impl.version>${cxf.woodstox.core.version}</cxf.stax.impl.version>
         <cxf.velocity.version>1.7</cxf.velocity.version>
         <cxf.woodstox.core.version>4.2.0</cxf.woodstox.core.version>
         <cxf.woodstox.stax2-api.version>3.1.1</cxf.woodstox.stax2-api.version>
@@ -720,23 +717,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>${cxf.stax.impl.groupId}</groupId>
-                <artifactId>${cxf.stax.impl.artifactId}</artifactId>
-                <version>${cxf.stax.impl.version}</version>
-                <!-- these are motivated by Woodstox, but they can't hurt with others.
-->
-                <exclusions>
-                    <exclusion>
-                        <groupId>stax</groupId>
-                        <artifactId>stax-api</artifactId>
-                    </exclusion>
-                    <!-- this one comes from sjsxp -->
-                    <exclusion>
-                        <groupId>javax.xml.stream</groupId>
-                        <artifactId>stax-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
 
             <dependency>
                 <groupId>org.slf4j</groupId>
@@ -1513,6 +1493,17 @@
                 <groupId>org.codehaus.woodstox</groupId>
                 <artifactId>woodstox-core-asl</artifactId>
                 <version>${cxf.woodstox.core.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>stax</groupId>
+                        <artifactId>stax-api</artifactId>
+                    </exclusion>
+                    <!-- this one comes from sjsxp -->
+                    <exclusion>
+                        <groupId>javax.xml.stream</groupId>
+                        <artifactId>stax-api</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>net.java.dev.msv</groupId>



Mime
View raw message