Merge branch 'master' into alhuang-iceberg-column-name

snowflakedb · Nov 5, 2024 · 1c37326 · 1c37326
2 parents d0b7e00 + bd1e77f
commit 1c37326
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/e2e-jar-test/pom.xml b/e2e-jar-test/pom.xml
@@ -35,7 +35,7 @@
       <dependency>
         <groupId>net.snowflake</groupId>
         <artifactId>snowflake-jdbc-fips</artifactId>
-        <version>3.18.0</version>
+        <version>3.20.0</version>
       </dependency>
       <dependency>
         <groupId>net.snowflake.snowflake-ingest-java-e2e-jar-test</groupId>

diff --git a/pom.xml b/pom.xml
@@ -71,7 +71,7 @@
     <shadeBase>net.snowflake.ingest.internal</shadeBase>
     <slf4j.version>1.7.36</slf4j.version>
     <snappy.version>1.1.10.5</snappy.version>
-    <snowjdbc.version>3.18.0</snowjdbc.version>
+    <snowjdbc.version>3.20.0</snowjdbc.version>
     <yetus.version>0.13.0</yetus.version>
   </properties>
 
@@ -888,7 +888,18 @@
                   </ignoreClasses>
                   <findAllDuplicates>true</findAllDuplicates>
                   <ignoreWhenIdentical>true</ignoreWhenIdentical>
+                  <dependencies>
+                    <dependency>
+                      <groupId>net.snowflake</groupId>
+                      <artifactId>snowflake-jdbc</artifactId>
+                      <ignoreClasses>
+                        <!-- zstd exists in ingest JAR, as well as JDBC jar and cannot be relocated, so we need to ignore it here -->
+                        <ignoreClass>com.github.luben.zstd.*</ignoreClass>
+                      </ignoreClasses>
+                    </dependency>
+                  </dependencies>
                 </banDuplicateClasses>
+
                 <banDuplicatePomDependencyVersions/>
                 <bannedDependencies/>
                 <dependencyConvergence/>

diff --git a/public_pom.xml b/public_pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>net.snowflake</groupId>
             <artifactId>snowflake-jdbc</artifactId>
-            <version>3.18.0</version>
+            <version>3.20.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>