From 87ad7edd2b8bfe0fdf814ff2761661e4fc4eb6fd Mon Sep 17 00:00:00 2001
From: Tomo Suzuki <suztomo@google.com>
Date: Tue, 26 Aug 2025 10:31:46 -0400
Subject: [PATCH 1/2] ci: fix the pom.xml for Central API

New Maven Central API has more strict pom.xml validation than the
old Maven publication. Let's fix the problem:

```
{
  "pkg:maven/com.google.cloud.bigtable/bigtable-hbase-1.x-shaded@2.15.3": [
    "Project name is missing",
    "Dependency management dependency version information is missing for dependency: org.conscrypt:conscrypt-openjdk-uber",
    "Dependency management dependency version information is missing for dependency: org.conscrypt:conscrypt-openjdk",
    "Dependency management dependency version information is missing for dependency: javax.annotation:javax.annotation-api",
    "Dependency management dependency version information is missing for dependency: org.checkerframework:checker-qual",
    "Dependency management dependency version information is missing for dependency: com.google.code.findbugs:jsr305"
  ],
  "pkg:maven/com.google.cloud.bigtable/bigtable-hbase-1.x-hadoop@2.15.3": [
    "Project name is missing"
  ],
  "pkg:maven/com.google.cloud.bigtable/bigtable-hbase-2.x-shaded@2.15.3": [
    "Project name is missing",
    "Dependency management dependency version information is missing for dependency: org.conscrypt:conscrypt-openjdk-uber",
    "Dependency management dependency version information is missing for dependency: org.conscrypt:conscrypt-openjdk",
    "Dependency management dependency version information is missing for dependency: javax.annotation:javax.annotation-api",
    "Dependency management dependency version information is missing for dependency: org.checkerframework:checker-qual",
    "Dependency management dependency version information is missing for dependency: com.google.code.findbugs:jsr305"
  ],
  "pkg:maven/com.google.cloud.bigtable/bigtable-beam-import@2.15.3": [
    "Project name is missing"
  ],
  "pkg:maven/com.google.cloud.bigtable/bigtable-hbase-2.x-hadoop@2.15.3": [
    "Project name is missing"
  ],
  "pkg:maven/com.google.cloud.bigtable/protobuf-java-format-shaded@0.10.3": [
    "Project name is missing"
  ],
  "pkg:maven/com.google.cloud.bigtable/mirroring-client@0.10.3": [
    "Project name is missing"
  ]
}
```
---
 .../bigtable-beam-import/pom.xml              |  1 +
 .../bigtable-hbase-1.x-hadoop/pom.xml         |  1 +
 .../bigtable-hbase-1.x-shaded/pom.xml         | 39 ++++---------------
 .../bigtable-hbase-2.x-hadoop/pom.xml         |  1 +
 .../bigtable-hbase-2.x-shaded/pom.xml         | 39 ++++---------------
 .../protobuf-java-format-shaded/pom.xml       |  1 +
 .../mirroring-client/pom.xml                  |  1 +
 7 files changed, 21 insertions(+), 62 deletions(-)

diff --git a/bigtable-dataflow-parent/bigtable-beam-import/pom.xml b/bigtable-dataflow-parent/bigtable-beam-import/pom.xml
index dec2d21a4b..d2762b432d 100644
--- a/bigtable-dataflow-parent/bigtable-beam-import/pom.xml
+++ b/bigtable-dataflow-parent/bigtable-beam-import/pom.xml
@@ -23,6 +23,7 @@ limitations under the License.
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>bigtable-beam-import</artifactId>
+  <name>${project.groupId}:${project.artifactId}</name>
 
   <properties>
     <mainClass>com.google.cloud.bigtable.beam.Main</mainClass>
diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml
index b29a446bf2..0879ece230 100644
--- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml
+++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-hadoop/pom.xml
@@ -23,6 +23,7 @@ limitations under the License.
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>bigtable-hbase-1.x-hadoop</artifactId>
+  <name>${project.groupId}:${project.artifactId}</name>
   <description>
     Bigtable connector compatible with HBase 1.x. It most of its dependencies
     (hbase &amp; grpc). Its mainly intended to be used by dataflow 1.x to avoid
diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml
index 1ea321c1e4..1740f0baf1 100644
--- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml
+++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml
@@ -23,6 +23,7 @@ limitations under the License.
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>bigtable-hbase-1.x-shaded</artifactId>
+  <name>${project.groupId}:${project.artifactId}</name>
   <description>
     Please use bigtable-hbase-1.x or bigtable-hbase-1.x-hadoop. Bigtable
     connector compatible with HBase 1.x. It exposes the minimal set of
