From eb683dd8f210cf00e76741c88105115b82a9761f Mon Sep 17 00:00:00 2001 From: Kirill Logachev Date: Fri, 16 Jan 2026 02:04:28 +0000 Subject: [PATCH 01/11] Add jdbc module --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2929f8a9f..96dc64f46 100644 --- a/pom.xml +++ b/pom.xml @@ -153,6 +153,7 @@ google-cloud-bigquery google-cloud-bigquery-bom + google-cloud-bigquery-jdbc @@ -259,4 +260,3 @@ - From 8e4852f7d8c57ea5ad6c6ca01aba8058385bca04 Mon Sep 17 00:00:00 2001 From: Kirill Logachev Date: Fri, 16 Jan 2026 18:41:17 +0000 Subject: [PATCH 02/11] exclude jdbc from kokoro --- .kokoro/build.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 084b07b25..80522607b 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -61,6 +61,7 @@ javadoc) ;; integration) mvn -B ${INTEGRATION_TEST_ARGS} \ + -p "!google-cloud-bigquery-jdbc" \ -ntp \ -Penable-integration-tests \ -DtrimStackTrace=false \ @@ -72,7 +73,11 @@ integration) ;; graalvm) # Run Unit and Integration Tests with Native Image - mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test + mvn -B ${INTEGRATION_TEST_ARGS} \ + -p "!google-cloud-bigquery-jdbc" \ + -ntp \ + -Pnative \ + test RETURN_CODE=$? ;; samples) From 08e64560b0c48a62ee29326116d425f1ae73168c Mon Sep 17 00:00:00 2001 From: Kirill Logachev Date: Fri, 16 Jan 2026 18:45:49 +0000 Subject: [PATCH 03/11] Fix parameter --- .kokoro/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 80522607b..dbe47dae2 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -61,7 +61,7 @@ javadoc) ;; integration) mvn -B ${INTEGRATION_TEST_ARGS} \ - -p "!google-cloud-bigquery-jdbc" \ + -pl "!google-cloud-bigquery-jdbc" \ -ntp \ -Penable-integration-tests \ -DtrimStackTrace=false \ @@ -74,7 +74,7 @@ integration) graalvm) # Run Unit and Integration Tests with Native Image mvn -B ${INTEGRATION_TEST_ARGS} \ - -p "!google-cloud-bigquery-jdbc" \ + -pl "!google-cloud-bigquery-jdbc" \ -ntp \ -Pnative \ test From e4ff58b46b15905bbce5107bcb1dc017ae995809 Mon Sep 17 00:00:00 2001 From: Kirill Logachev Date: Fri, 16 Jan 2026 19:11:50 +0000 Subject: [PATCH 04/11] Add jdbc presubmit --- .cloudbuild/jdbc_presubmit.yaml | 41 +++++++++++++++++++++++++++++++++ .kokoro/build.sh | 13 +++++++++++ 2 files changed, 54 insertions(+) create mode 100644 .cloudbuild/jdbc_presubmit.yaml diff --git a/.cloudbuild/jdbc_presubmit.yaml b/.cloudbuild/jdbc_presubmit.yaml new file mode 100644 index 000000000..c5896967e --- /dev/null +++ b/.cloudbuild/jdbc_presubmit.yaml @@ -0,0 +1,41 @@ +# Copyright 2026 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# Github action job to test core java library features on +# downstream client libraries before they are released. +options: + workerPool: 'projects/bigquery-devtools-drivers/locations/us-east1/workerPools/java-bigquery-jdbc-pool' + dynamic_substitutions: true + logging: CLOUD_LOGGING_ONLY + +substitutions: + _JOB_TYPE: "jdbc-integration" + +timeout: 2000s +steps: +- name: 'gcr.io/cloud-devrel-public-resources/java11' + id: "IT Tests" + timeout: 2000s + entrypoint: 'bash' + args: ['.kokoro/build.sh'] + env: + - 'JOB_TYPE=${_JOB_TYPE}' + secretEnv: ['SA_EMAIL', 'KMS_RESOURCE_PATH', 'SA_SECRET'] +availableSecrets: + secretManager: + - versionName: projects/$PROJECT_ID/secrets/jdbc-presubmit-sa-email/versions/latest + env: 'SA_EMAIL' + - versionName: projects/$PROJECT_ID/secrets/kms_resource_path/versions/latest + env: 'KMS_RESOURCE_PATH' + - versionName: projects/$PROJECT_ID/secrets/GoogleJDBCServiceAccountSecret/versions/latest + env: 'SA_SECRET' diff --git a/.kokoro/build.sh b/.kokoro/build.sh index dbe47dae2..f5204346f 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -71,6 +71,19 @@ integration) verify RETURN_CODE=$? ;; +jdbc-integration) + mvn -B ${INTEGRATION_TEST_ARGS} \ + -pl "google-cloud-bigquery-jdbc" \ + -ntp \ + -Dtest=ITBigQueryJDBCTest \ + -Penable-integration-tests \ + -DtrimStackTrace=false \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -fae \ + verify + RETURN_CODE=$? + ;; graalvm) # Run Unit and Integration Tests with Native Image mvn -B ${INTEGRATION_TEST_ARGS} \ From fb079a118dcc82a3f31970dbd4ba8c8faee03455 Mon Sep 17 00:00:00 2001 From: Kirill Logachev Date: Fri, 16 Jan 2026 20:09:16 +0000 Subject: [PATCH 05/11] Reorder parameters --- .kokoro/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index f5204346f..23e1e2e00 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -75,8 +75,8 @@ jdbc-integration) mvn -B ${INTEGRATION_TEST_ARGS} \ -pl "google-cloud-bigquery-jdbc" \ -ntp \ - -Dtest=ITBigQueryJDBCTest \ -Penable-integration-tests \ + -Dtest=ITBigQueryJDBCTest \ -DtrimStackTrace=false \ -Dclirr.skip=true \ -Denforcer.skip=true \ From 6eec093e42523eafd2f10b6d47adc47f9bb3b210 Mon Sep 17 00:00:00 2001 From: Kirill Logachev Date: Fri, 16 Jan 2026 20:24:15 +0000 Subject: [PATCH 06/11] Add nightly tests --- .cloudbuild/jdbc_nightly.yaml | 46 +++++++++++++++++++++++++++++++++++ .kokoro/build.sh | 15 +++++++++++- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 .cloudbuild/jdbc_nightly.yaml diff --git a/.cloudbuild/jdbc_nightly.yaml b/.cloudbuild/jdbc_nightly.yaml new file mode 100644 index 000000000..bd3dc2ce5 --- /dev/null +++ b/.cloudbuild/jdbc_nightly.yaml @@ -0,0 +1,46 @@ +# Copyright 2026 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# Github action job to test core java library features on +# downstream client libraries before they are released. +options: + workerPool: 'projects/bigquery-devtools-drivers/locations/us-east1/workerPools/java-bigquery-jdbc-pool' + dynamic_substitutions: true + logging: CLOUD_LOGGING_ONLY + +timeout: 10000s +steps: +- name: 'gcr.io/cloud-devrel-public-resources/java11' + id: "IT Tests" + timeout: 10000s + entrypoint: 'bash' + args: ['.kokoro/build.sh'] + env: + - 'JOB_TYPE=jdbc-integration' + secretEnv: ['SA_EMAIL', 'KMS_RESOURCE_PATH', 'SA_SECRET'] +- name: 'gcr.io/cloud-devrel-public-resources/java11' + id: "IT Nightly Tests" + timeout: 10000s + entrypoint: 'bash' + args: ['.kokoro/build.sh'] + env: + - 'JOB_TYPE=jdbc-nightly-integration' + +availableSecrets: + secretManager: + - versionName: projects/$PROJECT_ID/secrets/jdbc-presubmit-sa-email/versions/latest + env: 'SA_EMAIL' + - versionName: projects/$PROJECT_ID/secrets/kms_resource_path/versions/latest + env: 'KMS_RESOURCE_PATH' + - versionName: projects/$PROJECT_ID/secrets/GoogleJDBCServiceAccountSecret/versions/latest + env: 'SA_SECRET' diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 23e1e2e00..0e1267af4 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -75,7 +75,6 @@ jdbc-integration) mvn -B ${INTEGRATION_TEST_ARGS} \ -pl "google-cloud-bigquery-jdbc" \ -ntp \ - -Penable-integration-tests \ -Dtest=ITBigQueryJDBCTest \ -DtrimStackTrace=false \ -Dclirr.skip=true \ @@ -84,6 +83,20 @@ jdbc-integration) verify RETURN_CODE=$? ;; +jdbc-nightly-integration) + mvn -B ${INTEGRATION_TEST_ARGS} \ + -pl "google-cloud-bigquery-jdbc" \ + -ntp \ + -Dtest=ITNightlyBigQueryTest \ + -DtrimStackTrace=false \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -fae \ + -DargLine="-Xmx32g" \ + -e \ + verify + RETURN_CODE=$? + ;; graalvm) # Run Unit and Integration Tests with Native Image mvn -B ${INTEGRATION_TEST_ARGS} \ From d5e799e3695315cc28bb273187bec158e0272526 Mon Sep 17 00:00:00 2001 From: Kirill Logachev Date: Fri, 16 Jan 2026 21:30:14 +0000 Subject: [PATCH 07/11] Ignore jdbc for dependencies analysis --- google-cloud-bigquery-jdbc/pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/google-cloud-bigquery-jdbc/pom.xml b/google-cloud-bigquery-jdbc/pom.xml index 677437794..62f51de5f 100644 --- a/google-cloud-bigquery-jdbc/pom.xml +++ b/google-cloud-bigquery-jdbc/pom.xml @@ -55,6 +55,18 @@ jacoco-maven-plugin 0.8.13 + + org.apache.maven.plugins + maven-dependency-plugin + + + com.google.* + org.apache.arrow + org.apache.httpcomponents.* + io.grpc + + + From 1599b08d3c16d087ffdd069e5052f773141f99da Mon Sep 17 00:00:00 2001 From: Kirill Logachev Date: Fri, 16 Jan 2026 22:04:31 +0000 Subject: [PATCH 08/11] Add jdbc version --- google-cloud-bigquery-jdbc/pom.xml | 2 +- versions.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/google-cloud-bigquery-jdbc/pom.xml b/google-cloud-bigquery-jdbc/pom.xml index 62f51de5f..c5e16d8a5 100644 --- a/google-cloud-bigquery-jdbc/pom.xml +++ b/google-cloud-bigquery-jdbc/pom.xml @@ -20,7 +20,7 @@ 4.0.0 com.google.cloud google-cloud-bigquery-jdbc - 0.1.0-SNAPSHOT + 0.1.0-SNAPSHOT jar BigQuery JDBC https://github.com/googleapis/java-bigquery-jdbc diff --git a/versions.txt b/versions.txt index 507619351..90b1b1a9b 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,5 @@ # Format: # module:released-version:current-version -google-cloud-bigquery:2.57.1:2.57.2-SNAPSHOT \ No newline at end of file +google-cloud-bigquery:2.57.1:2.57.2-SNAPSHOT +google-cloud-bigquery-jdbc:0.1.0:0.1.1-SNAPSHOT From 4bf7babdfe72849a9ab97630e53a1e4e457ca59f Mon Sep 17 00:00:00 2001 From: Kirill Logachev Date: Fri, 16 Jan 2026 23:12:09 +0000 Subject: [PATCH 09/11] Gemini review --- .kokoro/build.sh | 2 +- google-cloud-bigquery-jdbc/pom.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 0e1267af4..9c1dfeeb3 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -96,7 +96,7 @@ jdbc-nightly-integration) -e \ verify RETURN_CODE=$? - ;; + ;; graalvm) # Run Unit and Integration Tests with Native Image mvn -B ${INTEGRATION_TEST_ARGS} \ diff --git a/google-cloud-bigquery-jdbc/pom.xml b/google-cloud-bigquery-jdbc/pom.xml index c5e16d8a5..1f0b10d48 100644 --- a/google-cloud-bigquery-jdbc/pom.xml +++ b/google-cloud-bigquery-jdbc/pom.xml @@ -60,10 +60,10 @@ maven-dependency-plugin - com.google.* - org.apache.arrow - org.apache.httpcomponents.* - io.grpc + com.google.*:* + org.apache.arrow:* + org.apache.httpcomponents.*:* + io.grpc:* From 7132e7fda2b5e262ea260ce60805b18118e99afa Mon Sep 17 00:00:00 2001 From: Kirill Logachev Date: Wed, 21 Jan 2026 01:59:14 +0000 Subject: [PATCH 10/11] Review feedback --- google-cloud-bigquery-jdbc/pom.xml | 113 ++++++++++++++++++++++++++++- versions.txt | 2 +- 2 files changed, 113 insertions(+), 2 deletions(-) diff --git a/google-cloud-bigquery-jdbc/pom.xml b/google-cloud-bigquery-jdbc/pom.xml index ae923330a..2a52eb497 100644 --- a/google-cloud-bigquery-jdbc/pom.xml +++ b/google-cloud-bigquery-jdbc/pom.xml @@ -20,7 +20,7 @@ 4.0.0 com.google.cloud google-cloud-bigquery-jdbc - 0.1.0-SNAPSHOT + 0.1.0 jar BigQuery JDBC https://github.com/googleapis/java-bigquery-jdbc @@ -98,6 +98,117 @@ + + + + com.google.api + api-common + 2.56.1 + + + com.google.api + gax + 2.73.1 + + + com.google.api + gax-grpc + 2.73.1 + + + com.google.api.grpc + proto-google-cloud-bigquerystorage-v1 + 3.19.1 + + + + com.google.auth + google-auth-library-oauth2-http + 1.41.0 + + + com.google.auth + google-auth-library-credentials + 1.41.0 + + + + com.google.cloud + google-cloud-core + 2.63.1 + + + com.google.cloud + google-cloud-core-http + 2.63.1 + + + + com.google.code.findbugs + jsr305 + 3.0.2 + + + com.google.code.gson + gson + 2.12.1 + + + + com.google.guava + guava + 33.5.0-jre + + + + com.google.protobuf + protobuf-java + 3.25.8 + + + com.google.http-client + google-http-client + 2.0.3 + + + + io.grpc + grpc-api + 1.76.2 + + + io.grpc + grpc-core + 1.76.2 + + + io.grpc + grpc-netty-shaded + 1.76.2 + + + + + org.apache.arrow + arrow-vector + 17.0.0 + + + org.apache.arrow + arrow-memory-core + 17.0.0 + + + org.apache.httpcomponents.client5 + httpclient5 + 5.3.1 + + + org.apache.httpcomponents.core5 + httpcore5 + 5.2.5 + + com.google.truth diff --git a/versions.txt b/versions.txt index 82e8884b7..8f898d85e 100644 --- a/versions.txt +++ b/versions.txt @@ -2,4 +2,4 @@ # module:released-version:current-version google-cloud-bigquery:2.57.2:2.57.2 -google-cloud-bigquery-jdbc:0.1.0:0.1.1-SNAPSHOT +google-cloud-bigquery-jdbc:0.1.0:0.1.0 From 3bc758b8eab1b5b36a9c13656b0f9396e6264f71 Mon Sep 17 00:00:00 2001 From: Kirill Logachev Date: Wed, 21 Jan 2026 17:16:59 +0000 Subject: [PATCH 11/11] Cleanup versions --- google-cloud-bigquery-jdbc/pom.xml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/google-cloud-bigquery-jdbc/pom.xml b/google-cloud-bigquery-jdbc/pom.xml index 2a52eb497..74fc627e2 100644 --- a/google-cloud-bigquery-jdbc/pom.xml +++ b/google-cloud-bigquery-jdbc/pom.xml @@ -103,110 +103,90 @@ com.google.api api-common - 2.56.1 com.google.api gax - 2.73.1 com.google.api gax-grpc - 2.73.1 com.google.api.grpc proto-google-cloud-bigquerystorage-v1 - 3.19.1 com.google.auth google-auth-library-oauth2-http - 1.41.0 com.google.auth google-auth-library-credentials - 1.41.0 com.google.cloud google-cloud-core - 2.63.1 com.google.cloud google-cloud-core-http - 2.63.1 com.google.code.findbugs jsr305 - 3.0.2 com.google.code.gson gson - 2.12.1 com.google.guava guava - 33.5.0-jre com.google.protobuf protobuf-java - 3.25.8 com.google.http-client google-http-client - 2.0.3 io.grpc grpc-api - 1.76.2 io.grpc grpc-core - 1.76.2 io.grpc grpc-netty-shaded - 1.76.2 org.apache.arrow arrow-vector - 17.0.0 org.apache.arrow arrow-memory-core - 17.0.0 org.apache.httpcomponents.client5 httpclient5 - 5.3.1 org.apache.httpcomponents.core5 httpcore5 - 5.2.5