From 090e3620e71b7ca0b52b7807bbedcee2d9ed620a Mon Sep 17 00:00:00 2001
From: Alec Huang <alec.huang@snowflake.com>
Date: Mon, 15 Apr 2024 13:23:54 -0700
Subject: [PATCH] Fix jar test.

---
 .../src/main/java/net/snowflake/IngestTestUtils.java |  6 +++++-
 pom.xml                                              | 12 ++++++------
 2 files changed, 11 insertions(+), 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
index e7db8d1c2..184a43b9f 100644
--- 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
index b45463477..69e93a249 100644
--- 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>