@@ -48,37 +49,6 @@ limitations under the License.
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-
-      <!-- Conscrypt can't be shaded, and since we are trying to make this connector a single jar drop in, mark it as provided.
-      End users can always add it themselves
-      -->
-      <dependency>
-        <groupId>org.conscrypt</groupId>
-        <artifactId>conscrypt-openjdk-uber</artifactId>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.conscrypt</groupId>
-        <artifactId>conscrypt-openjdk</artifactId>
-        <scope>provided</scope>
-      </dependency>
-
-      <!-- Annotation jars that should not be relocated, but are also not required during runtime -->
-      <dependency>
-        <groupId>javax.annotation</groupId>
-        <artifactId>javax.annotation-api</artifactId>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.checkerframework</groupId>
-        <artifactId>checker-qual</artifactId>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>com.google.code.findbugs</groupId>
-        <artifactId>jsr305</artifactId>
-        <scope>provided</scope>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -254,6 +224,13 @@ limitations under the License.
                   <exclude>org.slf4j:slf4j-log4j12</exclude>
                   <!-- Exclude reload4j -->
                   <exclude>ch.qos.reload4j:reload4j</exclude>
+                  <!-- Excluded because they can't be shaded -->
+                  <exclude>org.conscrypt:conscrypt-openjdk-uber</exclude>
+                  <exclude>org.conscrypt:conscrypt-openjdk</exclude>
+                  <!-- Excluded because they are not needed at runtime -->
+                  <exclude>javax.annotation:javax.annotation-api</exclude>
+                  <exclude>org.checkerframework:checker-qual</exclude>
+                  <exclude>com.google.code.findbugs:jsr305</exclude>
                 </excludes>
               </artifactSet>
               <relocations>
diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml
index 0564917da0..1e2ef60169 100644
--- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml
+++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-hadoop/pom.xml
@@ -21,6 +21,7 @@ limitations under the License.
     <version>2.15.3</version> <!-- {x-version-update:bigtable-client-parent:current} -->
   </parent>
   <modelVersion>4.0.0</modelVersion>
+  <name>${project.groupId}:${project.artifactId}</name>
 
   <artifactId>bigtable-hbase-2.x-hadoop</artifactId>
   <description>
diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml
index b870b937c6..940f39fc4e 100644
--- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml
+++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml
@@ -23,6 +23,7 @@ limitations under the License.
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>bigtable-hbase-2.x-shaded</artifactId>
+  <name>${project.groupId}:${project.artifactId}</name>
   <description>
     Please use bigtable-hbase-2.x or bigtable-hbase-2.x-hadoop. Bigtable
     connector compatible with HBase 2.x. It exposes the minimal set of
@@ -48,37 +49,6 @@ limitations under the License.
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-
-      <!-- Conscrypt can't be shaded, and since we are trying to make this connector a single jar drop in, mark it as provided.
-      End users can always add it themselves
-      -->
-      <dependency>
-        <groupId>org.conscrypt</groupId>
-        <artifactId>conscrypt-openjdk-uber</artifactId>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.conscrypt</groupId>
-        <artifactId>conscrypt-openjdk</artifactId>
-        <scope>provided</scope>
-      </dependency>
-
-      <!-- Annotation jars that should not be relocated, but are also not required during runtime -->
-      <dependency>
-        <groupId>javax.annotation</groupId>
-        <artifactId>javax.annotation-api</artifactId>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.checkerframework</groupId>
-        <artifactId>checker-qual</artifactId>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>com.google.code.findbugs</groupId>
-        <artifactId>jsr305</artifactId>
-        <scope>provided</scope>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -241,6 +211,13 @@ limitations under the License.
                   <exclude>org.apache.htrace:htrace-core4</exclude>
                   <exclude>commons-logging:commons-logging</exclude>
                   <exclude>org.apache.yetus:audience-annotations</exclude>
+                  <!-- Excluded because they can't be shaded -->
+                  <exclude>org.conscrypt:conscrypt-openjdk-uber</exclude>
+                  <exclude>org.conscrypt:conscrypt-openjdk</exclude>
+                  <!-- Excluded because they are not needed at runtime -->
+                  <exclude>javax.annotation:javax.annotation-api</exclude>
+                  <exclude>org.checkerframework:checker-qual</exclude>
+                  <exclude>com.google.code.findbugs:jsr305</exclude>
                 </excludes>
               </artifactSet>
               <relocations>
diff --git a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml
index adec071277..ea23f0c640 100644
--- a/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml
+++ b/hbase-migration-tools/mirroring-client/bigtable-hbase-mirroring-client-core-parent/protobuf-java-format-shaded/pom.xml
@@ -9,6 +9,7 @@
   </parent>
 
   <artifactId>protobuf-java-format-shaded</artifactId>
+  <name>${project.groupId}:${project.artifactId}</name>
   <version>0.10.3</version> <!-- {x-version-update:bigtable-hbase-mirroring:current} -->
 
   <description>
