From ac0e3931c76eebee246fb44aa1d71790ea91ec7a Mon Sep 17 00:00:00 2001
From: Waleed Fateem <72769898+sfc-gh-wfateem@users.noreply.github.com>
Date: Fri, 7 Jun 2024 03:49:48 -0500
Subject: [PATCH 1/2] SNOW-1454594 Remove Shading of com.sun.* (#1775)
---
FIPS/pom.xml | 7 -------
pom.xml | 7 -------
2 files changed, 14 deletions(-)
diff --git a/FIPS/pom.xml b/FIPS/pom.xml
index a43024c76..e9934e0b5 100644
--- a/FIPS/pom.xml
+++ b/FIPS/pom.xml
@@ -466,13 +466,6 @@
org.objectweb
${shadeBase}.org.objectweb
-
- com.sun
- ${shadeBase}.com.sun
-
- com.sun.jna.**
-
-
io.netty
${shadeBase}.io.netty
diff --git a/pom.xml b/pom.xml
index b1ea7d047..9e5f5c744 100644
--- a/pom.xml
+++ b/pom.xml
@@ -886,13 +886,6 @@
org.objectweb
${shadeBase}.org.objectweb
-
- com.sun
- ${shadeBase}.com.sun
-
- com.sun.jna.**
-
-
io.netty
${shadeBase}.io.netty
From a79f58d1253dec2bf4766760a628664563bb93c7 Mon Sep 17 00:00:00 2001
From: Dominik Przybysz <132913826+sfc-gh-dprzybysz@users.noreply.github.com>
Date: Fri, 7 Jun 2024 11:24:09 +0200
Subject: [PATCH 2/2] SNOW-1446174: Allow 513 and 404 in SFTrustManager tests
(#1782)
---
src/test/java/net/snowflake/client/core/SFTrustManagerIT.java | 2 +-
src/test/java/net/snowflake/client/jdbc/RestRequestTest.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/test/java/net/snowflake/client/core/SFTrustManagerIT.java b/src/test/java/net/snowflake/client/core/SFTrustManagerIT.java
index 13f3f8f09..0a9d96dd2 100644
--- a/src/test/java/net/snowflake/client/core/SFTrustManagerIT.java
+++ b/src/test/java/net/snowflake/client/core/SFTrustManagerIT.java
@@ -182,7 +182,7 @@ private static void accessHost(String host, HttpClient client) throws IOExceptio
assertThat(
String.format("response code for %s", host),
statusCode,
- anyOf(equalTo(200), equalTo(403), equalTo(400)));
+ anyOf(equalTo(200), equalTo(400), equalTo(403), equalTo(404), equalTo(513)));
}
/**
diff --git a/src/test/java/net/snowflake/client/jdbc/RestRequestTest.java b/src/test/java/net/snowflake/client/jdbc/RestRequestTest.java
index ed6e165d1..608f69d02 100644
--- a/src/test/java/net/snowflake/client/jdbc/RestRequestTest.java
+++ b/src/test/java/net/snowflake/client/jdbc/RestRequestTest.java
@@ -272,6 +272,7 @@ class TestCase {
testCases.add(new TestCase(509, false, false));
testCases.add(new TestCase(510, false, false));
testCases.add(new TestCase(511, false, false));
+ testCases.add(new TestCase(513, false, false));
// do retry on HTTP 403 option
testCases.add(new TestCase(100, true, true));
testCases.add(new TestCase(101, true, true));
@@ -325,6 +326,7 @@ class TestCase {
testCases.add(new TestCase(509, true, false));
testCases.add(new TestCase(510, true, false));
testCases.add(new TestCase(511, true, false));
+ testCases.add(new TestCase(513, true, false));
for (TestCase t : testCases) {
if (t.result) {