camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject [1/3] camel git commit: [CAMEL-8530]can't install camel-github feature in karaf
Date Mon, 23 Mar 2015 05:58:07 GMT
Repository: camel
Updated Branches:
  refs/heads/master b63707cd6 -> 0f1d5c757


[CAMEL-8530]can't install camel-github feature in karaf


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/13caf518
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/13caf518
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/13caf518

Branch: refs/heads/master
Commit: 13caf51816454923b323b5df0138cddda967cae6
Parents: dcbb9fe
Author: Freeman Fang <freeman.fang@gmail.com>
Authored: Mon Mar 23 13:56:52 2015 +0800
Committer: Freeman Fang <freeman.fang@gmail.com>
Committed: Mon Mar 23 13:56:52 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/13caf518/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 9267504..1aeebb8 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/13caf518/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 6ce2053..3b77d7a 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -438,8 +438,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>


Mime
View raw message