diff --git a/hbase-migration-tools/mirroring-client/pom.xml b/hbase-migration-tools/mirroring-client/pom.xml
index 44520411b6..0c490c5d7f 100644
--- a/hbase-migration-tools/mirroring-client/pom.xml
+++ b/hbase-migration-tools/mirroring-client/pom.xml
@@ -9,6 +9,7 @@
   </parent>
 
   <artifactId>mirroring-client</artifactId>
+  <name>${project.groupId}:${project.artifactId}</name>
   <packaging>pom</packaging>
   <version>0.10.3</version> <!-- {x-version-update:bigtable-hbase-mirroring:current} -->
 

From 8035712e247e101473af79d6195944255393f3ab Mon Sep 17 00:00:00 2001
From: Tomo Suzuki <suztomo@google.com>
Date: Tue, 26 Aug 2025 10:52:03 -0400
Subject: [PATCH 2/2] Revert shade config

---
 .../bigtable-hbase-1.x-shaded/pom.xml         | 38 +++++++++++++++----
 .../bigtable-hbase-2.x-shaded/pom.xml         | 38 +++++++++++++++----
 2 files changed, 62 insertions(+), 14 deletions(-)

diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml
index 1740f0baf1..5a751b47a8 100644
--- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml
+++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-shaded/pom.xml
@@ -49,6 +49,37 @@ limitations under the License.
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
+      <!-- Conscrypt can't be shaded, and since we are trying to make this connector a single jar drop in, mark it as provided.
+      End users can always add it themselves
+      -->
+      <dependency>
+        <groupId>org.conscrypt</groupId>
+        <artifactId>conscrypt-openjdk-uber</artifactId>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.conscrypt</groupId>
+        <artifactId>conscrypt-openjdk</artifactId>
+        <scope>provided</scope>
+      </dependency>
+
+      <!-- Annotation jars that should not be relocated, but are also not required during runtime -->
+      <dependency>
+        <groupId>javax.annotation</groupId>
+        <artifactId>javax.annotation-api</artifactId>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.checkerframework</groupId>
+        <artifactId>checker-qual</artifactId>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>com.google.code.findbugs</groupId>
+        <artifactId>jsr305</artifactId>
+        <scope>provided</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -224,13 +255,6 @@ limitations under the License.
                   <exclude>org.slf4j:slf4j-log4j12</exclude>
                   <!-- Exclude reload4j -->
                   <exclude>ch.qos.reload4j:reload4j</exclude>
-                  <!-- Excluded because they can't be shaded -->
-                  <exclude>org.conscrypt:conscrypt-openjdk-uber</exclude>
-                  <exclude>org.conscrypt:conscrypt-openjdk</exclude>
-                  <!-- Excluded because they are not needed at runtime -->
-                  <exclude>javax.annotation:javax.annotation-api</exclude>
-                  <exclude>org.checkerframework:checker-qual</exclude>
-                  <exclude>com.google.code.findbugs:jsr305</exclude>
                 </excludes>
               </artifactSet>
               <relocations>
diff --git a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml
index 940f39fc4e..f71b96fd24 100644
--- a/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml
+++ b/bigtable-hbase-2.x-parent/bigtable-hbase-2.x-shaded/pom.xml
@@ -49,6 +49,37 @@ limitations under the License.
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
+      <!-- Conscrypt can't be shaded, and since we are trying to make this connector a single jar drop in, mark it as provided.
+      End users can always add it themselves
+      -->
+      <dependency>
+        <groupId>org.conscrypt</groupId>
+        <artifactId>conscrypt-openjdk-uber</artifactId>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.conscrypt</groupId>
+        <artifactId>conscrypt-openjdk</artifactId>
+        <scope>provided</scope>
+      </dependency>
+
+      <!-- Annotation jars that should not be relocated, but are also not required during runtime -->
+      <dependency>
+        <groupId>javax.annotation</groupId>
+        <artifactId>javax.annotation-api</artifactId>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.checkerframework</groupId>
+        <artifactId>checker-qual</artifactId>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>com.google.code.findbugs</groupId>
+        <artifactId>jsr305</artifactId>
+        <scope>provided</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -211,13 +242,6 @@ limitations under the License.
                   <exclude>org.apache.htrace:htrace-core4</exclude>
                   <exclude>commons-logging:commons-logging</exclude>
                   <exclude>org.apache.yetus:audience-annotations</exclude>
-                  <!-- Excluded because they can't be shaded -->
-                  <exclude>org.conscrypt:conscrypt-openjdk-uber</exclude>
-                  <exclude>org.conscrypt:conscrypt-openjdk</exclude>
-                  <!-- Excluded because they are not needed at runtime -->
-                  <exclude>javax.annotation:javax.annotation-api</exclude>
-                  <exclude>org.checkerframework:checker-qual</exclude>
-                  <exclude>com.google.code.findbugs:jsr305</exclude>
                 </excludes>
               </artifactSet>
               <relocations>