Repository: camel Updated Branches: refs/heads/master a30f9dec8 -> 921ae155f
CAMEL-8264: camel-swagger feature - doesnt work yet Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/921ae155 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/921ae155 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/921ae155 Branch: refs/heads/master Commit: 921ae155f8ee8fa8b69ade4f0e69f4f1f6dc4fc5 Parents: a30f9de Author: Claus Ibsen <[email protected]> Authored: Thu Jan 22 16:17:43 2015 +0100 Committer: Claus Ibsen <[email protected]> Committed: Thu Jan 22 16:17:43 2015 +0100 ---------------------------------------------------------------------- parent/pom.xml | 2 ++ .../features/src/main/resources/features.xml | 20 ++++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/921ae155/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 909140f..86355de 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -439,6 +439,8 @@ <sshd-version>0.13.0</sshd-version> <stompjms-version>1.19</stompjms-version> <swagger-version>1.3.12</swagger-version> + <swagger-guava-version>15.0</swagger-guava-version> + <swagger-bundle-version>1.3.11_1</swagger-bundle-version> <stax-api-version>1.0.1</stax-api-version> <stax2-api-bundle-version>3.1.4</stax2-api-bundle-version> <stringtemplate-bundle-version>4.0.2_2</stringtemplate-bundle-version> http://git-wip-us.apache.org/repos/asf/camel/blob/921ae155/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 cdcdc2e..0d85c2a 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1377,26 +1377,30 @@ <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> - <!-- TODO: swagger JARs in not OSGi bundles + <!-- Does not work yet <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> + <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> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jsonSchema/${jackson2-version}</bundle> + <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:commons-lang/commons-lang/${commons-lang-version}</bundle> - <bundle dependency='true'>mvn:com.wordnik/swagger-annotations/${swagger-version}</bundle> - <bundle dependency='true'>mvn:com.wordnik/swagger-core_2.10/${swagger-version}</bundle> - <bundle dependency='true'>mvn:com.wordnik/sswagger-servlet_2.10/${swagger-version}</bundle> - <bundle dependency='true'>mvn:com.wordnik/swagger-jaxrs_2.10/${swagger-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>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>
