From ebb3a5514d3fbd82f16dcfd625b40941f12d35f1 Mon Sep 17 00:00:00 2001
From: Yi Hu <yathu@google.com>
Date: Wed, 29 Jan 2025 18:07:07 -0500
Subject: [PATCH] Do not generate shaded jar for common modules

---
 pom.xml                           | 2 +-
 v2/bigtable-common/pom.xml        | 1 +
 v2/cdc-parent/cdc-agg/pom.xml     | 3 +++
 v2/cdc-parent/cdc-common/pom.xml  | 3 +++
 v2/common/pom.xml                 | 1 +
 v2/datastream-common/pom.xml      | 1 +
 v2/jdbc-common/pom.xml            | 3 +++
 v2/kafka-common/pom.xml           | 3 +++
 v2/pom.xml                        | 2 +-
 v2/spanner-custom-shard/pom.xml   | 3 +++
 v2/spanner-migrations-sdk/pom.xml | 3 +++
 11 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2ea969ac7e..4e3956f85a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
     <extra.enforcer.rules.version>1.8.0</extra.enforcer.rules.version>
     <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
     <maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
-    <maven-shade-plugin.version>3.0.0</maven-shade-plugin.version>
+    <maven-shade-plugin.version>3.3.0</maven-shade-plugin.version>
     <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
     <os-maven-plugin.version>1.7.1</os-maven-plugin.version>
     <jacoco.version>0.8.8</jacoco.version>
diff --git a/v2/bigtable-common/pom.xml b/v2/bigtable-common/pom.xml
index 9fdd3d04a7..d4a4c2d189 100644
--- a/v2/bigtable-common/pom.xml
+++ b/v2/bigtable-common/pom.xml
@@ -27,6 +27,7 @@
 
     <properties>
         <bigtable.version>2.11.0</bigtable.version>
+        <skipShade>true</skipShade>
     </properties>
 
     <dependencies>
diff --git a/v2/cdc-parent/cdc-agg/pom.xml b/v2/cdc-parent/cdc-agg/pom.xml
index 4cacd7f208..fb180ad25d 100644
--- a/v2/cdc-parent/cdc-agg/pom.xml
+++ b/v2/cdc-parent/cdc-agg/pom.xml
@@ -23,6 +23,9 @@
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>cdc-agg</artifactId>
+  <properties>
+    <skipShade>true</skipShade>
+  </properties>
   <inceptionYear>2019</inceptionYear>
   <licenses>
     <license>
diff --git a/v2/cdc-parent/cdc-common/pom.xml b/v2/cdc-parent/cdc-common/pom.xml
index 457b29d755..fa83f9f347 100644
--- a/v2/cdc-parent/cdc-common/pom.xml
+++ b/v2/cdc-parent/cdc-common/pom.xml
@@ -23,6 +23,9 @@
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>cdc-common</artifactId>
+  <properties>
+    <skipShade>true</skipShade>
+  </properties>
   <packaging>jar</packaging>
   <inceptionYear>2019</inceptionYear>
   <licenses>
diff --git a/v2/common/pom.xml b/v2/common/pom.xml
index a16b48e17a..a81de81e37 100644
--- a/v2/common/pom.xml
+++ b/v2/common/pom.xml
@@ -31,6 +31,7 @@
         <commons-text.version>1.10.0</commons-text.version>
         <nashorn.version>15.4</nashorn.version>
         <truth-proto-extension.version>1.0.1</truth-proto-extension.version>
+        <skipShade>true</skipShade>
     </properties>
 
     <dependencies>
diff --git a/v2/datastream-common/pom.xml b/v2/datastream-common/pom.xml
index 0a3b7eb352..ee40219a87 100644
--- a/v2/datastream-common/pom.xml
+++ b/v2/datastream-common/pom.xml
@@ -26,6 +26,7 @@
     <artifactId>datastream-common</artifactId>
 
     <properties>
+        <skipShade>true</skipShade>
     </properties>
 
     <dependencies>
diff --git a/v2/jdbc-common/pom.xml b/v2/jdbc-common/pom.xml
index 4e4be284b2..8cffef49a6 100644
--- a/v2/jdbc-common/pom.xml
+++ b/v2/jdbc-common/pom.xml
@@ -27,6 +27,9 @@
   </parent>
 
   <artifactId>jdbc-common</artifactId>
+  <properties>
+    <skipShade>true</skipShade>
+  </properties>
 
   <dependencies>
     <dependency>
diff --git a/v2/kafka-common/pom.xml b/v2/kafka-common/pom.xml
index 462cef4b15..0a2b8a1ccb 100644
--- a/v2/kafka-common/pom.xml
+++ b/v2/kafka-common/pom.xml
@@ -22,6 +22,9 @@
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>kafka-common</artifactId>
+  <properties>
+    <skipShade>true</skipShade>
+  </properties>
   <modelVersion>4.0.0</modelVersion>
 
   <dependencies>
diff --git a/v2/pom.xml b/v2/pom.xml
index f99075b664..ad5b9cfadf 100644
--- a/v2/pom.xml
+++ b/v2/pom.xml
@@ -490,13 +490,13 @@
                                     <goal>shade</goal>
                                 </goals>
                                 <configuration>
+                                    <skip>${skipShade}</skip>
                                     <extraDirectories>
                                         <paths>
                                             <path>${project.build.directory}/extra_libs</path>
                                         </paths>
                                     </extraDirectories>
                                     <createDependencyReducedPom>false</createDependencyReducedPom>
-                                    <shadeTestJar>true</shadeTestJar>
                                     <artifactSet>
                                         <excludes>
                                             <exclude>org.conscrypt:conscrypt-openjdk-uber</exclude>
diff --git a/v2/spanner-custom-shard/pom.xml b/v2/spanner-custom-shard/pom.xml
index ecf3d0fd84..8f61494d18 100644
--- a/v2/spanner-custom-shard/pom.xml
+++ b/v2/spanner-custom-shard/pom.xml
@@ -26,6 +26,9 @@
     </parent>
 
     <artifactId>spanner-custom-shard</artifactId>
+    <properties>
+        <skipShade>true</skipShade>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>com.google.cloud.teleport.v2</groupId>
diff --git a/v2/spanner-migrations-sdk/pom.xml b/v2/spanner-migrations-sdk/pom.xml
index 8c900a4d2c..27cf7784b9 100644
--- a/v2/spanner-migrations-sdk/pom.xml
+++ b/v2/spanner-migrations-sdk/pom.xml
@@ -26,6 +26,9 @@
     </parent>
 
     <artifactId>spanner-migrations-sdk</artifactId>
+    <properties>
+        <skipShade>true</skipShade>
+    </properties>
     <build>
         <plugins>
             <plugin>