diff --git a/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml b/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml
index 05a4da3620ee..61537fcf6e57 100755
--- a/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml
+++ b/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml
@@ -2458,23 +2458,35 @@
     <Field name="detectionConfiguration" />
     <Bug pattern="UWF_UNWRITTEN_FIELD" />
   </Match>
-  
+
   <!-- Disabling false positives in azure-core -->
   <!-- This Issue has been resolved as per spotbugs's recommended solution but the static checker still flags it, its a known issue with this rule. -->
   <Match>
       <Class name="com.azure.core.util.logging.ClientLogger" />
       <Bug pattern="CRLF_INJECTION_LOGS" />
   </Match>
-  
+
   <!-- The predictable randomness doesn't expose any crucial detail in this case. -->
   <Match>
       <Class name="com.azure.core.http.policy.ExponentialBackoff" />
       <Bug pattern="PREDICTABLE_RANDOM" />
   </Match>
-  
+
   <!-- In the default log level azure-core will not print the stack trace, but when the user opt-in for the lowest level log (DEBUG) we'll print it, which is expected. -->
   <Match>
       <Class name="com.azure.core.implementation.logging.DefaultLogger" />
       <Bug pattern="INFORMATION_EXPOSURE_THROUGH_AN_ERROR_MESSAGE" />
   </Match>
+
+  <!-- False positives -->
+  <Match>
+      <Class name="com.azure.security.keyvault.jca.KeyVaultKeyStore" />
+      <Method name="getFilenames" />
+      <Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE" />
+  </Match>
+  <Match>
+      <Class name="com.azure.security.keyvault.jca.LegacyRestClient" />
+      <Method name="~(get|post)" />
+      <Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE" />
+  </Match>
 </FindBugsFilter>
diff --git a/sdk/keyvault/azure-security-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-keyvault-jca/pom.xml
index d2ee04e7f8d8..f0919035645d 100644
--- a/sdk/keyvault/azure-security-keyvault-jca/pom.xml
+++ b/sdk/keyvault/azure-security-keyvault-jca/pom.xml
@@ -122,14 +122,6 @@
                     </rules>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>com.github.spotbugs</groupId>
-                <artifactId>spotbugs-maven-plugin</artifactId>
-                <version>3.1.12.2</version> <!-- {x-version-update;com.github.spotbugs:spotbugs-maven-plugin;external_dependency} -->
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.revapi</groupId>
                 <artifactId>revapi-maven-plugin</artifactId>
@@ -148,12 +140,12 @@
             <version>5.0.1</version> <!-- {x-version-update;org.apache.httpcomponents.client5:httpclient5;external_dependency} -->
             <optional>true</optional>
         </dependency>
+        <!-- Conscrypt -->
         <dependency>
             <groupId>org.conscrypt</groupId>
             <artifactId>conscrypt-openjdk-uber</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
             <version>2.2.1</version> <!-- {x-version-update;org.conscrypt:conscrypt-openjdk-uber;external_dependency} -->
-            <optional>true</optional>
         </dependency>
         <!-- Jackson Databind -->
         <dependency>
@@ -192,14 +184,14 @@
         <profile>
             <id>it</id>
             <!--
-      
+
               To run the integration tests pass in the following system properties
-      
+
               - azure.keyvault.uri    - the Azure Key Vault URI
               - azure.tenant.id       - your tenant ID
               - azure.client.id       - the (application) client ID
               - azure.client.secret   - the (application) client secret
-      
+
             -->
             <activation>
                 <property>
diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyManager.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyManager.java
index 1cf099d84b0f..4e42e1505b56 100644
--- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyManager.java
+++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyManager.java
@@ -50,7 +50,12 @@ public class KeyVaultKeyManager extends X509ExtendedKeyManager {
     public KeyVaultKeyManager(KeyStore keystore, char[] password) {
         LOGGER.entering("KeyVaultKeyManager", "<init>", new Object[] { keystore, password });
         this.keystore = keystore;
-        this.password = password;
+        if (password != null) {
+            this.password = new char[password.length];
+            System.arraycopy(password, 0, this.password, 0, password.length);
+        } else {
+            this.password = null;
+        }
     }
 
     @Override
diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java
index 634a6e1924fe..7c21d9570375 100644
--- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java
+++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java
@@ -9,6 +9,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
 import java.security.Key;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
@@ -33,7 +34,7 @@
 /**
  * The Azure Key Vault implementation of the KeyStoreSpi.
  */
-public class KeyVaultKeyStore extends KeyStoreSpi {
+public final class KeyVaultKeyStore extends KeyStoreSpi {
 
     /**
      * Stores the logger.
@@ -155,7 +156,7 @@ public Certificate[] engineGetCertificateChain(String alias) {
 
     @Override
     public Date engineGetCreationDate(String alias) {
-        return creationDate;
+        return new Date(creationDate.getTime());
     }
 
     @Override
@@ -259,7 +260,7 @@ private String[] getFilenames(String path) throws IOException {
         List<String> filenames = new ArrayList<>();
         try (InputStream in = getClass().getResourceAsStream(path)) {
             if (in != null) {
-                try (BufferedReader br = new BufferedReader(new InputStreamReader(in))) {
+                try (BufferedReader br = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8))) {
                     String resource;
                     while ((resource = br.readLine()) != null) {
                         filenames.add(resource);
diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificateBundle.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificateBundle.java
index c874a5483b3c..21c4b983aaa0 100644
--- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificateBundle.java
+++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificateBundle.java
@@ -9,6 +9,11 @@
  * The CertificateBundle REST model.
  */
 public class CertificateBundle implements Serializable {
+    
+    /**
+     * Stores the serial version UID.
+     */
+    private static final long serialVersionUID = 1L;
 
     /**
      * Stores the CER bytes.
diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificateItem.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificateItem.java
index 66dbcf277c66..fcfa95233a8c 100644
--- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificateItem.java
+++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificateItem.java
@@ -9,6 +9,11 @@
  * The CertificateItem REST model.
  */
 public class CertificateItem implements Serializable {
+    
+    /**
+     * Stores the serial version UID.
+     */
+    private static final long serialVersionUID = 1L;
 
     /**
      * Stores the id.
diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificateListResult.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificateListResult.java
index 59dd984e3db4..f993a58d5c15 100644
--- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificateListResult.java
+++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificateListResult.java
@@ -10,6 +10,11 @@
  * The CertificateItem REST model.
  */
 public class CertificateListResult implements Serializable {
+    
+    /**
+     * Stores the serial version UID.
+     */
+    private static final long serialVersionUID = 1L;
 
     /**
      * Stores the value.
diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificatePolicy.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificatePolicy.java
index 871d73500038..adefbfb134c3 100644
--- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificatePolicy.java
+++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/CertificatePolicy.java
@@ -10,6 +10,11 @@
  * The CertificatePolicy REST model.
  */
 public class CertificatePolicy implements Serializable {
+    
+    /**
+     * Stores the serial version UID.
+     */
+    private static final long serialVersionUID = 1L;
 
     /**
      * Stores the key properties.
diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/KeyProperties.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/KeyProperties.java
index 52ee90d4826a..7d4b5c77982a 100644
--- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/KeyProperties.java
+++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/KeyProperties.java
@@ -9,6 +9,11 @@
  * The KeyProperties REST model.
  */
 public class KeyProperties implements Serializable {
+    
+    /**
+     * Stores the serial version UID.
+     */
+    private static final long serialVersionUID = 1L;
 
     /**
      * Stores if the key is exportable.
diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/OAuthToken.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/OAuthToken.java
index 55206bc4070a..63841f788059 100644
--- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/OAuthToken.java
+++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/OAuthToken.java
@@ -9,6 +9,11 @@
  * An OAuth2 token.
  */
 public class OAuthToken implements Serializable {
+    
+    /**
+     * Stores the serial version UID.
+     */
+    private static final long serialVersionUID = 1L;
 
     /**
      * Stores the access token.
diff --git a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/SecretBundle.java b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/SecretBundle.java
index a15f8ba47745..ce2d65880510 100644
--- a/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/SecretBundle.java
+++ b/sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/rest/SecretBundle.java
@@ -9,6 +9,11 @@
  * The SecretBundle REST model.
  */
 public class SecretBundle implements Serializable {
+    
+    /**
+     * Stores the serial version UID.
+     */
+    private static final long serialVersionUID = 1L;
 
     /**
      * Stores the value.