You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2016/11/10 09:07:33 UTC

[1/2] camel git commit: Upgrade Spark-rest and related bundle to version 2.5

Repository: camel
Updated Branches:
  refs/heads/master 1d9ae9e4b -> 152338942


Upgrade Spark-rest and related bundle to version 2.5


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

Branch: refs/heads/master
Commit: cfd17d95a74141454ab8d636b7204e15e36447cf
Parents: 1d9ae9e
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Nov 10 09:40:08 2016 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Nov 10 09:40:08 2016 +0100

----------------------------------------------------------------------
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/cfd17d95/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 6e2800e..6c1b231 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -538,8 +538,8 @@
     <solr-version>5.5.0</solr-version>
     <solr-version-range>[5,6)</solr-version-range>
     <spark-version>1.6.1</spark-version>
-    <spark-rest-version>2.3</spark-rest-version>
-    <spark-rest-bundle-version>2.3_1</spark-rest-bundle-version>
+    <spark-rest-version>2.5</spark-rest-version>
+    <spark-rest-bundle-version>2.5_1</spark-rest-bundle-version>
     <splunk-version>1.5.0.0_1</splunk-version>
     <spring-batch-version>3.0.7.RELEASE</spring-batch-version>
     <spring-batch-bundle-version>3.0.7.RELEASE_1</spring-batch-bundle-version>


[2/2] camel git commit: Added detail to camel-spark-rest Karaf feature

Posted by ac...@apache.org.
Added detail to camel-spark-rest Karaf feature


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

Branch: refs/heads/master
Commit: 1523389427978b14fd8d72b850ec599f602774ba
Parents: cfd17d9
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Nov 10 09:42:08 2016 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Nov 10 09:42:08 2016 +0100

----------------------------------------------------------------------
 platforms/karaf/features/src/main/resources/features.xml | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/15233894/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 3d1f708..17b4b9e 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1630,6 +1630,7 @@
     <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>This feature requires sun.reflect package, you'll need to add it to your container. In Karaf you can do this by adding sun.reflect in the JDK8 section of etc/jre.properties file</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>