Skip to content
Snippets Groups Projects
Unverified Commit 17c3f739 authored by Jeff Evans's avatar Jeff Evans Committed by GitHub
Browse files

Fix google-api-client version from google driver (#19176)

* Fix google-api-client version from google driver

Update google-api-client version `1.30.7` -> `1.32.1`, so that `google-http-client` ends up as `1.39.2` to match the other drivers

Add explicit `google-http-client-jackson2` dependency for google driver since it's no longer included transitively for some strange reason, but the `:google` driver itself directly uses it

Add new CircleCI test run for multiple Google related drivers (to ensure there aren't cross-driver classpath issues)
parent 89ffe406
No related branches found
No related tags found
No related merge requests found
......@@ -736,6 +736,9 @@ jobs:
extra-env:
type: string
default: ""
test-args:
type: string
default: ""
executor: << parameters.e >>
steps:
- attach-workspace
......@@ -749,7 +752,9 @@ jobs:
name: Test << parameters.driver >> driver << parameters.description >>
environment:
DRIVERS: << parameters.driver >>
command: << parameters.extra-env >> clojure -X:dev:ci:ee:ee-dev:drivers:drivers-dev:test
command: >
<< parameters.extra-env >> clojure -X:dev:ci:ee:ee-dev:drivers:drivers-dev:test
<< parameters.test-args >>
no_output_timeout: << parameters.timeout >>
- store_test_results:
path: /home/circleci/metabase/metabase/target/junit
......@@ -1098,6 +1103,15 @@ workflows:
- be-tests-ee
driver: bigquery-cloud-sdk
- test-driver:
name: be-google-related-drivers-classpath-test
requires:
- be-tests-ee
driver: googleanalytics,bigquery,bigquery-cloud-sdk
test-args: >-
:only "[metabase.query-processor-test.expressions-test metabase.driver.google-test
metabase.driver.googleanalytics-test]"
- test-driver:
name: be-tests-druid-ee
requires:
......
......@@ -2,4 +2,11 @@
["src" "resources"]
:deps
{com.google.api-client/google-api-client {:mvn/version "1.30.7"}}}
;; ensure the version of google-http-client transitively depended on here matches that of bigquery-cloud-sdk
;; (which, at the moment, is 1.39.2)
{com.google.api-client/google-api-client {:mvn/version "1.32.1"}
;; for some reason, Google stopped depending on google-http-client-jackson2 from google-api-client somewhere between
;; 1.30.7 and 1.32.1, so we must explicitly bring it in because the google driver uses it directly
;; this version is closest to depending on Jackson 2.12.3, which is the version transitively depended on by
;; bigquery-cloud-sdk
com.google.http-client/google-http-client-jackson2 {:mvn/version "1.39.2-sp.1"}}}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment