Fix jar test.

snowflakedb · Apr 15, 2024 · 090e362 · 090e362
1 parent c08c9e7
commit 090e362
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 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
@@ -98,7 +98,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
@@ -1211,20 +1211,20 @@
                   <shadedPattern>${shadeBase}.io.airlift.compress</shadedPattern>
                 </relocation>
                 <relocation>
-                  <pattern>net.snowflake</pattern>
-                  <shadedPattern>${shadeBase}.net.snowflake</shadedPattern>
+                  <pattern>net.snowflake.client</pattern>
+                  <shadedPattern>${shadeBase}.net.snowflake.client</shadedPattern>
                 </relocation>
                 <relocation>
-                  <pattern>com.snowflake</pattern>
-                  <shadedPattern>${shadeBase}.com.snowflake</shadedPattern>
+                  <pattern>com.snowflake.client</pattern>
+                  <shadedPattern>${shadeBase}.com.snowflake.client</shadedPattern>
                 </relocation>
                 <relocation>
                   <pattern>com.amazonaws</pattern>
                   <shadedPattern>${shadeBase}.com.amazonaws</shadedPattern>
                 </relocation>
                 <relocation>
-                  <pattern>software.amazon</pattern>
-                  <shadedPattern>${shadeBase}.software.amazon</shadedPattern>
+                  <pattern>software.amazon.ion</pattern>
+                  <shadedPattern>${shadeBase}.software.amazon.ion</shadedPattern>
                 </relocation>
               </relocations>
               <filters>