camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject [2/2] camel git commit: CAMEL-8080 Make Camel CXF dependency on Camel Spring optional
Date Fri, 28 Nov 2014 09:22:25 GMT
CAMEL-8080 Make Camel CXF dependency on Camel Spring optional


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/58ddb6b2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/58ddb6b2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/58ddb6b2

Branch: refs/heads/master
Commit: 58ddb6b2d3df23b0057cf56797ee12efbd48bb35
Parents: dd8cbe5
Author: Willem Jiang <willem.jiang@gmail.com>
Authored: Fri Nov 28 17:21:41 2014 +0800
Committer: Willem Jiang <willem.jiang@gmail.com>
Committed: Fri Nov 28 17:21:41 2014 +0800

----------------------------------------------------------------------
 components/camel-cxf-transport/pom.xml                   | 2 +-
 components/camel-cxf/pom.xml                             | 2 ++
 platforms/karaf/features/src/main/resources/features.xml | 3 +--
 3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/58ddb6b2/components/camel-cxf-transport/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cxf-transport/pom.xml b/components/camel-cxf-transport/pom.xml
index a50b690..fe08105 100644
--- a/components/camel-cxf-transport/pom.xml
+++ b/components/camel-cxf-transport/pom.xml
@@ -41,7 +41,7 @@
       javax.xml.ws*;version="[0.0,3.0)",
       javax.servlet*;resolution="optional";version="[0,4)",
       org.apache.camel.*;${camel.osgi.import.camel.version},
-      org.springframework.beans*;resolution:=optional,
+      org.springframework*;version="${spring-version-range}";resolution:=optional,
       ${camel.osgi.import.defaults},
       ${camel.osgi.import.additional},
       org.osgi.framework;resolution:=optional,

http://git-wip-us.apache.org/repos/asf/camel/blob/58ddb6b2/components/camel-cxf/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index 7b85941..97d9e0c 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -47,6 +47,8 @@
       javax.xml.stream*;version="[0.0,2)",
       javax.xml.ws*;version="[0.0,3.0)",
       org.apache.camel.*;${camel.osgi.import.camel.version},
+      org.apache.camel.spring.*;${camel.osgi.import.camel.version};resolution:=optional,
+      org.springframework*;version="${spring-version-range}";resolution:=optional,
       ${camel.osgi.import.defaults},
       ${camel.osgi.import.additional},
       org.osgi.service.blueprint;resolution:=optional,

http://git-wip-us.apache.org/repos/asf/camel/blob/58ddb6b2/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 15168ce..93ac26b 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -269,7 +269,6 @@
     <bundle>mvn:org.apache.camel/camel-csv/${project.version}</bundle>
   </feature>
   <feature name='camel-cxf' version='${project.version}' resolver='(obr)' start-level='50'>
-    <feature version='${project.version}'>camel-spring</feature>
     <feature version='${cxf-version-range}'>cxf-core</feature>
     <feature version='${cxf-version-range}'>cxf-jaxrs</feature>
     <feature version='${cxf-version-range}'>cxf-jaxws</feature>
@@ -1128,7 +1127,7 @@
     <feature>eventadmin</feature>
     <bundle dependency='true'>mvn:org.apache.camel/camel-core-osgi/${project.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-scr/${project.version}</bundle>
-  </feature>  
+  </feature>
    <feature name='camel-script-jruby' version='${project.version}' resolver='(obr)' start-level='50'>
     <bundle>mvn:http://scriptengines.googlecode.com/svn/m2-repo/!com.google.code.scriptengines/scriptengines-jruby/${scriptengines-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix-specs-version}</bundle>


Mime
View raw message