Merge branch 'master' into sfc-gh-xhuang-patch-1

snowflakedb · Jan 22, 2024 · cf3ec07 · cf3ec07
2 parents 2e373f5 + f186847
commit cf3ec07
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/e2e-jar-test/pom.xml b/e2e-jar-test/pom.xml
@@ -27,8 +27,7 @@
             <dependency>
                 <groupId>net.snowflake</groupId>
                 <artifactId>snowflake-ingest-sdk</artifactId>
-                <!-- This value should be the same as the version in the pom.xml of the SDK -->
-                <version>2.0.5-SNAPSHOT</version>
+                <version>2.0.5</version>
             </dependency>
 
             <dependency>

diff --git 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.5-SNAPSHOT</version>
+  <version>2.0.5</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
@@ -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.5-SNAPSHOT";
+  public static final String DEFAULT_VERSION = "2.0.5";
 
   public static final String JAVA_USER_AGENT = "JAVA";