cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1448272 - in /cxf/branches/2.6.x-fixes: parent/ rt/bindings/soap/ rt/features/clustering/ rt/frontend/jaxrs/ rt/frontend/jaxws/ rt/frontend/simple/ rt/transports/http-jetty/ rt/transports/http/ rt/ws/addr/ rt/ws/policy/ rt/ws/rm/
Date Wed, 20 Feb 2013 16:03:32 GMT
Author: dkulp
Date: Wed Feb 20 16:03:32 2013
New Revision: 1448272

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

........
  r1448247 | dkulp | 2013-02-20 10:40:05 -0500 (Wed, 20 Feb 2013) | 10 lines

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

  ........
    r1448237 | dkulp | 2013-02-20 10:33:25 -0500 (Wed, 20 Feb 2013) | 2 lines

    Bunch of import cleanups to make sure we get the proper ranges in various places

  ........

........

Modified:
    cxf/branches/2.6.x-fixes/parent/pom.xml
    cxf/branches/2.6.x-fixes/rt/bindings/soap/pom.xml
    cxf/branches/2.6.x-fixes/rt/features/clustering/pom.xml
    cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/pom.xml
    cxf/branches/2.6.x-fixes/rt/frontend/jaxws/pom.xml
    cxf/branches/2.6.x-fixes/rt/frontend/simple/pom.xml
    cxf/branches/2.6.x-fixes/rt/transports/http-jetty/pom.xml
    cxf/branches/2.6.x-fixes/rt/transports/http/pom.xml
    cxf/branches/2.6.x-fixes/rt/ws/addr/pom.xml
    cxf/branches/2.6.x-fixes/rt/ws/policy/pom.xml
    cxf/branches/2.6.x-fixes/rt/ws/rm/pom.xml

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=1448272&r1=1448271&r2=1448272&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/parent/pom.xml Wed Feb 20 16:03:32 2013
@@ -79,6 +79,7 @@
         <cxf.osgi.javax.activation.version>[0.0,2)</cxf.osgi.javax.activation.version>
         <cxf.osgi.javax.mail.version>[0.0,2)</cxf.osgi.javax.mail.version>
         <cxf.osgi.javax.servlet.version>[0.0,4)</cxf.osgi.javax.servlet.version>
+        <cxf.osgi.javax.xml.ws.version>[0.0,3)</cxf.osgi.javax.xml.ws.version>
 
         <!-- please maintain alphabetical order here -->
         <cxf.abdera.version>1.1.3</cxf.abdera.version>

Modified: cxf/branches/2.6.x-fixes/rt/bindings/soap/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/bindings/soap/pom.xml?rev=1448272&r1=1448271&r2=1448272&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/bindings/soap/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/rt/bindings/soap/pom.xml Wed Feb 20 16:03:32 2013
@@ -33,7 +33,8 @@
 
     <properties>
         <cxf.osgi.import>
-            org.apache.aries*;version="${cxf.aries.version.range}"
+            org.apache.aries*;version="${cxf.aries.version.range}",
+            org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}"
         </cxf.osgi.import>
     </properties>
 

Modified: cxf/branches/2.6.x-fixes/rt/features/clustering/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/features/clustering/pom.xml?rev=1448272&r1=1448271&r2=1448272&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/features/clustering/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/rt/features/clustering/pom.xml Wed Feb 20 16:03:32 2013
@@ -35,7 +35,8 @@
 
     <properties>
         <cxf.osgi.import>
-            org.apache.aries*;version="${cxf.aries.version.range}"
+            org.apache.aries*;version="${cxf.aries.version.range}",
+            org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}"
         </cxf.osgi.import>
     </properties>
 

Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/pom.xml?rev=1448272&r1=1448271&r2=1448272&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/pom.xml Wed Feb 20 16:03:32 2013
@@ -36,7 +36,9 @@
     <properties>
         <cxf.osgi.import>
             javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
