Repository: camel Updated Branches: refs/heads/camel-2.16.x 136823a7d -> f5b926d10 refs/heads/master ee3deceb9 -> 04b7d55cf
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/04b7d55c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/04b7d55c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/04b7d55c Branch: refs/heads/master Commit: 04b7d55cf6d91e470c67af4d6aeb7b6ef203d3ec Parents: ee3dece Author: cunningt <tcunn...@redhat.com> Authored: Wed Oct 28 09:50:57 2015 -0400 Committer: cunningt <tcunn...@redhat.com> Committed: Wed Oct 28 09:50:57 2015 -0400 ---------------------------------------------------------------------- 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/04b7d55c/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 2900728..a9a0e2d 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -780,7 +780,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'> @@ -1111,7 +1111,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> @@ -1511,7 +1511,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> @@ -1533,7 +1533,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>
