Merge branch 'master' into SNOW-1693588-upgrade-to-junit5

# Conflicts: # parent-pom.xml
snowflakedb · Nov 14, 2024 · afaf5d6 · afaf5d6
2 parents cb2239a + be85cf7
commit afaf5d6
Show file tree

Hide file tree

Showing 95 changed files with 1,363 additions and 282 deletions.
diff --git a/FIPS/pom.xml b/FIPS/pom.xml
@@ -397,10 +397,59 @@
                        <pattern>com.google</pattern>
                        <shadedPattern>${shadeBase}.google</shadedPattern>
                      </relocation>
+                     <!-- google packages should be relocated explicitly to avoid problems with properties files renaming -->
+                     <relocation>
+                       <pattern>google.api</pattern>
+                       <shadedPattern>${shadeBase}.google.api</shadedPattern>
+                     </relocation>
+                     <relocation>
+                       <pattern>google.apps</pattern>
+                       <shadedPattern>${shadeBase}.google.apps</shadedPattern>
+                     </relocation>
+                     <relocation>
+                       <pattern>google.cloud</pattern>
+                       <shadedPattern>${shadeBase}.google.cloud</shadedPattern>
+                     </relocation>
                      <relocation>
                        <pattern>google.geo</pattern>
                        <shadedPattern>${shadeBase}.google.geo</shadedPattern>
                      </relocation>
+                     <relocation>
+                       <pattern>google.iam</pattern>
+                       <shadedPattern>${shadeBase}.google.iam</shadedPattern>
+                     </relocation>
+                     <relocation>
+                       <pattern>google.logging</pattern>
+                       <shadedPattern>${shadeBase}.google.logging</shadedPattern>
+                     </relocation>
+                     <relocation>
+                       <pattern>google.longrunning</pattern>
+                       <shadedPattern>${shadeBase}.google.longrunning</shadedPattern>
+                     </relocation>
+                     <relocation>
+                       <pattern>google.monitoring</pattern>
+                       <shadedPattern>${shadeBase}.google.monitoring</shadedPattern>
+                     </relocation>
+                     <relocation>
+                       <pattern>google.protobuf</pattern>
+                       <shadedPattern>${shadeBase}.google.protobuf</shadedPattern>
+                     </relocation>
+                     <relocation>
+                       <pattern>google.rpc</pattern>
+                       <shadedPattern>${shadeBase}.google.rpc</shadedPattern>
+                     </relocation>
+                     <relocation>
+                       <pattern>google.shopping</pattern>
+                       <shadedPattern>${shadeBase}.google.shopping</shadedPattern>
+                     </relocation>
+                     <relocation>
+                       <pattern>google.storage</pattern>
+                       <shadedPattern>${shadeBase}.google.storage</shadedPattern>
+                     </relocation>
+                     <relocation>
+                       <pattern>google.type</pattern>
+                       <shadedPattern>${shadeBase}.google.type</shadedPattern>
+                     </relocation>
                      <relocation>
                        <pattern>org.joda</pattern>
                        <shadedPattern>${shadeBase}.joda</shadedPattern>
@@ -445,54 +494,22 @@
                        <pattern>com.carrotsearch</pattern>
                        <shadedPattern>${shadeBase}.com.carrotsearch</shadedPattern>
                      </relocation>
-                     <relocation>
-                       <pattern>google.type</pattern>
-                       <shadedPattern>${shadeBase}.google.type</shadedPattern>
-                     </relocation>
-                     <relocation>
-                       <pattern>google.rpc</pattern>
-                       <shadedPattern>${shadeBase}.google.rpc</shadedPattern>
-                     </relocation>
-                     <relocation>
-                       <pattern>google.iam</pattern>
-                       <shadedPattern>${shadeBase}.google.iam</shadedPattern>
-                     </relocation>
                      <relocation>
                        <pattern>io.opencensus</pattern>
                        <shadedPattern>${shadeBase}.opencensus</shadedPattern>
                      </relocation>
                      <relocation>
-                       <pattern>org.threeten</pattern>
-                       <shadedPattern>${shadeBase}.threeten</shadedPattern>
+                       <pattern>io.opentelemetry</pattern>
+                       <shadedPattern>${shadeBase}.opentelemetry</shadedPattern>
                      </relocation>
                      <relocation>
