add karaf feature for google calendar component
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/78ea3c9f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/78ea3c9f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/78ea3c9f Branch: refs/heads/master Commit: 78ea3c9fb29e6058cef91641824ca2cb89889af1 Parents: 5c02ce7 Author: Jonathan Anstey <jans...@gmail.com> Authored: Fri Nov 14 14:54:33 2014 -0330 Committer: Jonathan Anstey <jans...@gmail.com> Committed: Fri Nov 14 14:54:33 2014 -0330 ---------------------------------------------------------------------- apache-camel/pom.xml | 4 ++++ apache-camel/src/main/descriptors/common-bin.xml | 1 + components/camel-google-calendar/pom.xml | 4 ++-- parent/pom.xml | 6 ++++++ .../karaf/features/src/main/resources/features.xml | 16 +++++++++++++++- 5 files changed, 28 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/78ea3c9f/apache-camel/pom.xml ---------------------------------------------------------------------- diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml index 82bb40b..61b858d 100644 --- a/apache-camel/pom.xml +++ b/apache-camel/pom.xml @@ -237,6 +237,10 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-google-calendar</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-google-drive</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/78ea3c9f/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 9d013e4..b9895a7 100644 --- a/apache-camel/src/main/descriptors/common-bin.xml +++ b/apache-camel/src/main/descriptors/common-bin.xml @@ -72,6 +72,7 @@ <include>org.apache.camel:camel-gae</include> <include>org.apache.camel:camel-geocoder</include> <include>org.apache.camel:camel-github</include> + <include>org.apache.camel:camel-google-calendar</include> <include>org.apache.camel:camel-google-drive</include> <include>org.apache.camel:camel-gora</include> <include>org.apache.camel:camel-groovy</include> http://git-wip-us.apache.org/repos/asf/camel/blob/78ea3c9f/components/camel-google-calendar/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-google-calendar/pom.xml b/components/camel-google-calendar/pom.xml index 0037924..b0804e3 100644 --- a/components/camel-google-calendar/pom.xml +++ b/components/camel-google-calendar/pom.xml @@ -49,7 +49,7 @@ <dependency> <groupId>com.google.apis</groupId> <artifactId>google-api-services-calendar</artifactId> - <version>v3-rev99-1.19.0</version> + <version>${google-api-services-calendar-version}</version> </dependency> <!-- Camel annotations in provided scope to avoid compile errors in IDEs --> @@ -64,7 +64,7 @@ <dependency> <groupId>com.google.apis</groupId> <artifactId>google-api-services-calendar</artifactId> - <version>v3-rev99-1.19.0</version> + <version>${google-api-services-calendar-version}</version> <classifier>javadoc</classifier> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/78ea3c9f/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 906d2db..b5cdcfc 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -176,6 +176,7 @@ <google-guava-version>18.0</google-guava-version> <google-api-client-version>1.19.0</google-api-client-version> <google-api-services-drive-version>v2-rev123-1.18.0-rc</google-api-services-drive-version> + <google-api-services-calendar-version>v3-rev99-1.19.0</google-api-services-calendar-version> <grizzly-websockets-version>2.3.17</grizzly-websockets-version> <groovy-version>2.3.7</groovy-version> <gson-version>2.3</gson-version> @@ -787,6 +788,11 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-google-calendar</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-google-drive</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/78ea3c9f/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 1e56bb0..d5a59cd 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -410,7 +410,21 @@ <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 name='camel-google-calendar' 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> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle> + <bundle dependency='true'>wrap:mvn:com.google.api-client/google-api-client/${google-api-client-version}</bundle> + <bundle dependency='true'>wrap:mvn:com.google.apis/google-api-services-calendar/${google-api-services-calendar-version}</bundle> + <bundle dependency='true'>wrap:mvn:com.google.http-client/google-http-client/${google-api-client-version}</bundle> + <bundle dependency='true'>wrap:mvn:com.google.http-client/google-http-client-jackson2/${google-api-client-version}</bundle> + <bundle dependency='true'>wrap:mvn:com.google.oauth-client/google-oauth-client/${google-api-client-version}</bundle> + <bundle dependency='true'>wrap:mvn:com.google.oauth-client/google-oauth-client-java6/${google-api-client-version}</bundle> + <bundle dependency='true'>wrap:mvn:com.google.oauth-client/google-oauth-client-jetty/${google-api-client-version}</bundle> + <bundle>mvn:org.apache.camel/camel-google-calendar/${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>