SNOW-2117143: Add missing Bouncy Castle test dependency

Author: sfc-gh-rkowalski

TestOnly/pom.xml

@@ -23,6 +23,7 @@
     <mockito.version>3.5.6</mockito.version>
     <netty.version>4.1.118.Final</netty.version>
     <apache.httpclient.version>4.5.14</apache.httpclient.version>
+    <bouncycastle.version>1.78.1</bouncycastle.version>
     <shadeBase>net.snowflake.client.jdbc.internal</shadeBase>
   </properties>
 
@@ -257,6 +258,11 @@
       <artifactId>jna-platform</artifactId>
       <version>${jna.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk18on</artifactId>
+      <version>${bouncycastle.version}</version>
+    </dependency>
   </dependencies>
 
   <build>

src/test/java/net/snowflake/client/core/crl/CRLValidationUtilsTest.java

@@ -7,7 +7,6 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.security.Security;
 import java.security.cert.X509CRL;
 import java.security.cert.X509Certificate;
 import java.time.LocalDate;
@@ -18,8 +17,6 @@
 import net.snowflake.client.category.TestTags;
 import net.snowflake.client.core.crl.CertificateGeneratorUtil.CertificateChain;
 import org.bouncycastle.asn1.x509.IssuingDistributionPoint;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Tag;
@@ -29,11 +26,6 @@
 class CRLValidationUtilsTest {
   private CertificateGeneratorUtil certGen;
 
-  @BeforeAll
-  static void setUpClass() {
-    Security.addProvider(new BouncyCastleProvider());
-  }
-
   @BeforeEach
   void setUp() {
     certGen = new CertificateGeneratorUtil();

src/test/java/net/snowflake/client/core/crl/CRLValidatorTest.java

@@ -5,7 +5,6 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 
-import java.security.Security;
 import java.security.cert.X509Certificate;
 import java.time.LocalDate;
 import java.time.ZoneId;
@@ -15,8 +14,6 @@
 import net.snowflake.client.category.TestTags;
 import net.snowflake.client.core.crl.CertificateGeneratorUtil.CertificateChain;
 import org.apache.http.impl.client.CloseableHttpClient;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
@@ -44,11 +41,6 @@ class CRLValidatorTest {
   private CertificateGeneratorUtil certGen;
   private CloseableHttpClient mockHttpClient;
 
-  @BeforeAll
-  static void setUpClass() {
-    Security.addProvider(new BouncyCastleProvider());
-  }
-
   @BeforeEach
   void setUp() {
     certGen = new CertificateGeneratorUtil();

src/test/java/net/snowflake/client/core/crl/CRLValidatorWiremockIT.java

@@ -3,7 +3,6 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.security.Security;
 import java.security.cert.X509Certificate;
 import java.util.Arrays;
 import java.util.Date;
@@ -12,8 +11,6 @@
 import net.snowflake.client.jdbc.BaseWiremockTest;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
@@ -36,11 +33,6 @@ public class CRLValidatorWiremockIT extends BaseWiremockTest {
   private CertificateGeneratorUtil certGen;
   private CloseableHttpClient httpClient;
 
-  @BeforeAll
-  public static void setUpClassCRL() {
-    Security.addProvider(new BouncyCastleProvider());
-  }
-
   @BeforeEach
   public void setUpTest() {
     certGen = new CertificateGeneratorUtil();

src/test/java/net/snowflake/client/core/crl/CertificateGeneratorUtil.java

@@ -6,6 +6,7 @@
 import java.security.PrivateKey;
 import java.security.PublicKey;
 import java.security.SecureRandom;
+import java.security.Security;
 import java.security.cert.X509CRL;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
@@ -18,6 +19,7 @@
 import org.bouncycastle.asn1.x509.DistributionPointName;
 import org.bouncycastle.asn1.x509.Extension;
 import org.bouncycastle.asn1.x509.GeneralName;
+import org.bouncycastle.asn1.x509.GeneralNames;
 import org.bouncycastle.asn1.x509.IssuingDistributionPoint;
 import org.bouncycastle.asn1.x509.KeyUsage;
 import org.bouncycastle.cert.CertIOException;
@@ -29,6 +31,7 @@
 import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
 import org.bouncycastle.cert.jcajce.JcaX509v2CRLBuilder;
 import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.operator.ContentSigner;
 import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
 
@@ -45,6 +48,7 @@ class CertificateGeneratorUtil {
 
   CertificateGeneratorUtil() {
     try {
+      Security.addProvider(new BouncyCastleProvider());
       this.caKeyPair = generateKeyPair();
       this.caCertificate = createCACertificate();
     } catch (Exception e) {
@@ -78,8 +82,7 @@ private X509Certificate createCertificate(
 
       DistributionPointName dpName =
           new DistributionPointName(
-              DistributionPointName.FULL_NAME,
-              new org.bouncycastle.asn1.x509.GeneralNames(generalNames));
+              DistributionPointName.FULL_NAME, new GeneralNames(generalNames));
 
       CRLDistPoint crlDistPoint =
           new CRLDistPoint(new DistributionPoint[] {new DistributionPoint(dpName, null, null)});
@@ -123,9 +126,7 @@ X509CRL createCRLWithIDPDistributionPoints(
             .toArray(GeneralName[]::new);
 
     DistributionPointName dpName =
-        new DistributionPointName(
-            DistributionPointName.FULL_NAME,
-            new org.bouncycastle.asn1.x509.GeneralNames(generalNames));
+        new DistributionPointName(DistributionPointName.FULL_NAME, new GeneralNames(generalNames));
 
     IssuingDistributionPoint idp =
         new IssuingDistributionPoint(dpName, false, false, null, false, false);

src/test/java/net/snowflake/client/core/crl/VerifiedCertPathBuilderTest.java

@@ -13,7 +13,6 @@
 import java.security.PrivateKey;
 import java.security.PublicKey;
 import java.security.SecureRandom;
-import java.security.Security;
 import java.security.cert.X509Certificate;
 import java.util.Date;
 import java.util.HashSet;
@@ -30,10 +29,8 @@
 import org.bouncycastle.cert.X509v3CertificateBuilder;
 import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
 import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.operator.ContentSigner;
 import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
@@ -54,11 +51,6 @@ class VerifiedCertPathBuilderTest {
 
   private TestCertificateGenerator certGen;
 
-  @BeforeAll
-  static void setUpClass() {
-    Security.addProvider(new BouncyCastleProvider());
-  }
-
   @BeforeEach
   void setUp() {
     certGen = new TestCertificateGenerator();