-                       <pattern>google.protobuf</pattern>
-                       <shadedPattern>${shadeBase}.google.protobuf</shadedPattern>
-                     </relocation>
-                     <relocation>
-                       <pattern>google.api</pattern>
-                       <shadedPattern>${shadeBase}.google.api</shadedPattern>
+                       <pattern>org.threeten</pattern>
+                       <shadedPattern>${shadeBase}.threeten</shadedPattern>
                      </relocation>
-                     <relocation>
-                     <pattern>google.storage</pattern>
-                     <shadedPattern>${shadeBase}.google.storage</shadedPattern>
-                   </relocation>
                      <relocation>
                        <pattern>io.grpc</pattern>
                        <shadedPattern>${shadeBase}.grpc</shadedPattern>
                      </relocation>
-                     <relocation>
-                       <pattern>google.longrunning</pattern>
-                       <shadedPattern>${shadeBase}.google.longrunning</shadedPattern>
-                     </relocation>
-                     <relocation>
-                       <pattern>google.cloud</pattern>
-                       <shadedPattern>${shadeBase}.google.cloud</shadedPattern>
-                     </relocation>
-                     <relocation>
-                       <pattern>google.logging</pattern>
-                       <shadedPattern>${shadeBase}.google.logging</shadedPattern>
-                     </relocation>
                      <relocation>
                        <pattern>org.checkerframework</pattern>
                        <shadedPattern>${shadeBase}.org.checkerframework</shadedPattern>
@@ -594,17 +611,24 @@
                 <configuration>
                   <target>
                     <unzip dest="${project.build.directory}/relocate" src="${project.build.directory}/${project.build.finalName}.jar"/>
+                    <mkdir dir="${project.build.directory}/relocate/META-INF/versions/9/${relocationBase}"/>
                     <mkdir dir="${project.build.directory}/relocate/META-INF/versions/11/${relocationBase}"/>
                     <mkdir dir="${project.build.directory}/relocate/META-INF/versions/17/${relocationBase}"/>
                     <mkdir dir="${project.build.directory}/relocate/META-INF/versions/21/${relocationBase}"/>
+                    <mkdir dir="${project.build.directory}/relocate/META-INF/versions/22/${relocationBase}"/>
                     <!-- com.fasterxml.* packages are relocated to ${relocationBase}.fasterxml.* -->
                     <move file="${project.build.directory}/relocate/META-INF/versions/11/com/fasterxml" todir="${project.build.directory}/relocate/META-INF/versions/11/${relocationBase}"/>
                     <move file="${project.build.directory}/relocate/META-INF/versions/17/com/fasterxml" todir="${project.build.directory}/relocate/META-INF/versions/17/${relocationBase}"/>
                     <move file="${project.build.directory}/relocate/META-INF/versions/21/com/fasterxml" todir="${project.build.directory}/relocate/META-INF/versions/21/${relocationBase}"/>
+                    <move file="${project.build.directory}/relocate/META-INF/versions/22/com/fasterxml" todir="${project.build.directory}/relocate/META-INF/versions/22/${relocationBase}"/>
+                    <!-- io.opentelemetry.* packages are relocated to ${relocationBase}.io.opentelemetry.* -->
+                    <move file="${project.build.directory}/relocate/META-INF/versions/9/io" todir="${project.build.directory}/relocate/META-INF/versions/9/${relocationBase}"/>
                     <zip basedir="${project.build.directory}/relocate" destfile="${project.build.directory}/${project.build.finalName}.jar"/>
+                    <delete dir="${project.build.directory}/relocate/META-INF/versions/9/${relocationBase}"/>
                     <delete dir="${project.build.directory}/relocate/META-INF/versions/11/${relocationBase}"/>
                     <delete dir="${project.build.directory}/relocate/META-INF/versions/17/${relocationBase}"/>
                     <delete dir="${project.build.directory}/relocate/META-INF/versions/21/${relocationBase}"/>
+                    <delete dir="${project.build.directory}/relocate/META-INF/versions/22/${relocationBase}"/>
                   </target>
                 </configuration>
               </execution>

diff --git a/TestOnly/pom.xml b/TestOnly/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>net.snowflake</groupId>
   <artifactId>snowflake-jdbc-test</artifactId>
