Repository: camel
Updated Branches:
  refs/heads/master 429ff2ccf -> ec25ee44e


CAMEL-8264: camel-swagger feature


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

Branch: refs/heads/master
Commit: ec25ee44e4b9b02033a71753e02b0c4b5f1897e8
Parents: 429ff2c
Author: Claus Ibsen <[email protected]>
Authored: Mon Jan 26 12:05:49 2015 +0100
Committer: Claus Ibsen <[email protected]>
Committed: Mon Jan 26 12:05:49 2015 +0100

----------------------------------------------------------------------
 parent/pom.xml                                        |  4 +++-
 .../karaf/features/src/main/resources/features.xml    | 14 +++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/ec25ee44/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8fcc514..f923348 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -275,6 +275,7 @@
     <jsendnsca-bundle-version>1.3.1_3</jsendnsca-bundle-version>
     <jsonlib-bundle-version>2.4_1</jsonlib-bundle-version>
     <jsonlib-version>2.4</jsonlib-version>
+    <json4s-bundle-version>3.2.8_1</json4s-bundle-version>
     <json-path-version>1.1.0</json-path-version>
     <json-smart-version>2.0</json-smart-version>
     <jsp-api-2.1-version>1.0.1</jsp-api-2.1-version>
@@ -358,7 +359,7 @@
     <oro-bundle-version>2.0.8_6</oro-bundle-version>
     <oscache-bundle-version>2.4_5</oscache-bundle-version>
     <osgi-version>4.3.1</osgi-version>
-    <paranamer-bundle-version>2.4_1</paranamer-bundle-version>
+    <paranamer-bundle-version>2.6_1</paranamer-bundle-version>
     <pax-exam-version>4.3.0</pax-exam-version>
     <pax-tiny-bundle-version>1.3.1</pax-tiny-bundle-version>
     <pax-logging-version>1.8.1</pax-logging-version>
@@ -377,6 +378,7 @@
     <quartz2-version>2.2.1</quartz2-version>
     <quickfix-bundle-version>1.5.3_1</quickfix-bundle-version>
     <rabbitmq-amqp-client-version>3.3.4</rabbitmq-amqp-client-version>
+    <reflections-bundle-version>0.9.8_1</reflections-bundle-version>
     <regexp-bundle-version>1.4_1</regexp-bundle-version>
     <restlet-version>2.2.3</restlet-version>
     <rhino-bundle-version>1.7R2_3</rhino-bundle-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/ec25ee44/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 384431b..07c4dac 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1377,13 +1377,12 @@
     <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.stringtemplate/${stringtemplate-bundle-version}</bundle>
     
<bundle>mvn:org.apache.camel/camel-stringtemplate/${project.version}</bundle>
   </feature>
-  <!-- Does not work yet, see CAMEL-8264
   <feature name='camel-swagger' version='${project.version}' resolver='(obr)' 
start-level='50'>
     <details> camel-swagger need to access the http OSGi services </details>
     <feature>http</feature>
     <feature version='${project.version}'>camel-core</feature>
-    <bundle 
dependency='true'>mvn:org.scala-lang/scala-library/${scala-version}</bundle>
-    <bundle 
dependency='true'>mvn:org.scala-lang.modules/scala-xml_2.11/${scalaxml-version}</bundle>
+    <!-- must use Scala 2.10 -->
+    <bundle 
dependency='true'>mvn:org.scala-lang/scala-library/${scala-2.10-version}</bundle>
     <bundle>mvn:javax.ws.rs/jsr311-api/${jsr311-api-version}</bundle>
     <bundle 
dependency='true'>mvn:com.google.guava/guava/${swagger-guava-version}</bundle>
     <bundle 
dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
@@ -1392,15 +1391,16 @@
     <bundle 
dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
     <bundle 
dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson2-version}</bundle>
     <bundle 
dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson2-version}</bundle>
-    <bundle 
dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-scala_2.11/${jackson2-version}</bundle>
+    <bundle 
dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-scala_2.10/${jackson2-version}</bundle>
     <bundle 
dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
     <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-annotations/${swagger-bundle-version}</bundle>
     <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-core/${swagger-bundle-version}</bundle>
     <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-jaxrs/${swagger-bundle-version}</bundle>
-    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.paranamer/2.6_1</bundle>
-    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json4s/3.2.8_1</bundle>
+    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.paranamer/${paranamer-bundle-version}</bundle>
+    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json4s/${json4s-bundle-version}</bundle>
+    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-swagger/${project.version}</bundle>
-  </feature>  -->
+  </feature>  
   <feature name='camel-syslog' version='${project.version}' resolver='(obr)' 
start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <feature version='${project.version}'>camel-netty</feature>

Reply via email to