Repository: camel Updated Branches: refs/heads/camel-2.15.x 99106e411 -> 4a4cdcfa7
[CAMEL-8530]can't install camel-github feature in karaf (cherry picked from commit 13caf51816454923b323b5df0138cddda967cae6) Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4a4cdcfa Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4a4cdcfa Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4a4cdcfa Branch: refs/heads/camel-2.15.x Commit: 4a4cdcfa7597b237eeee4337513f63cc0656da72 Parents: 99106e4 Author: Freeman Fang <freeman.f...@gmail.com> Authored: Mon Mar 23 13:56:52 2015 +0800 Committer: Freeman Fang <freeman.f...@gmail.com> Committed: Mon Mar 23 13:58:58 2015 +0800 ---------------------------------------------------------------------- parent/pom.xml | 1 + platforms/karaf/features/src/main/resources/features.xml | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/4a4cdcfa/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index e016bd2..7a0d917 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -140,6 +140,7 @@ <eclipse-equinox-common-version>3.3.0-v20070426</eclipse-equinox-common-version> <ehcache-version>2.9.1</ehcache-version> <egit-github-core-version>2.1.5</egit-github-core-version> + <egit-github-core-bundle-version>2.1.5_1</egit-github-core-bundle-version> <elasticsearch-bundle-version>1.4.2_1</elasticsearch-bundle-version> <elasticsearch-version>1.4.2</elasticsearch-version> <el-api-1.0-version>1.0.1</el-api-1.0-version> http://git-wip-us.apache.org/repos/asf/camel/blob/4a4cdcfa/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 35f42ef..10c9581 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -433,8 +433,7 @@ <feature version='${project.version}'>camel-core</feature> <!--the lastest gson version of github core supports is 2.2 --> <bundle dependency='true'>mvn:com.google.code.gson/gson/2.2</bundle> - <!--TODO use the servicesmix wrapped bundle --> - <bundle dependency='true'>mvn:org.eclipse.mylyn.github/org.eclipse.egit.github.core/${egit-github-core-version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.egit.github.core/${egit-github-core-bundle-version}</bundle> <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> <bundle>mvn:org.apache.camel/camel-github/${project.version}</bundle> </feature>