You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/09/23 05:33:05 UTC
[3/3] git commit: CAMEL-7777 Added feature entry of camel-github
CAMEL-7777 Added feature entry of camel-github
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/973b8b3f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/973b8b3f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/973b8b3f
Branch: refs/heads/master
Commit: 973b8b3f76178cf9e7ad4c3f5fb17c9fd9145880
Parents: 5593920
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Sep 23 11:21:56 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Sep 23 11:21:56 2014 +0800
----------------------------------------------------------------------
components/camel-github/pom.xml | 2 +-
parent/pom.xml | 1 +
platforms/karaf/features/src/main/resources/features.xml | 9 ++++++++-
3 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/973b8b3f/components/camel-github/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-github/pom.xml b/components/camel-github/pom.xml
index ef37419..37b0adf 100644
--- a/components/camel-github/pom.xml
+++ b/components/camel-github/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.eclipse.mylyn.github</groupId>
<artifactId>org.eclipse.egit.github.core</artifactId>
- <version>2.1.5</version>
+ <version>${egit-github-core-version}</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/973b8b3f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 6b217ae..f81b661 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -131,6 +131,7 @@
<eclipse-compiler-version>4.2.2</eclipse-compiler-version>
<eclipse-equinox-common-version>3.3.0-v20070426</eclipse-equinox-common-version>
<ehcache-version>2.8.3</ehcache-version>
+ <egit-github-core-version>2.1.5</egit-github-core-version>
<elasticsearch-bundle-version>1.0.0_1</elasticsearch-bundle-version>
<elasticsearch-version>1.0.0</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/973b8b3f/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 9ddf53b..25123fa 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -401,7 +401,14 @@
<bundle dependency='true'>wrap:mvn:com.google.code.geocoder-java/geocoder-java/${geocoder-java-version}</bundle>
<bundle>mvn:org.apache.camel/camel-geocoder/${project.version}</bundle>
</feature>
- <feature name='camel-google-drive' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature name='camel-github' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
+ <!--the lastest gson version of github core is 2.2.0 -->
+ <bundle dependency='true'>mvn:com.google.code.gson/gson/2.2.0</bundle>
+ <bundle dependency='true'>mvn:org.eclipse.mylyn.github/org.eclipse.egit.github.core/${egit-github-core-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-github/${project.version}</bundle>
+ </feature>
+ <feature name='camel-google-drive' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>