From 37945ced2e983e409594e1a39d503fa0086b230b Mon Sep 17 00:00:00 2001
From: Kirill Logachev <kirl@google.com>
Date: Wed, 20 May 2026 05:10:28 +0000
Subject: [PATCH 1/3] fix(bqjdbc): update shading to be more targeted

---
 .../google-cloud-bigquery-jdbc/pom.xml        | 59 ++++++++++++++++---
 1 file changed, 50 insertions(+), 9 deletions(-)

diff --git a/java-bigquery/google-cloud-bigquery-jdbc/pom.xml b/java-bigquery/google-cloud-bigquery-jdbc/pom.xml
index c62925b24415..33325773cad4 100644
--- a/java-bigquery/google-cloud-bigquery-jdbc/pom.xml
+++ b/java-bigquery/google-cloud-bigquery-jdbc/pom.xml
@@ -115,23 +115,64 @@
                   </transformers>
                   <relocations>
                     <relocation>
-                      <pattern>com</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com</shadedPattern>
+                      <pattern>com.google</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google</shadedPattern>
                       <excludes>
                         <exclude>com.google.cloud.bigquery.**</exclude>
                         <exclude>com.google.api.services.bigquery.**</exclude>
                       </excludes>
                     </relocation>
                     <relocation>
-                      <pattern>org</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.org</shadedPattern>
-                      <excludes>
-                        <exclude>org.conscrypt.*</exclude>
-                      </excludes>
+                      <pattern>com.fasterxml.jackson</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.fasterxml.jackson</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>org.apache</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.org.apache</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>org.checkerframework</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.org.checkerframework</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>org.codehaus</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.org.codehaus</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>org.jspecify</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.org.jspecify</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>org.threeten</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.org.threeten</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>org.json</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.org.json</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>org.slf4j</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.org.slf4j</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>io.grpc</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.io.grpc</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>io.netty</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.io.netty</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>io.opencensus</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.io.opencensus</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>io.opentelemetry</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.io.opentelemetry</shadedPattern>
                     </relocation>
                     <relocation>
-                      <pattern>io</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.io</shadedPattern>
+                      <pattern>io.perfmark</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.io.perfmark</shadedPattern>
                     </relocation>
                   </relocations>
                   <filters>

From ae13f283a65617a63c9578338537e895fd1640d3 Mon Sep 17 00:00:00 2001
From: Kirill Logachev <kirl@google.com>
Date: Wed, 20 May 2026 05:34:40 +0000
Subject: [PATCH 2/3] More updates

---
 .../google-cloud-bigquery-jdbc/pom.xml        | 120 +++++++++++++++++-
 1 file changed, 113 insertions(+), 7 deletions(-)

diff --git a/java-bigquery/google-cloud-bigquery-jdbc/pom.xml b/java-bigquery/google-cloud-bigquery-jdbc/pom.xml
index 33325773cad4..a903a393919a 100644
--- a/java-bigquery/google-cloud-bigquery-jdbc/pom.xml
+++ b/java-bigquery/google-cloud-bigquery-jdbc/pom.xml
@@ -88,7 +88,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-shade-plugin</artifactId>
-            <version>3.5.2</version> <!-- Use the latest version -->
+            <version>3.6.1</version>
             <executions>
               <execution>
                 <phase>package</phase>
@@ -97,6 +97,8 @@
                 </goals>
                 <configuration>
                   <shadedArtifactAttached>true</shadedArtifactAttached>
+                  <createSourcesJar>true</createSourcesJar>
+                  <shadeSourcesContent>true</shadeSourcesContent>
                   <shadedClassifierName>all</shadedClassifierName> <!-- Any name that makes sense -->
                   <createDependencyReducedPom>false</createDependencyReducedPom>
                   <archive>
@@ -115,12 +117,112 @@
                   </transformers>
                   <relocations>
                     <relocation>
-                      <pattern>com.google</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google</shadedPattern>
-                      <excludes>
-                        <exclude>com.google.cloud.bigquery.**</exclude>
-                        <exclude>com.google.api.services.bigquery.**</exclude>
-                      </excludes>
+                      <pattern>com.google.api.client</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google.api.client</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>com.google.api.core</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google.api.core</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>com.google.api.gax</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google.api.gax</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>com.google.api.pathtemplate</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google.api.pathtemplate</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>com.google.api.resourcenames</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google.api.resourcenames</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>com.google.apps</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google.apps</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>com.google.auth</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google.auth</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>com.google.auto</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google.auto</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>com.google.cloud.audit</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google.cloud.audit</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>com.google.cloud.http</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google.cloud.http</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>com.google.cloud.location</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google.cloud.location</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>com.google.cloud.spi</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google.cloud.spi</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>com.google.cloud.testing</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google.cloud.testing</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>com.google.common</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google.common</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>com.google.errorprone</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google.errorprone</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>com.google.flatbuffers</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google.flatbuffers</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>com.google.geo</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google.geo</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>com.google.gson</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google.gson</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>com.google.iam</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google.iam</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>com.google.j2objc</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google.j2objc</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>com.google.logging</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google.logging</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>com.google.longrunning</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google.longrunning</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>com.google.protobuf</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google.protobuf</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>com.google.rpc</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google.rpc</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>com.google.shopping</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google.shopping</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>com.google.thirdparty</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google.thirdparty</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>com.google.type</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google.type</shadedPattern>
                     </relocation>
                     <relocation>
                       <pattern>com.fasterxml.jackson</pattern>
@@ -187,6 +289,10 @@
                               <exclude>META-INF/*.DSA</exclude>
                               <exclude>META-INF/*.RSA</exclude>
                               <exclude>arrow-git.properties</exclude>
+                              <exclude>module-info.class</exclude>
+                              <exclude>META-INF/versions/*/module-info.class</exclude>
+                              <exclude>module-info.java</exclude>
+                              <exclude>META-INF/versions/*/module-info.java</exclude>
                           </excludes>
                       </filter>
                   </filters>

From a377827bae44493cccaccb169e5f3abb991ab2ef Mon Sep 17 00:00:00 2001
From: Kirill Logachev <kirl@google.com>
Date: Wed, 20 May 2026 23:22:17 +0000
Subject: [PATCH 3/3] feedback

---
 .../google-cloud-bigquery-jdbc/pom.xml        | 116 +-----------------
 1 file changed, 6 insertions(+), 110 deletions(-)

diff --git a/java-bigquery/google-cloud-bigquery-jdbc/pom.xml b/java-bigquery/google-cloud-bigquery-jdbc/pom.xml
index a903a393919a..aa27326df63e 100644
--- a/java-bigquery/google-cloud-bigquery-jdbc/pom.xml
+++ b/java-bigquery/google-cloud-bigquery-jdbc/pom.xml
@@ -117,112 +117,12 @@
                   </transformers>
                   <relocations>
                     <relocation>
-                      <pattern>com.google.api.client</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google.api.client</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.api.core</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google.api.core</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.api.gax</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google.api.gax</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.api.pathtemplate</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google.api.pathtemplate</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.api.resourcenames</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google.api.resourcenames</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.apps</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google.apps</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.auth</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google.auth</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.auto</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google.auto</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.cloud.audit</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google.cloud.audit</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.cloud.http</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google.cloud.http</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.cloud.location</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google.cloud.location</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.cloud.spi</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google.cloud.spi</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.cloud.testing</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google.cloud.testing</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.common</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google.common</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.errorprone</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google.errorprone</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.flatbuffers</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google.flatbuffers</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.geo</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google.geo</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.gson</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google.gson</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.iam</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google.iam</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.j2objc</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google.j2objc</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.logging</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google.logging</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.longrunning</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google.longrunning</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.protobuf</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google.protobuf</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.rpc</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google.rpc</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.shopping</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google.shopping</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.thirdparty</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google.thirdparty</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.google.type</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.com.google.type</shadedPattern>
+                      <pattern>com.google</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.com.google</shadedPattern>
+                      <excludes>
+                        <exclude>com.google.cloud.bigquery.**</exclude>
+                        <exclude>com.google.api.services.bigquery.**</exclude>
+                      </excludes>
                     </relocation>
                     <relocation>
                       <pattern>com.fasterxml.jackson</pattern>
@@ -252,10 +152,6 @@
                       <pattern>org.json</pattern>
                       <shadedPattern>com.google.bqjdbc.shaded.org.json</shadedPattern>
                     </relocation>
-                    <relocation>
-                      <pattern>org.slf4j</pattern>
-                      <shadedPattern>com.google.bqjdbc.shaded.org.slf4j</shadedPattern>
-                    </relocation>
                     <relocation>
                       <pattern>io.grpc</pattern>
                       <shadedPattern>com.google.bqjdbc.shaded.io.grpc</shadedPattern>