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 2020/11/25 13:06:48 UTC
[camel-karaf] branch master updated: CAMEL-15873: Update
camel-google-bigquery feature to align with component dependnecy upgrades
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/master by this push:
new 5c9c36c CAMEL-15873: Update camel-google-bigquery feature to align with component dependnecy upgrades
5c9c36c is described below
commit 5c9c36cccdaaa474665967907133a032c157ddf9
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Nov 25 09:16:25 2020 +0000
CAMEL-15873: Update camel-google-bigquery feature to align with component dependnecy upgrades
---
.../karaf/features/src/main/resources/features.xml | 39 ++++++++++++++++------
pom.xml | 15 ++++++++-
2 files changed, 43 insertions(+), 11 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 776bf0d..1498c92 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1125,19 +1125,38 @@
</feature>
<feature name='camel-google-bigquery' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>wrap:mvn:com.google.apis/google-api-services-bigquery/${google-api-services-bigquery-version}</bundle>
- <bundle dependency='true'>wrap:mvn:com.google.api-client/google-api-client/${google-api-client-version}</bundle>
- <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-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 dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.google.api/api-common/${google-cloud-api-common-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.google.api-client/google-api-client/${google-cloud-api-client-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.google.api/gax/${google-cloud-gax-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.google.api/gax-httpjson/${google-cloud-gax-httpjson-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.google.api.grpc/proto-google-common-protos/${google-cloud-common-protos-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.google.api.grpc/proto-google-iam-v1/${google-cloud-iam-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.google.apis/google-api-services-bigquery/${google-api-services-bigquery}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.google.auth/google-auth-library-credentials/${google-cloud-auth-library-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.google.auth/google-auth-library-oauth2-http/${google-cloud-auth-library-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.google.cloud/google-cloud-bigquery/${google-cloud-bigquery-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.google.cloud/google-cloud-core/${google-cloud-core-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.google.cloud/google-cloud-core-http/${google-cloud-core-version}</bundle>
+ <bundle dependency='true'>mvn:com.google.code.findbugs/jsr305/${google-findbugs-jsr305-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.google.code.gson/gson/${gson-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.google.http-client/google-http-client/${google-cloud-http-client-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.google.http-client/google-http-client-appengine/${google-cloud-http-client-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.google.http-client/google-http-client-jackson2/${google-cloud-http-client-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.google.oauth-client/google-oauth-client/${google-cloud-oauth-client-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.google.protobuf/protobuf-java-util/${protobuf-version}</bundle>
+ <bundle dependency='true'>mvn:com.google.guava/guava/${google-cloud-guava-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.google.guava/failureaccess/1.0.1</bundle>
+ <bundle dependency='true'>wrap:mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle>
+ <bundle dependency='true'>mvn:commons-logging/commons-logging/${commons-logging-version}</bundle>
+ <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:io.opencensus/opencensus-api/${opencensus-api-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:io.opencensus/opencensus-contrib-http-util/${opencensus-api-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
- <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.grpc/${grpc-bundle-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.threeten/threetenbp/${google-cloud-threetenbp-version}</bundle>
<bundle>mvn:org.apache.camel/camel-google-bigquery/${project.version}</bundle>
</feature>
<feature name='camel-google-calendar' version='${project.version}' start-level='50'>
diff --git a/pom.xml b/pom.xml
index c0a8899..939964a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,6 +161,20 @@
<fastjson-bundle-version>1.2.73_1</fastjson-bundle-version>
<fop-bundle-version>2.3_1</fop-bundle-version>
<generex-bundle-version>1.0.2_1</generex-bundle-version>
+ <!-- These google properties align versions defined in com.google.cloud:libraries-bom used in camel -->
+ <google-api-services-bigquery>v2-rev20201030-1.30.10</google-api-services-bigquery>
+ <google-cloud-api-client-version>1.30.11</google-cloud-api-client-version>
+ <google-cloud-api-common-version>1.10.1</google-cloud-api-common-version>
+ <google-cloud-auth-library-version>0.22.0</google-cloud-auth-library-version>
+ <google-cloud-bigquery-version>1.124.7</google-cloud-bigquery-version>
+ <google-cloud-core-version>1.93.10</google-cloud-core-version>
+ <google-cloud-gax-version>1.60.0</google-cloud-gax-version>
+ <google-cloud-gax-httpjson-version>0.77.0</google-cloud-gax-httpjson-version>
+ <google-cloud-http-client-version>1.38.0</google-cloud-http-client-version>
+ <google-cloud-oauth-client-version>1.31.1</google-cloud-oauth-client-version>
+ <google-cloud-common-protos-version>2.0.1</google-cloud-common-protos-version>
+ <google-cloud-iam-version>1.0.3</google-cloud-iam-version>
+ <google-cloud-threetenbp-version>1.5.0</google-cloud-threetenbp-version>
<google-truth-version>0.30</google-truth-version>
<groovy-version>3.0.3</groovy-version>
<grpc-bundle-version>1.28.0_1</grpc-bundle-version>
@@ -256,7 +270,6 @@
<stringtemplate-bundle-version>4.0.8_1</stringtemplate-bundle-version>
<tagsoup-bundle-version>1.2.1_1</tagsoup-bundle-version>
<testcontainers-version>1.13.0</testcontainers-version>
- <threetenbp-version>1.4.0</threetenbp-version>
<tinybundles-version>2.1.1</tinybundles-version>
<typesafe-config>1.3.4</typesafe-config>
<twitter4j-bundle-version>4.0.7_1</twitter4j-bundle-version>