add google api properties
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fac889f2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fac889f2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fac889f2 Branch: refs/heads/master Commit: fac889f2b1bdb71a0d89f02c1adf7e1a1cf55792 Parents: 556e275 Author: Jonathan Anstey <jans...@gmail.com> Authored: Tue Sep 2 16:25:42 2014 -0230 Committer: Jonathan Anstey <jans...@gmail.com> Committed: Mon Sep 8 09:06:09 2014 -0230 ---------------------------------------------------------------------- components/camel-google-drive/pom.xml | 20 +++++++------------- parent/pom.xml | 2 ++ .../features/src/main/resources/features.xml | 14 +++++++------- 3 files changed, 16 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/fac889f2/components/camel-google-drive/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-google-drive/pom.xml b/components/camel-google-drive/pom.xml index e42c35d..a0779e3 100644 --- a/components/camel-google-drive/pom.xml +++ b/components/camel-google-drive/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.apache.camel</groupId> - <artifactId>camel-google-drive-parent</artifactId> + <artifactId>components</artifactId> <version>2.14-SNAPSHOT</version> </parent> @@ -13,7 +13,6 @@ <packaging>bundle</packaging> <name>Camel GoogleDrive Component</name> <description>Camel Component for GoogleDrive</description> - <url>http://www.myorganization.org</url> <properties> <schemeName>google-drive</schemeName> @@ -28,34 +27,33 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-core</artifactId> - <version>2.14-SNAPSHOT</version> </dependency> <dependency> <groupId>com.google.api-client</groupId> <artifactId>google-api-client</artifactId> - <version>1.18.0-rc</version> + <version>${google-api-client-version}</version> </dependency> <dependency> <groupId>com.google.oauth-client</groupId> <artifactId>google-oauth-client-jetty</artifactId> - <version>1.18.0-rc</version> + <version>${google-api-client-version}</version> </dependency> <dependency> <groupId>com.google.http-client</groupId> <artifactId>google-http-client-jackson2</artifactId> - <version>1.18.0-rc</version> + <version>${google-api-client-version}</version> </dependency> <dependency> <groupId>com.google.apis</groupId> <artifactId>google-api-services-drive</artifactId> - <version>v2-rev123-1.18.0-rc</version> + <version>${google-api-services-drive-version}</version> </dependency> <!-- Camel annotations in provided scope to avoid compile errors in IDEs --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>spi-annotations</artifactId> - <version>2.14-SNAPSHOT</version> + <version>2.14-SNAPSHOT</version> <scope>provided</scope> </dependency> @@ -63,7 +61,7 @@ <dependency> <groupId>com.google.apis</groupId> <artifactId>google-api-services-drive</artifactId> - <version>v2-rev123-1.18.0-rc</version> + <version>${google-api-services-drive-version}</version> <classifier>javadoc</classifier> <scope>provided</scope> </dependency> @@ -72,18 +70,15 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.7</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.7.7</version> <scope>test</scope> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.17</version> <scope>test</scope> </dependency> @@ -91,7 +86,6 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test</artifactId> - <version>2.14-SNAPSHOT</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/fac889f2/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index b208cc4..181041c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -170,6 +170,8 @@ <google-gdata-version>1.41.5.w1</google-gdata-version> <google-gdata-bundle-version>1.41.1_1</google-gdata-bundle-version> <google-guava-version>17.0</google-guava-version> + <google-api-client-version>1.18.0-rc</google-api-client-version> + <google-api-services-drive-version>v2-rev123-1.18.0-rc</google-api-services-drive-version> <groovy-version>2.3.6</groovy-version> <gson-version>2.2.4</gson-version> <guice-bundle-version>3.0_1</guice-bundle-version> http://git-wip-us.apache.org/repos/asf/camel/blob/fac889f2/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 0d9a2b0..53759d6 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -400,13 +400,13 @@ <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/1.18.0-rc</bundle> - <bundle dependency='true'>wrap:mvn:com.google.apis/google-api-services-drive/v2-rev123-1.18.0-rc</bundle> - <bundle dependency='true'>wrap:mvn:com.google.http-client/google-http-client/1.18.0-rc</bundle> - <bundle dependency='true'>wrap:mvn:com.google.http-client/google-http-client-jackson2/1.18.0-rc</bundle> - <bundle dependency='true'>wrap:mvn:com.google.oauth-client/google-oauth-client/1.18.0-rc</bundle> - <bundle dependency='true'>wrap:mvn:com.google.oauth-client/google-oauth-client-java6/1.18.0-rc</bundle> - <bundle dependency='true'>wrap:mvn:com.google.oauth-client/google-oauth-client-jetty/1.18.0-rc</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-drive/${google-api-services-drive-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-drive/${project.version}</bundle> </feature> <feature name='camel-groovy' version='${project.version}' resolver='(obr)' start-level='50'>
