Updated Branches: refs/heads/camel-2.11.x 120a2da36 -> bd2c3f6d2
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/bd2c3f6d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bd2c3f6d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bd2c3f6d Branch: refs/heads/camel-2.11.x Commit: bd2c3f6d25c7ff80d52071b85596385964c4dc46 Parents: 120a2da Author: cmueller <cmuel...@apache.org> Authored: Sun Oct 6 22:28:43 2013 +0200 Committer: cmueller <cmuel...@apache.org> Committed: Sun Oct 6 22:40:27 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/bd2c3f6d/components/camel-ical/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-ical/pom.xml b/components/camel-ical/pom.xml index abe07ec..4ab7ffd 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/bd2c3f6d/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index e67fdd6..635cc2a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -62,6 +62,7 @@ <aws-java-sdk-bundle-version>1.3.27_1</aws-java-sdk-bundle-version> <aws-java-sdk-version>1.3.27</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> <bcpg-jdk15on-bundle-version>1.47_1</bcpg-jdk15on-bundle-version> <beanio-version>2.0.6</beanio-version> @@ -177,6 +178,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> <irclib-bundle-version>1.10_5</irclib-bundle-version> <irclib-version>1.10</irclib-version> <isorelax-bundle-version>20050913_4</isorelax-bundle-version> http://git-wip-us.apache.org/repos/asf/camel/blob/bd2c3f6d/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 9730a57..6d556f4 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -449,6 +449,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>
