From c5650252c6cf0ec900a4d0655151a539f9672a23 Mon Sep 17 00:00:00 2001
From: Toby Zhang <toby.zhang@snowflake.com>
Date: Mon, 23 Oct 2023 22:57:22 -0700
Subject: [PATCH] V2.0.4 release (#643)

v2.0.4 release, all the additional changes are done by sorting the pom file, looks like this is added as part of #604
---
 e2e-jar-test/pom.xml                          | 104 +++++++++---------
 pom.xml                                       |  26 ++---
 .../ingest/connection/RequestBuilder.java     |   3 +-
 3 files changed, 67 insertions(+), 66 deletions(-)

diff --git a/e2e-jar-test/pom.xml b/e2e-jar-test/pom.xml
index 1050d0967..9a140aaeb 100644
--- a/e2e-jar-test/pom.xml
+++ b/e2e-jar-test/pom.xml
@@ -1,65 +1,65 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-  <groupId>net.snowflake.snowflake-ingest-java-e2e-jar-test</groupId>
-  <artifactId>parent</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
+    <groupId>net.snowflake.snowflake-ingest-java-e2e-jar-test</groupId>
+    <artifactId>parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-  <name>snowflake-ingest-sdk-e2e-test</name>
+    <name>snowflake-ingest-sdk-e2e-test</name>
 
-  <modules>
-    <module>standard</module>
-    <module>fips</module>
-    <module>core</module>
-  </modules>
+    <modules>
+        <module>standard</module>
+        <module>fips</module>
+        <module>core</module>
+    </modules>
 
-  <dependencyManagement>
+    <dependencyManagement>
 
-    <dependencies>
-      <dependency>
-        <groupId>net.snowflake.snowflake-ingest-java-e2e-jar-test</groupId>
-        <artifactId>core</artifactId>
-        <version>${project.version}</version>
-      </dependency>
+        <dependencies>
+            <dependency>
+                <groupId>net.snowflake.snowflake-ingest-java-e2e-jar-test</groupId>
+                <artifactId>core</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
-      <dependency>
-        <groupId>net.snowflake</groupId>
-        <artifactId>snowflake-ingest-sdk</artifactId>
-        <version>2.0.4-SNAPSHOT</version>
-      </dependency>
+            <dependency>
+                <groupId>net.snowflake</groupId>
+                <artifactId>snowflake-ingest-sdk</artifactId>
+                <version>2.0.4</version>
+            </dependency>
 
-      <dependency>
-        <groupId>net.snowflake</groupId>
-        <artifactId>snowflake-jdbc-fips</artifactId>
-        <version>3.13.30</version>
-      </dependency>
+            <dependency>
+                <groupId>net.snowflake</groupId>
+                <artifactId>snowflake-jdbc-fips</artifactId>
+                <version>3.13.30</version>
+            </dependency>
 
-      <dependency>
-        <groupId>org.bouncycastle</groupId>
-        <artifactId>bc-fips</artifactId>
-        <version>1.0.2.4</version>
-      </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bc-fips</artifactId>
+                <version>1.0.2.4</version>
+            </dependency>
 
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-simple</artifactId>
-        <version>1.7.36</version>
-      </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-simple</artifactId>
+                <version>1.7.36</version>
+            </dependency>
 
-      <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-databind</artifactId>
-        <version>2.14.0</version>
-      </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>2.14.0</version>
+            </dependency>
 
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>4.13.2</version>
-        <scope>test</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.13.2</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 </project>
diff --git a/pom.xml b/pom.xml
index 9789e9e09..90f5ccbb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <!-- Arifact name and version information -->
   <groupId>net.snowflake</groupId>
   <artifactId>snowflake-ingest-sdk</artifactId>
-  <version>2.0.4-SNAPSHOT</version>
+  <version>2.0.4</version>
   <packaging>jar</packaging>
   <name>Snowflake Ingest SDK</name>
   <description>Snowflake Ingest SDK</description>
@@ -779,9 +779,9 @@
         <configuration>
           <errorRemedy>failFast</errorRemedy>
           <!--
-          The list of allowed licenses. If you see the build failing due to "There are some forbidden licenses used, please
-          check your dependencies", verify the conditions of the license and add the reference to it here.
-          -->
+                    The list of allowed licenses. If you see the build failing due to "There are some forbidden licenses used, please
+                    check your dependencies", verify the conditions of the license and add the reference to it here.
+                    -->
           <includedLicenses>
             <includedLicense>Apache License 2.0</includedLicense>
             <includedLicense>BSD 2-Clause License</includedLicense>
@@ -899,9 +899,9 @@
       <build>
         <plugins>
           <!--
-          Copy all project dependencies to target/dependency-jars. License processing Python script will look here for
-          license files of SDK dependencies.
-          -->
+                    Copy all project dependencies to target/dependency-jars. License processing Python script will look here for
+                    license files of SDK dependencies.
+                    -->
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-dependency-plugin</artifactId>
@@ -923,9 +923,9 @@
           </plugin>
 
           <!--
-          Compile the list of SDK dependencies in 'compile' and 'runtime' scopes.
-          This list is an entry point for the license processing python script.
-          -->
+                    Compile the list of SDK dependencies in 'compile' and 'runtime' scopes.
+                    This list is an entry point for the license processing python script.
+                    -->
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-dependency-plugin</artifactId>
@@ -1108,9 +1108,9 @@
             </executions>
           </plugin>
           <!--
-          Plugin executes license processing Python script, which copies third party license files into the directory
-          target/generated-licenses-info/META-INF/third-party-licenses, which is then included in the shaded JAR. 
-          -->
+                    Plugin executes license processing Python script, which copies third party license files into the directory
+                    target/generated-licenses-info/META-INF/third-party-licenses, which is then included in the shaded JAR.
+                    -->
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>exec-maven-plugin</artifactId>
diff --git a/src/main/java/net/snowflake/ingest/connection/RequestBuilder.java b/src/main/java/net/snowflake/ingest/connection/RequestBuilder.java
index 6936bc52a..77443e7b8 100644
--- a/src/main/java/net/snowflake/ingest/connection/RequestBuilder.java
+++ b/src/main/java/net/snowflake/ingest/connection/RequestBuilder.java
@@ -110,7 +110,7 @@ public class RequestBuilder {
   // Don't change!
   public static final String CLIENT_NAME = "SnowpipeJavaSDK";
 
-  public static final String DEFAULT_VERSION = "2.0.4-SNAPSHOT";
+  public static final String DEFAULT_VERSION = "2.0.4";
 
   public static final String JAVA_USER_AGENT = "JAVA";
 
@@ -351,6 +351,7 @@ private static String getDefaultUserAgent() {
   private static String buildCustomUserAgent(String additionalUserAgentInfo) {
     return USER_AGENT.trim() + " " + additionalUserAgentInfo;
   }
+
   /** A simple POJO for generating our POST body to the insert endpoint */
   private static class IngestRequest {
     // the list of files we're loading