You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2013/07/10 21:13:41 UTC
[6/6] git commit: CAMEL-6493 - add camel-yammer to kit and karaf
features xml
CAMEL-6493 - add camel-yammer to kit and karaf features xml
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a59e61c7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a59e61c7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a59e61c7
Branch: refs/heads/master
Commit: a59e61c7ba5d7823ec2034ea993219cc36a202a2
Parents: c33a1b9
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Wed Jul 10 16:40:24 2013 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Wed Jul 10 16:40:24 2013 -0230
----------------------------------------------------------------------
apache-camel/pom.xml | 4 ++++
apache-camel/src/main/descriptors/common-bin.xml | 1 +
parent/pom.xml | 5 +++++
platforms/karaf/features/src/main/resources/features.xml | 7 +++++++
4 files changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a59e61c7/apache-camel/pom.xml
----------------------------------------------------------------------
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 919f899..a88aea7 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -620,6 +620,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-yammer</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-zipfile</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/a59e61c7/apache-camel/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 110c694..d320052 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -166,6 +166,7 @@
<include>org.apache.camel:camel-xmlsecurity</include>
<include>org.apache.camel:camel-xmpp</include>
<include>org.apache.camel:camel-xstream</include>
+ <include>org.apache.camel:camel-yammer</include>
<include>org.apache.camel:camel-zipfile</include>
<include>org.apache.camel:camel-zookeeper</include>
<include>org.apache.camel.karaf:camel-karaf-commands</include>
http://git-wip-us.apache.org/repos/asf/camel/blob/a59e61c7/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index d27126e..f8671b2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1191,6 +1191,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-yammer</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-zipfile</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/a59e61c7/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 3f60052..15e3934 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1057,6 +1057,13 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-xstream/${project.version}</bundle>
</feature>
+ <feature name='camel-yammer' version='${project.version}' resolver='(obr)' start-level='50'>
+ <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
+ <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.scribe/scribe/${scribe-version}</bundle>
+ <feature version='${project.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.camel/camel-yammer/${project.version}</bundle>
+ </feature>
<feature name='camel-zipfile' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-zipfile/${project.version}</bundle>