Try fix shaded client sdk classes (from source branch)

snowflakedb · Dec 13, 2024 · dfe5d54 · dfe5d54
1 parent f75f737
commit dfe5d54
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/e2e-jar-test/core/src/main/java/net/snowflake/IngestTestUtils.java b/e2e-jar-test/core/src/main/java/net/snowflake/IngestTestUtils.java
@@ -110,7 +110,11 @@ private Properties loadProperties() throws IOException {
   private Connection getConnection()
       throws IOException, ClassNotFoundException, SQLException, NoSuchAlgorithmException,
           InvalidKeySpecException {
-    Class.forName("net.snowflake.client.jdbc.SnowflakeDriver");
+    try {
+      Class.forName("net.snowflake.client.jdbc.SnowflakeDriver");
+    } catch (ClassNotFoundException e) {
+      Class.forName("net.snowflake.ingest.internal.net.snowflake.client.jdbc.SnowflakeDriver");
+    }
 
     Properties loadedProps = loadProperties();
 

diff --git a/pom.xml b/pom.xml
@@ -1503,14 +1503,6 @@
                   <pattern>org.roaringbitmap</pattern>
                   <shadedPattern>${shadeBase}.org.roaringbitmap</shadedPattern>
                 </relocation>
-                <relocation>
-                  <pattern>net.snowflake.client</pattern>
-                  <shadedPattern>${shadeBase}.net.snowflake.client</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>com.snowflake.client</pattern>
-                  <shadedPattern>${shadeBase}.com.snowflake.client</shadedPattern>
-                </relocation>
                 <relocation>
                   <pattern>com.amazonaws</pattern>
                   <shadedPattern>${shadeBase}.com.amazonaws</shadedPattern>