From a5ba0b3a8986c6c883706b658b26ae42677369ef Mon Sep 17 00:00:00 2001
From: Laird Nelson <ljnelson@gmail.com>
Date: Tue, 5 Apr 2022 21:07:40 -0700
Subject: [PATCH 1/3] Fixes broken Maven practices in the OCI Java SDK

Signed-off-by: Laird Nelson <ljnelson@gmail.com>
---
 .../bmc-resteasy-client-configurator/pom.xml  |  20 +--
 bmc-addons/bmc-sasl/pom.xml                   |   1 -
 bmc-circuitbreaker/pom.xml                    |  22 +--
 bmc-common/pom.xml                            |  31 ----
 bmc-encryption/pom.xml                        |  18 +--
 bmc-shaded/bmc-shaded-full/pom.xml            |   5 +-
 pom.xml                                       | 133 ++++++++++++------
 7 files changed, 94 insertions(+), 136 deletions(-)

diff --git a/bmc-addons/bmc-resteasy-client-configurator/pom.xml b/bmc-addons/bmc-resteasy-client-configurator/pom.xml
index 0aac918a28d..ca3f1278421 100644
--- a/bmc-addons/bmc-resteasy-client-configurator/pom.xml
+++ b/bmc-addons/bmc-resteasy-client-configurator/pom.xml
@@ -14,29 +14,11 @@
   <description>This project adds support for the RestEasyClientConfigurator for the Java SDK</description>
   <url>https://docs.cloud.oracle.com/Content/API/SDKDocs/javasdk.htm</url>
 
-
   <dependencies>
-    <!-- https://mvnrepository.com/artifact/org.jboss.resteasy/resteasy-client -->
-    <dependency>
-      <groupId>org.jboss.resteasy</groupId>
-      <artifactId>resteasy-client</artifactId>
-      <version>4.5.9.Final</version>
-    </dependency>
-
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
-      <artifactId>resteasy-jaxrs</artifactId>
-      <version>3.15.1.Final</version>
+      <artifactId>resteasy-core</artifactId>
     </dependency>
-
-    <!-- Resteasy-JaxRs transitive dependencies that are resolved to a newer version to fix
-        known security vulnerabilities -->
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>${apache-httpcomponents.version}</version>
-    </dependency>
-
     <dependency>
       <groupId>com.oracle.oci.sdk</groupId>
       <artifactId>oci-java-sdk-common</artifactId>
diff --git a/bmc-addons/bmc-sasl/pom.xml b/bmc-addons/bmc-sasl/pom.xml
index ca2e945c54c..908f780c7f8 100644
--- a/bmc-addons/bmc-sasl/pom.xml
+++ b/bmc-addons/bmc-sasl/pom.xml
@@ -57,7 +57,6 @@
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
-      <version>3.19.3</version>
     </dependency>
     <dependency>
       <groupId>com.oracle.oci.sdk</groupId>
diff --git a/bmc-circuitbreaker/pom.xml b/bmc-circuitbreaker/pom.xml
index 5673e141a00..40c815ba9fc 100644
--- a/bmc-circuitbreaker/pom.xml
+++ b/bmc-circuitbreaker/pom.xml
@@ -13,21 +13,6 @@
   <description>This project contains the Circuit Breaker module used for Oracle Cloud Infrastructure SDKs</description>
   <url>https://docs.cloud.oracle.com/Content/API/SDKDocs/javasdk.htm</url>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
-  
-  <build>
-    <!-- Substitutes maven properties into the SDK properties -->
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-  </build>
-
   <dependencies>
     <dependency>
       <groupId>org.projectlombok</groupId>
@@ -45,15 +30,12 @@
       <groupId>io.github.resilience4j</groupId>
       <artifactId>resilience4j-circuitbreaker</artifactId>
     </dependency>
+    <!-- Test Time Dependencies -->
     <dependency>
       <groupId>org.glassfish.jersey.core</groupId>
       <artifactId>jersey-client</artifactId>
