SNOW-1747516: Fix native libraries relocation (#1927)

snowflakedb · Nov 26, 2024 · f1038e6 · f1038e6
1 parent ecccc36
commit f1038e6
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 0 deletions.
diff --git a/FIPS/pom.xml b/FIPS/pom.xml
@@ -510,6 +510,22 @@
                        <pattern>io.grpc</pattern>
                        <shadedPattern>${shadeBase}.grpc</shadedPattern>
                      </relocation>
+                     <relocation>
+                       <pattern>META-INF.native.io_grpc_netty_shaded_netty_tcnative</pattern>
+                       <shadedPattern>META-INF.native.${shadeNativeBase}_grpc_netty_shaded_netty_tcnative</shadedPattern>
+                     </relocation>
+                     <relocation>
+                       <pattern>META-INF.native.libio_grpc_netty_shaded_netty_tcnative</pattern>
+                       <shadedPattern>META-INF.native.lib${shadeNativeBase}_grpc_netty_shaded_netty_tcnative</shadedPattern>
+                     </relocation>
+                     <relocation>
+                       <pattern>META-INF.native.io_grpc_netty_shaded_netty_transport_native_epoll</pattern>
+                       <shadedPattern>META-INF.native.${shadeNativeBase}_grpc_netty_shaded_netty_transport_native_epoll</shadedPattern>
+                     </relocation>
+                     <relocation>
+                       <pattern>META-INF.native.libio_grpc_netty_shaded_netty_transport_native_epoll</pattern>
+                       <shadedPattern>META-INF.native.lib${shadeNativeBase}_grpc_netty_shaded_netty_transport_native_epoll</shadedPattern>
+                     </relocation>
                      <relocation>
                        <pattern>org.checkerframework</pattern>
                        <shadedPattern>${shadeBase}.org.checkerframework</shadedPattern>
@@ -526,6 +542,18 @@
                        <pattern>org.conscrypt</pattern>
                        <shadedPattern>${shadeBase}.org.conscrypt</shadedPattern>
                      </relocation>
+                     <relocation>
+                       <pattern>conscrypt_openjdk_jni</pattern>
+                       <shadedPattern>${shadeNativeBase}_conscrypt_openjdk_jni</shadedPattern>
+                     </relocation>
+                     <relocation>
+                       <pattern>META-INF.native.conscrypt_openjdk_jni</pattern>
+                       <shadedPattern>META-INF.native.${shadeNativeBase}_conscrypt_openjdk_jni</shadedPattern>
+                     </relocation>
+                     <relocation>
+                       <pattern>META-INF.native.libconscrypt_openjdk_jni</pattern>
+                       <shadedPattern>META-INF.native.lib${shadeNativeBase}_conscrypt_openjdk_jni</shadedPattern>
+                     </relocation>
                      <relocation>
                        <pattern>opencensus</pattern>
                        <shadedPattern>${shadeBase}.opencensus</shadedPattern>

diff --git a/parent-pom.xml b/parent-pom.xml
@@ -75,6 +75,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <relocationBase>net/snowflake/client/jdbc/internal</relocationBase>
     <shadeBase>net.snowflake.client.jdbc.internal</shadeBase>
+    <shadeNativeBase>net_snowflake_client_jdbc_internal</shadeNativeBase>
     <slf4j.version>2.0.13</slf4j.version>
     <snowflake.common.version>5.1.4</snowflake.common.version>
     <testCategory>net.snowflake.client.category.AllTestCategory</testCategory>

diff --git a/pom.xml b/pom.xml
@@ -943,6 +943,22 @@
                       <pattern>io.grpc</pattern>
                       <shadedPattern>${shadeBase}.grpc</shadedPattern>
                     </relocation>
+                    <relocation>
+                      <pattern>META-INF.native.io_grpc_netty_shaded_netty_tcnative</pattern>
+                      <shadedPattern>META-INF.native.${shadeNativeBase}_grpc_netty_shaded_netty_tcnative</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>META-INF.native.libio_grpc_netty_shaded_netty_tcnative</pattern>
+                      <shadedPattern>META-INF.native.lib${shadeNativeBase}_grpc_netty_shaded_netty_tcnative</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>META-INF.native.io_grpc_netty_shaded_netty_transport_native_epoll</pattern>
+                      <shadedPattern>META-INF.native.${shadeNativeBase}_grpc_netty_shaded_netty_transport_native_epoll</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>META-INF.native.libio_grpc_netty_shaded_netty_transport_native_epoll</pattern>
+                      <shadedPattern>META-INF.native.lib${shadeNativeBase}_grpc_netty_shaded_netty_transport_native_epoll</shadedPattern>
+                    </relocation>
                     <relocation>
                       <pattern>org.checkerframework</pattern>
                       <shadedPattern>${shadeBase}.org.checkerframework</shadedPattern>
@@ -959,6 +975,18 @@
                       <pattern>org.conscrypt</pattern>
                       <shadedPattern>${shadeBase}.org.conscrypt</shadedPattern>
                     </relocation>
+                    <relocation>
+                      <pattern>conscrypt_openjdk_jni</pattern>
+                      <shadedPattern>${shadeNativeBase}_conscrypt_openjdk_jni</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>META-INF.native.conscrypt_openjdk_jni</pattern>
+                      <shadedPattern>META-INF.native.${shadeNativeBase}_conscrypt_openjdk_jni</shadedPattern>
+                    </relocation>
+                    <relocation>
+                      <pattern>META-INF.native.libconscrypt_openjdk_jni</pattern>
+                      <shadedPattern>META-INF.native.lib${shadeNativeBase}_conscrypt_openjdk_jni</shadedPattern>
+                    </relocation>
                     <relocation>
                       <pattern>opencensus</pattern>
                       <shadedPattern>${shadeBase}.opencensus</shadedPattern>