Repository: camel Updated Branches: refs/heads/master e086d29fa -> df4a9413e
CAMEL-8331: OSGi bundle upgrades Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ead9be3d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ead9be3d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ead9be3d Branch: refs/heads/master Commit: ead9be3d186f5655b66d35b60582551abf73bc5d Parents: e086d29 Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Mar 1 09:40:53 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Mar 1 09:40:53 2015 +0100 ---------------------------------------------------------------------- parent/pom.xml | 1 + platforms/karaf/features/src/main/resources/features.xml | 7 +++++++ 2 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ead9be3d/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 05459fb..0c5f2d9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -419,6 +419,7 @@ <solr-version>4.9.0</solr-version> <solr-version-range>[4.9,5)</solr-version-range> <spark-rest-version>2.0.0</spark-rest-version> + <spark-rest-bundle-version>2.0.0_1</spark-rest-bundle-version> <splunk-version>1.3.0_1</splunk-version> <spring-batch-version>3.0.3.RELEASE</spring-batch-version> <spring-batch-bundle-version>3.0.3.RELEASE_1</spring-batch-bundle-version> http://git-wip-us.apache.org/repos/asf/camel/blob/ead9be3d/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 27d60d6..8c4e9e4 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1290,6 +1290,13 @@ <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle> <bundle>mvn:org.apache.camel/camel-solr/${project.version}</bundle> </feature> + <feature name='camel-spark-rest' version='${project.version}' resolver='(obr)' start-level='50'> + <details>The camel-spark-rest feature requires Java 8 and Jetty9</details> + <feature version='${project.version}'>camel-core</feature> + <feature version='${project.version}'>camel-jetty9</feature> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.sparkjava-core/${spark-rest-bundle-version}</bundle> + <bundle>mvn:org.apache.camel/camel-spark-rest/${project.version}</bundle> + </feature> <feature name='camel-splunk' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.splunk/${splunk-version}</bundle>
