CAMEL-9265 Use servicemix-specs version of jsr311-api
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f5b926d1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f5b926d1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f5b926d1 Branch: refs/heads/camel-2.16.x Commit: f5b926d1035b0051fc506f46c285c0f5869e6b84 Parents: 136823a Author: cunningt <tcunn...@redhat.com> Authored: Wed Oct 28 09:50:57 2015 -0400 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Oct 28 15:12:10 2015 +0100 ---------------------------------------------------------------------- platforms/karaf/features/src/main/resources/features.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f5b926d1/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 369d288..eea461c 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -838,7 +838,7 @@ <feature version='${jclouds-version}'>jclouds-blobstore</feature> <feature version='${jclouds-version}'>jclouds-compute</feature> <feature version='${project.version}'>camel-core</feature> - <bundle>mvn:javax.ws.rs/jsr311-api/${jsr311-api-version}</bundle> + <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1.1/${servicemix-specs-version}</bundle> <bundle>mvn:org.apache.camel/camel-jclouds/${project.version}</bundle> </feature> <feature name='camel-jcr' version='${project.version}' resolver='(obr)' start-level='50'> @@ -1149,7 +1149,7 @@ <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 dependency='true'>mvn:javax.ws.rs/jsr311-api/${jsr311-api-version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1.1/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:org.apache.camel/camel-olingo2-api/${project.version}</bundle> <bundle>mvn:org.apache.camel/camel-olingo2/${project.version}</bundle> </feature> @@ -1549,7 +1549,7 @@ <!-- must use Scala 2.10 --> <bundle dependency='true'>mvn:org.scala-lang/scala-library/${scala-2.10-version}</bundle> <bundle dependency='true'>mvn:org.scala-lang/scala-reflect/${scala-2.10-version}</bundle> - <bundle>mvn:javax.ws.rs/jsr311-api/${jsr311-api-version}</bundle> + <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1.1/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle> <bundle dependency='true'>mvn:com.google.guava/guava/${swagger-scala-guava-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-scala-version}</bundle> @@ -1571,7 +1571,7 @@ <feature name='camel-swagger-java' version='${project.version}' resolver='(obr)' start-level='50'> <feature>http</feature> <feature version='${project.version}'>camel-core</feature> - <bundle>mvn:javax.ws.rs/jsr311-api/${jsr311-api-version}</bundle> + <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1.1/${servicemix-specs-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>