-            org.apache.aries*;version="${cxf.aries.version.range}"
+            org.apache.aries*;version="${cxf.aries.version.range}",
+            org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
+            javax.ws.rs*;version="[1.0,3)"
         </cxf.osgi.import>
     </properties>
 

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=1448272&r1=1448271&r2=1448272&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 Wed Feb 20 16:03:32 2013
@@ -37,7 +37,10 @@
         <cxf.spi-dir>spi-2.1</cxf.spi-dir>
         <cxf.osgi.import>
             javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
-            org.apache.aries*;version="${cxf.aries.version.range}"
+            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",
+            org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}"
         </cxf.osgi.import>
     </properties>
     <dependencies>

Modified: cxf/branches/2.6.x-fixes/rt/frontend/simple/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/simple/pom.xml?rev=1448272&r1=1448271&r2=1448272&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/frontend/simple/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/rt/frontend/simple/pom.xml Wed Feb 20 16:03:32 2013
@@ -35,7 +35,8 @@
 
     <properties>
         <cxf.osgi.import>
-            org.apache.aries*;version="${cxf.aries.version.range}"
+            org.apache.aries*;version="${cxf.aries.version.range}",
+            org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}"
         </cxf.osgi.import>
     </properties>
     <dependencies>

Modified: cxf/branches/2.6.x-fixes/rt/transports/http-jetty/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/transports/http-jetty/pom.xml?rev=1448272&r1=1448271&r2=1448272&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/transports/http-jetty/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/rt/transports/http-jetty/pom.xml Wed Feb 20 16:03:32 2013
@@ -37,7 +37,8 @@
         <cxf.osgi.import>
             javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
             org.eclipse.jetty*;version="${cxf.jetty.osgi.version}",
-            org.apache.aries*;version="${cxf.aries.version.range}"
+            org.apache.aries*;version="${cxf.aries.version.range}",
+            org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}"
         </cxf.osgi.import>
         <cxf.osgi.dynamic.import>
             org.eclipse.jetty.jmx

Modified: cxf/branches/2.6.x-fixes/rt/transports/http/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/transports/http/pom.xml?rev=1448272&r1=1448271&r2=1448272&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/transports/http/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/rt/transports/http/pom.xml Wed Feb 20 16:03:32 2013
@@ -36,7 +36,8 @@
         <cxf.bundle.activator>org.apache.cxf.transport.http.osgi.HTTPTransportActivator</cxf.bundle.activator>
         <cxf.osgi.import>
             javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
-            org.apache.aries*;version="${cxf.aries.version.range}"
+            org.apache.aries*;version="${cxf.aries.version.range}",
+            org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}"
         </cxf.osgi.import>
         <cxf.osgi.export>
             '=META-INF.cxf.osgi',

Modified: cxf/branches/2.6.x-fixes/rt/ws/addr/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/addr/pom.xml?rev=1448272&r1=1448271&r2=1448272&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/addr/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/rt/ws/addr/pom.xml Wed Feb 20 16:03:32 2013
@@ -34,6 +34,7 @@
        
     <properties>
         <cxf.osgi.import>
+            org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
             org.apache.aries*;version="${cxf.aries.version.range}"
         </cxf.osgi.import>
     </properties>

Modified: cxf/branches/2.6.x-fixes/rt/ws/policy/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/policy/pom.xml?rev=1448272&r1=1448271&r2=1448272&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/policy/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/rt/ws/policy/pom.xml Wed Feb 20 16:03:32 2013
@@ -33,6 +33,7 @@
   
     <properties>
         <cxf.osgi.import>
+            org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
             org.apache.aries*;version="${cxf.aries.version.range}"
         </cxf.osgi.import>
     </properties>

Modified: cxf/branches/2.6.x-fixes/rt/ws/rm/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/rm/pom.xml?rev=1448272&r1=1448271&r2=1448272&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/rm/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/rt/ws/rm/pom.xml Wed Feb 20 16:03:32 2013
@@ -33,7 +33,8 @@
 
     <properties>
         <cxf.osgi.import>
-            org.apache.aries*;version="${cxf.aries.version.range}"
+            org.apache.aries*;version="${cxf.aries.version.range}",
+            org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}"
         </cxf.osgi.import>
     </properties>
 



Mime
View raw message