You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/01/09 19:05:21 UTC
svn commit: r1430989 - in /cxf/branches/2.6.x-fixes/rt:
bindings/coloc/pom.xml bindings/object/pom.xml transports/jms/pom.xml
Author: dkulp
Date: Wed Jan 9 18:05:21 2013
New Revision: 1430989
URL: http://svn.apache.org/viewvc?rev=1430989&view=rev
Log:
Merged revisions 1430983 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........
r1430983 | dkulp | 2013-01-09 13:03:24 -0500 (Wed, 09 Jan 2013) | 10 lines
Merged revisions 1430881 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1430881 | dkulp | 2013-01-09 10:23:20 -0500 (Wed, 09 Jan 2013) | 2 lines
Add some spring version ranges for OSGi
........
........
Modified:
cxf/branches/2.6.x-fixes/rt/bindings/coloc/pom.xml
cxf/branches/2.6.x-fixes/rt/bindings/object/pom.xml
cxf/branches/2.6.x-fixes/rt/transports/jms/pom.xml
Modified: cxf/branches/2.6.x-fixes/rt/bindings/coloc/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/bindings/coloc/pom.xml?rev=1430989&r1=1430988&r2=1430989&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/bindings/coloc/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/rt/bindings/coloc/pom.xml Wed Jan 9 18:05:21 2013
@@ -35,6 +35,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/bindings/object/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/bindings/object/pom.xml?rev=1430989&r1=1430988&r2=1430989&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/bindings/object/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/rt/bindings/object/pom.xml Wed Jan 9 18:05:21 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/transports/jms/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/transports/jms/pom.xml?rev=1430989&r1=1430988&r2=1430989&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/transports/jms/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/rt/transports/jms/pom.xml Wed Jan 9 18:05:21 2013
@@ -34,6 +34,9 @@
</parent>
<properties>
+ <cxf.osgi.import>
+ org.springframework*;resolution:=optional;version="${cxf.osgi.spring.version}"
+ </cxf.osgi.import>
<cxf.spi-dir>spi-2.1</cxf.spi-dir>
</properties>