From c5b833e9cb55f9d26a04e2d51801fd8c1d626bd2 Mon Sep 17 00:00:00 2001
From: Dominik Przybysz <dominik.przybysz@snowflake.com>
Date: Mon, 18 Nov 2024 10:05:04 +0100
Subject: [PATCH] SNOW-1800995: Merge io.netty.versions.properties during shade

---
 FIPS/pom.xml | 4 +++-
 pom.xml      | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/FIPS/pom.xml b/FIPS/pom.xml
index 13e7db8f4..0b874551d 100644
--- a/FIPS/pom.xml
+++ b/FIPS/pom.xml
@@ -589,7 +589,9 @@
                    </filters>
                   <transformers>
                     <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                    <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                    <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"/>
+                    <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                      <resource>META-INF/io.netty.versions.properties</resource>
                     </transformer>
                   </transformers>
                 </configuration>
diff --git a/pom.xml b/pom.xml
index 96f2a65b6..2a1cf4ea6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1023,6 +1023,9 @@
                   <transformers>
                     <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
                     <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"/>
+                    <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                      <resource>META-INF/io.netty.versions.properties</resource>
+                    </transformer>
                   </transformers>
                 </configuration>
               </execution>