Author: ningjiang
Date: Fri Aug 5 03:59:41 2011
New Revision: 1154088
URL: http://svn.apache.org/viewvc?rev=1154088&view=rev
Log:
Merged revisions 1153146 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1153146 | ningjiang | 2011-08-02 22:41:20 +0800 (Tue, 02 Aug 2011) | 1 line
CAMEL-4295 fixed spring-ws packages version range issue
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-http/ (props changed)
camel/branches/camel-2.8.x/components/camel-spring-ws/pom.xml
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 5 03:59:41 2011
@@ -1 +1 @@
-/camel/trunk:1153323
+/camel/trunk:1153146,1153323
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Aug 5 03:59:41 2011
@@ -1 +1 @@
-/camel/trunk:1-1151940,1153323
+/camel/trunk:1-1151940,1153146,1153323
Propchange: camel/branches/camel-2.8.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 5 03:59:41 2011
@@ -1 +1 @@
-/camel/trunk/components/camel-http:917526,1153323
+/camel/trunk/components/camel-http:917526,1153146,1153323
Modified: camel/branches/camel-2.8.x/components/camel-spring-ws/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-spring-ws/pom.xml?rev=1154088&r1=1154087&r2=1154088&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-spring-ws/pom.xml (original)
+++ camel/branches/camel-2.8.x/components/camel-spring-ws/pom.xml Fri Aug 5
03:59:41 2011
@@ -33,6 +33,14 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.component.spring.ws.*</camel.osgi.export.pkg>
+ <camel.osgi.import>
+ !org.apache.camel.component.spring.ws.*,
+ org.apache.camel.*;${camel.osgi.import.camel.version},
+ org.springframework.ws.*;version="[2,3)",
+ org.springframework.xml.*;version="[2,3)",
+ org.springframework.*;version="[3,4)",
+ *
+ </camel.osgi.import>
</properties>
<dependencies>