-  <version>3.9.2</version>
+  <version>3.13.21</version>
 
   <name>snowflake-jdbc-test</name>
   <url>http://maven.apache.org</url>

diff --git a/parent-pom.xml b/parent-pom.xml
@@ -31,30 +31,31 @@
     <bouncycastle.bcpkixfips.version>1.0.7</bouncycastle.bcpkixfips.version>
     <bytebuddy.version>1.14.17</bytebuddy.version>
     <classworlds.version>1.1</classworlds.version>
-    <checkerframework.version>3.33.0</checkerframework.version>
+    <checkerframework.version>3.48.2</checkerframework.version>
     <commons.cli.version>1.2</commons.cli.version>
-    <commons.codec.version>1.17.0</commons.codec.version>
+    <commons.codec.version>1.17.1</commons.codec.version>
     <commons.dbcp.version>1.4</commons.dbcp.version>
     <commons.io.version>2.17.0</commons.io.version>
     <commons.logging.version>1.2</commons.logging.version>
     <commons.pool.version>1.5.4</commons.pool.version>
     <c3p0.version>0.9.5.4</c3p0.version>
-    <google.api.grpc.version>2.22.0</google.api.grpc.version>
-    <google.auth.library.oauth2.http.version>1.19.0</google.auth.library.oauth2.http.version>
-    <google.cloud.core.version>2.21.0</google.cloud.core.version>
-    <google.cloud.storage.version>2.22.6</google.cloud.storage.version>
-    <google.code.gson.version>2.10.1</google.code.gson.version>
-    <google.errorprone.version>2.18.0</google.errorprone.version>
+    <google.api.grpc.version>2.48.0</google.api.grpc.version>
+    <google.auth.library.oauth2.http.version>1.29.0</google.auth.library.oauth2.http.version>
+    <google.cloud.core.version>2.47.0</google.cloud.core.version>
+    <google.cloud.storage.version>2.44.1</google.cloud.storage.version>
+    <google.code.gson.version>2.11.0</google.code.gson.version>
+    <google.errorprone.version>2.35.1</google.errorprone.version>
     <google.flatbuffers.version>24.3.25</google.flatbuffers.version>
-    <google.gax.version>2.31.0</google.gax.version>
-    <google.guava.version>32.1.1-jre</google.guava.version>
-    <google.http.client.version>1.43.3</google.http.client.version>
+    <google.gax.version>2.57.0</google.gax.version>
+    <google.guava.version>33.3.1-jre</google.guava.version>
+    <google.http.client.version>1.45.0</google.http.client.version>
+    <google.j2objc-annotations.version>3.0.0</google.j2objc-annotations.version>
     <google.jsr305.version>3.0.2</google.jsr305.version>
-    <google.protobuf.java.version>3.25.5</google.protobuf.java.version>
-    <grpc.version>1.60.0</grpc.version>
+    <google.protobuf.java.version>4.28.2</google.protobuf.java.version>
+    <grpc.version>1.68.1</grpc.version>
     <hamcrest.version>2.2</hamcrest.version>
     <hikaricp.version>2.4.3</hikaricp.version>
-    <jackson.version>2.17.2</jackson.version>
+    <jackson.version>2.18.1</jackson.version>
     <jacoco.skip.instrument>true</jacoco.skip.instrument>
     <javax.servlet.version>3.1.0</javax.servlet.version>
     <jna.version>5.13.0</jna.version>
@@ -77,7 +78,6 @@
     <shadeBase>net.snowflake.client.jdbc.internal</shadeBase>
     <slf4j.version>2.0.13</slf4j.version>
     <snowflake.common.version>5.1.4</snowflake.common.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>
@@ -200,6 +200,11 @@
         <artifactId>guava</artifactId>
         <version>${google.guava.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.google.j2objc</groupId>
+        <artifactId>j2objc-annotations</artifactId>
+        <version>${google.j2objc-annotations.version}</version>
+      </dependency>
       <dependency>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-storage</artifactId>
@@ -534,11 +539,6 @@
         <version>${bouncycastle.bcpkixfips.version}</version>
         <scope>provided</scope>
       </dependency>
-      <dependency>
-        <groupId>org.threeten</groupId>
-        <artifactId>threetenbp</artifactId>
-        <version>${threeten.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.tukaani</groupId>
         <artifactId>xz</artifactId>