Merge branch 'master' into SNOW-1168512v2

snowflakedb · Aug 22, 2024 · 17c5311 · 17c5311
2 parents 7a2cc1c + 0546c49
commit 17c5311
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/parent-pom.xml b/parent-pom.xml
@@ -76,7 +76,7 @@
     <slf4j.version>2.0.6</slf4j.version>
     <snowflake.common.version>5.1.4</snowflake.common.version>
     <testCategory>net.snowflake.client.category.AllTestCategory</testCategory>
-    <threeten.version>1.6.8</threeten.version>
+    <threeten.version>1.6.9</threeten.version>
     <tika.version>2.4.1</tika.version>
     <tukaani.version>1.9</tukaani.version>
     <version.maven>3.6.3</version.maven>

diff --git a/thin_public_pom.xml b/thin_public_pom.xml
@@ -63,6 +63,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <slf4j.version>2.0.6</slf4j.version>
+    <threeten.version>1.6.9</threeten.version>
   </properties>
 
   <dependencyManagement>
@@ -149,6 +150,12 @@
       <artifactId>gax</artifactId>
       <version>${google.gax.version}</version>
     </dependency>
+    <!-- It's google gax transitive dependency, we bump it to avoid vulnerability reported for version 1.6.8 -->
+    <dependency>
+      <groupId>org.threeten</groupId>
+      <artifactId>threetenbp</artifactId>
+      <version>${threeten.version}</version>
+    </dependency>
     <dependency>
       <groupId>com.google.auth</groupId>
       <artifactId>google-auth-library-oauth2-http</artifactId>