From b6ec227cf45e254498d00721dc3fd8dbccbcfad4 Mon Sep 17 00:00:00 2001
From: Mattie Fu <mattiefu@google.com>
Date: Wed, 6 Jul 2022 14:41:45 -0400
Subject: [PATCH 1/2] fix: ignore repackaged files to fix clirr

---
 .../clirr-ignored-differences.xml                      | 10 ++++++++++
 google-cloud-bigtable-stats/pom.xml                    |  9 +++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 google-cloud-bigtable-stats/clirr-ignored-differences.xml

diff --git a/google-cloud-bigtable-stats/clirr-ignored-differences.xml b/google-cloud-bigtable-stats/clirr-ignored-differences.xml
new file mode 100644
index 0000000000..c47903cb31
--- /dev/null
+++ b/google-cloud-bigtable-stats/clirr-ignored-differences.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
+<differences>
+    <difference>
+        <differenceType>7005</differenceType>
+        <className>com/google/cloud/bigtable/stats/StatsRecorderWrapper</className>
+        <method>*</method>
+        <to>*</to>
+    </difference>
+</differences>
diff --git a/google-cloud-bigtable-stats/pom.xml b/google-cloud-bigtable-stats/pom.xml
index 7ceaad731b..fa96d246b9 100644
--- a/google-cloud-bigtable-stats/pom.xml
+++ b/google-cloud-bigtable-stats/pom.xml
@@ -101,6 +101,15 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <version>3.3.0</version>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>clirr-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>com/google/bigtable/veneer/repackaged/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

From 2f4c328ea75398a838c08662eeeb6dce85e39dcb Mon Sep 17 00:00:00 2001
From: Mattie Fu <mattiefu@google.com>
Date: Wed, 6 Jul 2022 14:46:23 -0400
Subject: [PATCH 2/2] update

---
 google-cloud-bigtable-stats/clirr-ignored-differences.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/google-cloud-bigtable-stats/clirr-ignored-differences.xml b/google-cloud-bigtable-stats/clirr-ignored-differences.xml
index c47903cb31..2c35667623 100644
--- a/google-cloud-bigtable-stats/clirr-ignored-differences.xml
+++ b/google-cloud-bigtable-stats/clirr-ignored-differences.xml
@@ -4,7 +4,7 @@
     <difference>
         <differenceType>7005</differenceType>
         <className>com/google/cloud/bigtable/stats/StatsRecorderWrapper</className>
-        <method>*</method>
-        <to>*</to>
+        <method>*StatsRecorderWrapper*</method>
+        <to>*StatsRecorder*</to>
     </difference>
 </differences>