You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/09/15 03:04:09 UTC
[4/4] git commit: Fixed a feature import issue of camel-olingo2,
and added detail information about camel-spring-xxx features
Fixed a feature import issue of camel-olingo2, and added detail information about camel-spring-xxx features
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a1320927
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a1320927
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a1320927
Branch: refs/heads/camel-2.14.x
Commit: a132092733b1922bda0cb22759b470c276c39478
Parents: f6b7098
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Sep 15 08:51:36 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Sep 15 09:03:42 2014 +0800
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a1320927/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 350f256..d367461 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -948,7 +948,8 @@
<bundle dependency='true'>mvn:com.google.code.gson/gson/${gson-version}</bundle>
<bundle dependency='true'>mvn:org.apache.olingo/olingo-odata2-api/${olingo2-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.olingo-odata2-core/${olingo-odata2-core-bundle-version}</bundle>
- <bundle>mvn:org.apache.camel.component.olingo2/camel-olingo2-api/${project.version}</bundle>
+ <bundle dependency='true'>mvn:javax.ws.rs/jsr311-api/${jsr311-api-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.camel.component.olingo2/camel-olingo2-api/${project.version}</bundle>
<bundle>mvn:org.apache.camel.component.olingo2/camel-olingo2/${project.version}</bundle>
</feature>
<feature name='camel-openshift' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -1180,12 +1181,14 @@
<bundle>mvn:org.apache.camel/camel-splunk/${project.version}</bundle>
</feature>
<feature name='camel-spring-batch' version='${project.version}' resolver='(obr)' start-level='50'>
+ <details>spring-batch doesn't support importing spring 4.x </details>
<bundle dependency='true'>mvn:org.springframework.batch/spring-batch-core/${spring-batch-version}</bundle>
<bundle dependency='true'>mvn:org.springframework.batch/spring-batch-infrastructure/${spring-batch-version}</bundle>
<feature version='${project.version}'>camel-spring</feature>
<bundle>mvn:org.apache.camel/camel-spring-batch/${project.version}</bundle>
</feature>
<feature name='camel-spring-integration' version='${project.version}' resolver='(obr)' start-level='50'>
+ <details>spring-integartion doesn't support importing spring 4.x </details>
<feature version='${project.version}'>camel-spring</feature>
<bundle dependency='true'>mvn:org.springframework.retry/spring-retry/${spring-retry-version}</bundle>
<bundle dependency='true'>mvn:org.springframework.integration/spring-integration-core/${spring-integration-version}</bundle>
@@ -1209,6 +1212,7 @@
<bundle>mvn:org.apache.camel/camel-spring-ldap/${project.version}</bundle>
</feature>
<feature name='camel-spring-redis' version='${project.version}' resolver='(obr)' start-level='50'>
+ <details>spring-data-redis doesn't support importing spring version which is above 4.0.5 </details>
<feature version='${project.version}'>camel-core</feature>
<feature version='${spring-version-range}'>spring</feature>
<feature version='${spring-version-range}'>spring-tx</feature>
@@ -1218,6 +1222,7 @@
<bundle>mvn:org.apache.camel/camel-spring-redis/${project.version}</bundle>
</feature>
<feature name='camel-spring-security' version='${project.version}' resolver='(obr)' start-level='50'>
+ <details>spring-security doesn't support importing spring 4.x </details>
<feature>http</feature>
<feature version='${project.version}'>camel-spring</feature>
<feature version='${spring-version-range}'>spring-web</feature>
@@ -1227,6 +1232,7 @@
<bundle>mvn:org.apache.camel/camel-spring-security/${project.version}</bundle>
</feature>
<feature name='camel-spring-ws' version='${project.version}' resolver='(obr)' start-level='50'>
+ <details>spring-ws doesn't support importing spring 4.x </details>
<feature>http</feature>
<feature version='${project.version}'>camel-spring</feature>
<bundle dependency='true'>mvn:javax.mail/mail/${javax-mail-version}</bundle>