From 4274d5f12dc67b84951d2cdec342269b5c6047db Mon Sep 17 00:00:00 2001 From: Xin Huang Date: Tue, 24 Sep 2024 13:43:10 -0700 Subject: [PATCH 1/5] 2.3.0 increment --- e2e-jar-test/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e-jar-test/pom.xml b/e2e-jar-test/pom.xml index 325517bba..f54254a1f 100644 --- a/e2e-jar-test/pom.xml +++ b/e2e-jar-test/pom.xml @@ -29,7 +29,7 @@ net.snowflake snowflake-ingest-sdk - 2.2.2 + 2.3.0 From b086c24f7fb21f4c16e032b1e0aa8df2440e0c7f Mon Sep 17 00:00:00 2001 From: Xin Huang Date: Tue, 24 Sep 2024 13:46:02 -0700 Subject: [PATCH 2/5] 2.3.0 --- pom.xml | 2 +- .../java/net/snowflake/ingest/connection/RequestBuilder.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4ecf1e26a..6d5b2b6c3 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ net.snowflake snowflake-ingest-sdk - 2.2.2 + 2.3.0 jar Snowflake Ingest SDK Snowflake Ingest SDK diff --git a/src/main/java/net/snowflake/ingest/connection/RequestBuilder.java b/src/main/java/net/snowflake/ingest/connection/RequestBuilder.java index 0c03e7e40..86f30db33 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.2.2"; + public static final String DEFAULT_VERSION = "2.3.0"; public static final String JAVA_USER_AGENT = "JAVA"; From 6b91a5529cd115a93ddeebdd81f9466b0f5703b0 Mon Sep 17 00:00:00 2001 From: Xin Huang Date: Mon, 30 Sep 2024 10:57:56 -0500 Subject: [PATCH 3/5] snyk https://github.com/snowflakedb/snowflake-ingest-java/pull/843 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6d5b2b6c3..663574190 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 1.11.0 2.17.2 32.0.1-jre - 3.3.6 + 3.4.0 1.5.2 true 0.8.5 From ed11212d9a9ed6b0b64b3ecfa8caca14b3cd696a Mon Sep 17 00:00:00 2001 From: Xin Huang Date: Mon, 30 Sep 2024 11:14:57 -0500 Subject: [PATCH 4/5] revert snyk --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 663574190..6d5b2b6c3 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 1.11.0 2.17.2 32.0.1-jre - 3.4.0 + 3.3.6 1.5.2 true 0.8.5 From 864e84dd48d9c581eca22d977692a8338841579d Mon Sep 17 00:00:00 2001 From: Xin Huang Date: Wed, 2 Oct 2024 17:21:54 -0500 Subject: [PATCH 5/5] exclude more meta-inf/ --- pom.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6d5b2b6c3..9485a61da 100644 --- a/pom.xml +++ b/pom.xml @@ -1206,12 +1206,16 @@ assets/org/apache/commons/math3/exception/util/LocalizedFormats_fr.properties about.html mozilla/public-suffix-list.txt - + META-INF/ASL2.0 + META-INF/FastDoubleParser-LICENSE + META-INF/FastDoubleParser-NOTICE + META-INF/licenses*/** META-INF/LICENSE* META-INF/NOTICE* META-INF/DEPENDENCIES META-INF/maven/** META-INF/services/com.fasterxml.* + META-INF/thirdparty-LICENSE META-INF/*.xml META-INF/*.SF META-INF/*.DSA