You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2013/10/06 22:28:53 UTC
git commit: CAMEL-6830: Create camel-ical feature
Updated Branches:
refs/heads/master 97de5839c -> 0f3ff6dee
CAMEL-6830: Create camel-ical feature
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0f3ff6de
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0f3ff6de
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0f3ff6de
Branch: refs/heads/master
Commit: 0f3ff6dee233ce93ae5c222a1d46e4e6ad4c930f
Parents: 97de583
Author: cmueller <cm...@apache.org>
Authored: Sun Oct 6 22:28:43 2013 +0200
Committer: cmueller <cm...@apache.org>
Committed: Sun Oct 6 22:28:43 2013 +0200
----------------------------------------------------------------------
components/camel-ical/pom.xml | 2 +-
parent/pom.xml | 2 ++
platforms/karaf/features/src/main/resources/features.xml | 8 ++++++++
3 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0f3ff6de/components/camel-ical/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-ical/pom.xml b/components/camel-ical/pom.xml
index d5587d9..e907d6f 100644
--- a/components/camel-ical/pom.xml
+++ b/components/camel-ical/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.mnode.ical4j</groupId>
<artifactId>ical4j</artifactId>
- <version>1.0.4</version>
+ <version>${ical4j-version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/0f3ff6de/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index fcaf288..c56ce87 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -63,6 +63,7 @@
<aws-java-sdk-bundle-version>1.5.1_1</aws-java-sdk-bundle-version>
<aws-java-sdk-version>1.5.1</aws-java-sdk-version>
<axiom-version>1.2.14</axiom-version>
+ <backport-util-concurrent-version>3.1</backport-util-concurrent-version>
<bcel-bundle-version>5.2_4</bcel-bundle-version>
<beanio-version>2.0.7</beanio-version>
<bsh-version>2.0b5</bsh-version>
@@ -182,6 +183,7 @@
<httpclient-version>3.1</httpclient-version>
<ibatis-bundle-version>2.3.4.726_4</ibatis-bundle-version>
<ibatis-version>2.3.4.726</ibatis-version>
+ <ical4j-version>1.0.5.2</ical4j-version>
<infinispan-version>6.0.0.Beta2</infinispan-version>
<irclib-bundle-version>1.10_5</irclib-bundle-version>
<irclib-version>1.10</irclib-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/0f3ff6de/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 c88f011..0d29cf6 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -502,6 +502,14 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-ibatis/${project.version}</bundle>
</feature>
+ <feature name='camel-ical' version='${project.version}' resolver='(obr)' start-level='50'>
+ <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
+ <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:backport-util-concurrent/backport-util-concurrent/${backport-util-concurrent-version}$Bundle-SymbolicName=backport-util-concurrent.backport-util-concurrent&Bundle-Version=${backport-util-concurrent-version}</bundle>
+ <bundle dependency='true'>mvn:org.mnode.ical4j/ical4j/${ical4j-version}</bundle>
+ <feature version='${project.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.camel/camel-ical/${project.version}</bundle>
+ </feature>
<feature name='camel-irc' version='${project.version}' resolver='(obr)' start-level='50'>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.irclib/${irclib-bundle-version}</bundle>
<feature version='${project.version}'>camel-core</feature>