cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1510763 - /cxf/branches/2.6.x-fixes/rt/frontend/jaxws/pom.xml
Date Mon, 05 Aug 2013 21:47:51 GMT
Author: dkulp
Date: Mon Aug  5 21:47:50 2013
New Revision: 1510763

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

........
  r1510507 | dkulp | 2013-08-05 10:38:31 -0400 (Mon, 05 Aug 2013) | 10 lines

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

  ........
    r1510502 | dkulp | 2013-08-05 10:35:23 -0400 (Mon, 05 Aug 2013) | 2 lines

    New bundle plugin is strict about the ordering

  ........

........

Modified:
    cxf/branches/2.6.x-fixes/rt/frontend/jaxws/pom.xml

Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxws/pom.xml?rev=1510763&r1=1510762&r2=1510763&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/frontend/jaxws/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/rt/frontend/jaxws/pom.xml Mon Aug  5 21:47:50 2013
@@ -38,8 +38,8 @@
         <cxf.osgi.import>
             javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
             org.apache.aries*;version="${cxf.aries.version.range}",
-            javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}",
             javax.xml.ws.spi.http;version="${cxf.osgi.javax.xml.ws.version}";resolution:="optional",
+            javax.xml.ws*;version="${cxf.osgi.javax.xml.ws.version}",
             org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}"
         </cxf.osgi.import>
     </properties>



Mime
View raw message