Merge branch 'master' into SNOW-928973-incorrect-getString-date-field…

…-fix
snowflakedb · Jun 7, 2024 · 95ddcb4 · 95ddcb4
2 parents 6630e40 + a79f58d
commit 95ddcb4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 15 deletions.
diff --git a/FIPS/pom.xml b/FIPS/pom.xml
@@ -466,13 +466,6 @@
                        <pattern>org.objectweb</pattern>
                        <shadedPattern>${shadeBase}.org.objectweb</shadedPattern>
                      </relocation>
-                     <relocation>
-                       <pattern>com.sun</pattern>
-                       <shadedPattern>${shadeBase}.com.sun</shadedPattern>
-                       <excludes>
-                         <exclude>com.sun.jna.**</exclude>
-                       </excludes>
-                     </relocation>
                      <relocation>
                        <pattern>io.netty</pattern>
                        <shadedPattern>${shadeBase}.io.netty</shadedPattern>

diff --git a/pom.xml b/pom.xml
@@ -886,13 +886,6 @@
                       <pattern>org.objectweb</pattern>
                       <shadedPattern>${shadeBase}.org.objectweb</shadedPattern>
                     </relocation>
-                    <relocation>
-                      <pattern>com.sun</pattern>
-                      <shadedPattern>${shadeBase}.com.sun</shadedPattern>
-                      <excludes>
-                        <exclude>com.sun.jna.**</exclude>
-                      </excludes>
-                    </relocation>
                     <relocation>
                       <pattern>io.netty</pattern>
                       <shadedPattern>${shadeBase}.io.netty</shadedPattern>

diff --git 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
@@ -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) {