Repository: camel Updated Branches: refs/heads/master 285189e9d -> cda9eb838
Fix camel-sip Karaf feature. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cda9eb83 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cda9eb83 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cda9eb83 Branch: refs/heads/master Commit: cda9eb838be1a976e953431070b4dcb0d601dc2c Parents: 285189e Author: Raul Kripalani <ra...@apache.org> Authored: Fri Aug 14 18:59:03 2015 +0100 Committer: Raul Kripalani <ra...@apache.org> Committed: Fri Aug 14 18:59:28 2015 +0100 ---------------------------------------------------------------------- parent/pom.xml | 1 + platforms/karaf/features/src/main/resources/features.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/cda9eb83/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 13f39e8..70581b8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -427,6 +427,7 @@ <scriptengines-version>1.1.1</scriptengines-version> <serp-bundle-version>1.14.1_1</serp-bundle-version> <servicemix-specs-version>2.4.0</servicemix-specs-version> + <servicemix-specs-2.5.0-version>2.5.0</servicemix-specs-2.5.0-version> <servlet-api-3.0-version>1.0</servlet-api-3.0-version> <servlet-version-range>[2.5,4)</servlet-version-range> <shiro-version>1.2.3</shiro-version> http://git-wip-us.apache.org/repos/asf/camel/blob/cda9eb83/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 6c97436..708b898 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1320,7 +1320,7 @@ </feature> <feature name='camel-sip' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> - <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jain-sip-api-1.2/${servicemix-specs-version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jain-sip-api-1.2.1/${servicemix-specs-2.5.0-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jain-sip-ri/${jain-sip-ri-bundle-version}</bundle> <bundle>mvn:org.apache.camel/camel-sip/${project.version}</bundle> </feature>
