From 38a49efe49ee36968bece6d61003f72025060b1e Mon Sep 17 00:00:00 2001
From: Kirill Logachev <kirl@google.com>
Date: Thu, 12 Mar 2026 23:19:48 +0000
Subject: [PATCH 1/3] fix(jdbc bq): unshade BQ SDK in uber jar

---
 java-bigquery/google-cloud-bigquery-jdbc/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-bigquery/google-cloud-bigquery-jdbc/pom.xml b/java-bigquery/google-cloud-bigquery-jdbc/pom.xml
index 7e538bf4a7e7..0e92e0ee750a 100644
--- a/java-bigquery/google-cloud-bigquery-jdbc/pom.xml
+++ b/java-bigquery/google-cloud-bigquery-jdbc/pom.xml
@@ -110,7 +110,7 @@
                       <pattern>com</pattern>
                       <shadedPattern>com.google.bqjdbc.shaded.com</shadedPattern>
                       <excludes>
-                        <exclude>com.google.cloud.bigquery.jdbc.*</exclude>
+                        <exclude>com.google.cloud.bigquery.*</exclude>
                       </excludes>
                     </relocation>
                     <relocation>

From 26fabd8761b91d5732979299a9f422fd5ec1be32 Mon Sep 17 00:00:00 2001
From: Kirill Logachev <kirl@google.com>
Date: Fri, 13 Mar 2026 18:42:45 +0000
Subject: [PATCH 2/3] Add api.services.bigquery

---
 java-bigquery/google-cloud-bigquery-jdbc/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/java-bigquery/google-cloud-bigquery-jdbc/pom.xml b/java-bigquery/google-cloud-bigquery-jdbc/pom.xml
index 0e92e0ee750a..f14b3ab38293 100644
--- a/java-bigquery/google-cloud-bigquery-jdbc/pom.xml
+++ b/java-bigquery/google-cloud-bigquery-jdbc/pom.xml
@@ -111,6 +111,7 @@
                       <shadedPattern>com.google.bqjdbc.shaded.com</shadedPattern>
                       <excludes>
                         <exclude>com.google.cloud.bigquery.*</exclude>
+                        <exclude>com.google.api.services.bigquery.*</exclude>
                       </excludes>
                     </relocation>
                     <relocation>

From cb59bcee60991b12e263820944c77b870b1941ae Mon Sep 17 00:00:00 2001
From: Kirill Logachev <kirl@google.com>
Date: Fri, 13 Mar 2026 19:38:25 +0000
Subject: [PATCH 3/3] fix to include all subpackages

---
 java-bigquery/google-cloud-bigquery-jdbc/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java-bigquery/google-cloud-bigquery-jdbc/pom.xml b/java-bigquery/google-cloud-bigquery-jdbc/pom.xml
index f14b3ab38293..cd947ee3c19a 100644
--- a/java-bigquery/google-cloud-bigquery-jdbc/pom.xml
+++ b/java-bigquery/google-cloud-bigquery-jdbc/pom.xml
@@ -110,8 +110,8 @@
                       <pattern>com</pattern>
                       <shadedPattern>com.google.bqjdbc.shaded.com</shadedPattern>
                       <excludes>
-                        <exclude>com.google.cloud.bigquery.*</exclude>
-                        <exclude>com.google.api.services.bigquery.*</exclude>
+                        <exclude>com.google.cloud.bigquery.**</exclude>
+                        <exclude>com.google.api.services.bigquery.**</exclude>
                       </excludes>
                     </relocation>
                     <relocation>