You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2012/10/16 04:06:37 UTC

svn commit: r1398611 - in /cxf/branches/2.5.x-fixes: ./ services/wsn/wsn-api/pom.xml services/wsn/wsn-core/pom.xml

Author: ningjiang
Date: Tue Oct 16 02:06:37 2012
New Revision: 1398611

URL: http://svn.apache.org/viewvc?rev=1398611&view=rev
Log:
Merged revisions 1398607 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

................
  r1398607 | ningjiang | 2012-10-16 09:57:02 +0800 (Tue, 16 Oct 2012) | 9 lines
  
  Merged revisions 1398606 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1398606 | ningjiang | 2012-10-16 09:49:55 +0800 (Tue, 16 Oct 2012) | 1 line
    
    CXF-4569 update the cxf package imports version range of cxf-services-wsn
  ........
................

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    cxf/branches/2.5.x-fixes/services/wsn/wsn-api/pom.xml
    cxf/branches/2.5.x-fixes/services/wsn/wsn-core/pom.xml

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 16 02:06:37 2012
@@ -0,0 +1,2 @@
+/cxf/branches/2.6.x-fixes:1398607
+/cxf/trunk:1398606

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.5.x-fixes/services/wsn/wsn-api/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/wsn/wsn-api/pom.xml?rev=1398611&r1=1398610&r2=1398611&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/wsn/wsn-api/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/services/wsn/wsn-api/pom.xml Tue Oct 16 02:06:37 2012
@@ -77,7 +77,7 @@
                             javax.xml.bind*;version="[0.0,3)",
                             javax.jws*;version="[0.0,3)",
                             javax.xml.ws*;version="[0.0,3)",
-                            org.apache.cxf*;version="[2.4,3)",
+                            org.apache.cxf*;version="[2.5,3)",
                             *
                         </Import-Package>
                         <Export-Package>

Modified: cxf/branches/2.5.x-fixes/services/wsn/wsn-core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/wsn/wsn-core/pom.xml?rev=1398611&r1=1398610&r2=1398611&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/wsn/wsn-core/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/services/wsn/wsn-core/pom.xml Tue Oct 16 02:06:37 2012
@@ -152,7 +152,7 @@
                             javax.xml.bind*;version="[0.0,3)",
                             javax.jws*;version="[0.0,3)",
                             javax.xml.ws*;version="[0.0,3)",
-                            org.apache.cxf*;version=${project.version},
+                            org.apache.cxf*;version="[2.5,3)",
                             *
                         </Import-Package>
                         <Export-Package>