+      <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.inject</groupId>
-      <artifactId>jersey-hk2</artifactId>
-    </dependency>
-    <!-- Test Time Dependencies -->
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
diff --git a/bmc-common/pom.xml b/bmc-common/pom.xml
index ad81069cd51..ee32aeab590 100644
--- a/bmc-common/pom.xml
+++ b/bmc-common/pom.xml
@@ -13,11 +13,6 @@
   <description>This project contains the common runtime components of the SDK used for Oracle Cloud Infrastructure</description>
   <url>https://docs.cloud.oracle.com/Content/API/SDKDocs/javasdk.htm</url>
 
-  <properties>
-    <bouncycastle.version>1.70</bouncycastle.version>
-  </properties>
-
-
   <build>
     <!-- Substitutes maven properties into the SDK properties -->
     <resources>
@@ -45,21 +40,10 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
     </dependency>
-
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-jsr310</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-jdk8</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.glassfish.jersey.core</groupId>
       <artifactId>jersey-client</artifactId>
@@ -72,26 +56,17 @@
       <groupId>org.glassfish.jersey.media</groupId>
       <artifactId>jersey-media-json-jackson</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>
-      <version>${bouncycastle.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15on</artifactId>
-      <version>${bouncycastle.version}</version>
     </dependency>
     <dependency>
       <groupId>com.nimbusds</groupId>
       <artifactId>nimbus-jose-jwt</artifactId>
-      <version>9.11.1</version>
-    </dependency>
-    <dependency>
-      <groupId>net.minidev</groupId>
-      <artifactId>json-smart</artifactId>
-      <version>2.4.7</version>
     </dependency>
     <dependency>
       <groupId>io.github.resilience4j</groupId>
@@ -106,12 +81,6 @@
     <dependency>
       <groupId>org.glassfish.jersey.connectors</groupId>
       <artifactId>jersey-apache-connector</artifactId>
-      <version>${jersey.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>${apache-httpcomponents.version}</version>
     </dependency>
     <!-- End ApacheConnector Http Dependencies -->
   </dependencies>
diff --git a/bmc-encryption/pom.xml b/bmc-encryption/pom.xml
index 40a73ae81c9..4bc57fb07e4 100644
--- a/bmc-encryption/pom.xml
+++ b/bmc-encryption/pom.xml
@@ -14,20 +14,12 @@
   <description>This project contains the common runtime components of the SDK used for Oracle Cloud Infrastructure</description>
   <url>https://docs.cloud.oracle.com/Content/API/SDKDocs/javasdk.htm</url>
 
-  <properties>
-    <bouncycastle.version>1.70</bouncycastle.version>
-  </properties>
-
-  
-  <build>
-  </build>
-
   <dependencies>
     <dependency>
       <groupId>com.oracle.oci.sdk</groupId>
       <artifactId>oci-java-sdk-common</artifactId>
       <version>2.22.0</version>
-  </dependency>
+    </dependency>
     <dependency>
       <groupId>com.oracle.oci.sdk</groupId>
       <artifactId>oci-java-sdk-circuitbreaker</artifactId>
@@ -39,12 +31,8 @@
       <version>2.22.0</version>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-jsr310</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-jdk8</artifactId>
+      <groupId>net.minidev</groupId>
+      <artifactId>json-smart</artifactId>
     </dependency>
   </dependencies>
 </project>
diff --git a/bmc-shaded/bmc-shaded-full/pom.xml b/bmc-shaded/bmc-shaded-full/pom.xml
index b3f5a6e81a3..0f5cf94cff2 100644
--- a/bmc-shaded/bmc-shaded-full/pom.xml
+++ b/bmc-shaded/bmc-shaded-full/pom.xml
@@ -15,17 +15,14 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>${slf4j.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>
-      <version>${bouncycastle.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15on</artifactId>
-      <version>${bouncycastle.version}</version>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index d3fc9e4accb..0a34f39c1b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,8 +37,11 @@
     <jackson.version>2.13.1</jackson.version>
     <jersey.version>2.35</jersey.version>
     <apache-httpcomponents.version>4.5.13</apache-httpcomponents.version>
+    <apache.httpcomponents.httpclient.version>${apache-httpcomponents.version}</apache.httpcomponents.httpclient.version>
+    <apache.httpcomponents.httpcore.version>4.4.15</apache.httpcomponents.httpcore.version>
     <guava.version>31.0.1-jre</guava.version>
     <junit.version>4.13.2</junit.version>
+    <hamcrest.junit.version>2.0.0.0</hamcrest.junit.version>
     <lombok.version>1.18.20</lombok.version>
     <lombok.maven.version>1.18.20.0</lombok.maven.version>
     <jsr305.version>3.0.2</jsr305.version>
@@ -50,9 +53,13 @@
     <!-- Update resilience4jVersion and io.vavr.version together -->
     <resilience4jVersion>1.7.1</resilience4jVersion>
     <io.vavr.version>0.10.4</io.vavr.version>
+    <json.smart.version>2.4.7</json.smart.version>
     <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
     <bouncycastle.version>1.70</bouncycastle.version>
+    <protobuf.java.version>3.19.3</protobuf.java.version>
+    <resteasy.version>4.5.9.Final</resteasy.version> <!-- 3.15.1.Final -->
     <mockito.version>1.10.19</mockito.version>
+    <nimbus.jose.jwt.version>9.11.1</nimbus.jose.jwt.version>
     <powermock.version>1.7.4</powermock.version>
     <excluded.testcases>**/*IntegrationAutoTest.java</excluded.testcases>
     <dev.profile.skip.javadoc>true</dev.profile.skip.javadoc>
@@ -476,7 +483,6 @@
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-junit</artifactId>
-      <version>2.0.0.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -487,13 +493,11 @@
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-module-junit4</artifactId>
-      <version>${powermock.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-api-mockito</artifactId>
-      <version>${powermock.version}</version>
       <scope>test</scope>
     </dependency>
     <!-- Build only dependencies -->
@@ -506,30 +510,44 @@
     <dependency>
       <groupId>jakarta.ws.rs</groupId>
       <artifactId>jakarta.ws.rs-api</artifactId>
-      <version>${jakarta.ws.rs-api.version}</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>${slf4j.version}</version>
     </dependency>
   </dependencies>
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.glassfish.jersey.core</groupId>
-        <artifactId>jersey-client</artifactId>
-        <version>${jersey.version}</version>
+        <groupId>jakarta.ws.rs</groupId>
+        <artifactId>jakarta.ws.rs-api</artifactId>
+        <version>${jakarta.ws.rs-api.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.glassfish.jersey.inject</groupId>
-        <artifactId>jersey-hk2</artifactId>
+        <groupId>org.glassfish.jersey</groupId>
+        <artifactId>jersey-bom</artifactId>
         <version>${jersey.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
       <dependency>
-        <groupId>org.glassfish.jersey.media</groupId>
-        <artifactId>jersey-media-json-jackson</artifactId>
-        <version>${jersey.version}</version>
+        <groupId>com.fasterxml.jackson</groupId>
+        <artifactId>jackson-bom</artifactId>
+        <version>${jackson.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss.resteasy</groupId>
+        <artifactId>resteasy-bom</artifactId>
+        <version>${resteasy.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss.resteasy</groupId>
+        <artifactId>resteasy-core</artifactId>
+        <version>${resteasy.version}</version>
       </dependency>
       <dependency>
         <groupId>com.google.code.findbugs</groupId>
@@ -541,11 +559,25 @@
         <artifactId>guava</artifactId>
         <version>${guava.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-java</artifactId>
+        <version>${protobuf.java.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpclient</artifactId>
+        <version>${apache.httpcomponents.httpclient.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpcore</artifactId>
+        <version>${apache.httpcomponents.httpcore.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.projectlombok</groupId>
         <artifactId>lombok</artifactId>
         <version>${lombok.version}</version>
-        <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>commons-codec</groupId>
@@ -562,36 +594,6 @@
         <artifactId>commons-io</artifactId>
         <version>${commons-io.version}</version>
       </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-annotations</artifactId>
-        <version>${jackson.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-core</artifactId>
-        <version>${jackson.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-databind</artifactId>
-        <version>${jackson.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.jaxrs</groupId>
-        <artifactId>jackson-jaxrs-base</artifactId>
-        <version>${jackson.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.datatype</groupId>
-        <artifactId>jackson-datatype-jsr310</artifactId>
-        <version>${jackson.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.datatype</groupId>
-        <artifactId>jackson-datatype-jdk8</artifactId>
-        <version>${jackson.version}</version>
-      </dependency>
       <dependency>
         <groupId>io.github.resilience4j</groupId>
         <artifactId>resilience4j-core</artifactId>
@@ -608,16 +610,55 @@
         <artifactId>vavr</artifactId>
         <version>${io.vavr.version}</version>
       </dependency>
+      <dependency>
+        <groupId>net.minidev</groupId>
+        <artifactId>json-smart</artifactId>
+        <version>${json.smart.version}</version>
+      </dependency>
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>${junit.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.bouncycastle</groupId>
+        <artifactId>bcpkix-jdk15on</artifactId>
+        <version>${bouncycastle.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.bouncycastle</groupId>
+        <artifactId>bcprov-jdk15on</artifactId>
+        <version>${bouncycastle.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.nimbusds</groupId>
+        <artifactId>nimbus-jose-jwt</artifactId>
+        <version>${nimbus.jose.jwt.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
         <version>${mockito.version}</version>
-        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest-junit</artifactId>
+        <version>${hamcrest.junit.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.powermock</groupId>
+        <artifactId>powermock-module-junit4</artifactId>
+        <version>${powermock.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.powermock</groupId>
+        <artifactId>powermock-api-mockito</artifactId>
+        <version>${powermock.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -731,4 +772,4 @@
     <module>bmc-full</module>
     <module>bmc-shaded</module>
   </modules>
-</project>
\ No newline at end of file
+</project>

From d5205c6253d37eadb7bcdd1059c061db28b28f0a Mon Sep 17 00:00:00 2001
From: Laird Nelson <ljnelson@gmail.com>
Date: Tue, 5 Apr 2022 22:30:57 -0700
Subject: [PATCH 2/3] Squashable commit; fixing more issues

Signed-off-by: Laird Nelson <ljnelson@gmail.com>
---
 bmc-circuitbreaker/pom.xml |  9 +--------
 bmc-common/pom.xml         |  9 +++++----
 bmc-encryption/pom.xml     |  1 +
 bmc-examples/pom.xml       |  4 +---
 pom.xml                    | 12 ++++++++++++
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/bmc-circuitbreaker/pom.xml b/bmc-circuitbreaker/pom.xml
index 40c815ba9fc..39cccd35e85 100644
--- a/bmc-circuitbreaker/pom.xml
+++ b/bmc-circuitbreaker/pom.xml
@@ -14,17 +14,10 @@
   <url>https://docs.cloud.oracle.com/Content/API/SDKDocs/javasdk.htm</url>
 
   <dependencies>
-    <dependency>
-      <groupId>org.projectlombok</groupId>
-      <artifactId>lombok</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>io.github.resilience4j</groupId>
diff --git a/bmc-common/pom.xml b/bmc-common/pom.xml
index ee32aeab590..3488683c24c 100644
--- a/bmc-common/pom.xml
+++ b/bmc-common/pom.xml
@@ -24,6 +24,11 @@
   </build>
 
   <dependencies>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
@@ -40,10 +45,6 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.core</groupId>
       <artifactId>jersey-client</artifactId>
diff --git a/bmc-encryption/pom.xml b/bmc-encryption/pom.xml
index 4bc57fb07e4..00e76e1c8d4 100644
--- a/bmc-encryption/pom.xml
+++ b/bmc-encryption/pom.xml
@@ -35,4 +35,5 @@
       <artifactId>json-smart</artifactId>
     </dependency>
   </dependencies>
+
 </project>
diff --git a/bmc-examples/pom.xml b/bmc-examples/pom.xml
index e4c77172459..d1aea523d89 100644
--- a/bmc-examples/pom.xml
+++ b/bmc-examples/pom.xml
@@ -42,7 +42,6 @@
       <!-- Note: replace this with a different logging backend if desired -->
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>${slf4j.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -124,7 +123,6 @@
     <dependency>
       <groupId>net.jodah</groupId>
       <artifactId>failsafe</artifactId>
-      <version>0.9.2</version>
     </dependency>
     <dependency>
       <groupId>com.oracle.oci.sdk</groupId>
@@ -463,4 +461,4 @@
       <artifactId>oci-java-sdk-dataconnectivity</artifactId>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index 0a34f39c1b1..62658963f95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,6 +61,7 @@
     <mockito.version>1.10.19</mockito.version>
     <nimbus.jose.jwt.version>9.11.1</nimbus.jose.jwt.version>
     <powermock.version>1.7.4</powermock.version>
+    <net.jodah.failsafe.version>0.9.2</net.jodah.failsafe.version>
     <excluded.testcases>**/*IntegrationAutoTest.java</excluded.testcases>
     <dev.profile.skip.javadoc>true</dev.profile.skip.javadoc>
     <exec.skip>true</exec.skip>
@@ -605,6 +606,7 @@
         <version>${resilience4jVersion}</version>
       </dependency>
       <!-- io.vavr is added here because it is in resilience4j-circuitbreaker, update versions together -->
+      <!-- not at all clear this needs to be managed -->
       <dependency>
         <groupId>io.vavr</groupId>
         <artifactId>vavr</artifactId>
@@ -645,6 +647,11 @@
         <artifactId>slf4j-api</artifactId>
         <version>${slf4j.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-simple</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.hamcrest</groupId>
         <artifactId>hamcrest-junit</artifactId>
@@ -660,6 +667,11 @@
         <artifactId>powermock-api-mockito</artifactId>
         <version>${powermock.version}</version>
       </dependency>
+      <dependency>
+        <groupId>net.jodah</groupId>
+        <artifactId>failsafe</artifactId>
+        <version>${net.jodah.failsafe.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <modules>

From 9b278146f109cea781968f9e3274471571e1ee85 Mon Sep 17 00:00:00 2001
From: Laird Nelson <ljnelson@gmail.com>
Date: Wed, 6 Apr 2022 10:23:01 -0700
Subject: [PATCH 3/3] Squashable commit; refining

Signed-off-by: Laird Nelson <ljnelson@gmail.com>
---
 bmc-common/pom.xml     | 12 ++++++++++++
 bmc-encryption/pom.xml | 15 +++++++++++----
 pom.xml                |  5 +++++
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/bmc-common/pom.xml b/bmc-common/pom.xml
index 3488683c24c..435f794f12a 100644
--- a/bmc-common/pom.xml
+++ b/bmc-common/pom.xml
@@ -24,6 +24,18 @@
   </build>
 
   <dependencies>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
diff --git a/bmc-encryption/pom.xml b/bmc-encryption/pom.xml
index 00e76e1c8d4..cbe0df61f6a 100644
--- a/bmc-encryption/pom.xml
+++ b/bmc-encryption/pom.xml
@@ -22,13 +22,20 @@
     </dependency>
     <dependency>
       <groupId>com.oracle.oci.sdk</groupId>
-      <artifactId>oci-java-sdk-circuitbreaker</artifactId>
+      <artifactId>oci-java-sdk-keymanagement</artifactId>
       <version>2.22.0</version>
     </dependency>
     <dependency>
-      <groupId>com.oracle.oci.sdk</groupId>
-      <artifactId>oci-java-sdk-keymanagement</artifactId>
-      <version>2.22.0</version>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
     </dependency>
     <dependency>
       <groupId>net.minidev</groupId>
diff --git a/pom.xml b/pom.xml
index 62658963f95..cb7d3e9baa9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -632,6 +632,11 @@
         <artifactId>bcprov-jdk15on</artifactId>
         <version>${bouncycastle.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.bouncycastle</groupId>
+        <artifactId>bcutil-jdk15on</artifactId>
+        <version>${bouncycastle.version}</version>
+      </dependency>
       <dependency>
         <groupId>com.nimbusds</groupId>
         <artifactId>nimbus-jose-jwt</artifactId>