From dfe2ac3413faefa57889613ddba7a1f2d228dddf Mon Sep 17 00:00:00 2001
From: Laird Nelson <laird.nelson@oracle.com>
Date: Tue, 24 Oct 2023 16:17:42 -0700
Subject: [PATCH] [2.x] Upgrades OCI to version 3.x (#7883)

* Upgrades OCI to version 3.x

Signed-off-by: Laird Nelson <laird.nelson@oracle.com>
---
 dependencies/pom.xml                          | 740 +-----------------
 .../cdi/oci-objectstorage/pom.xml             |   5 +
 .../integrations/oci/atp/cdi/AtpResource.java |   7 +-
 integrations/oci/sdk/cdi/pom.xml              |  28 +-
 .../oci/sdk/cdi/OciExtension.java             |  17 +-
 .../sdk/cdi/src/main/java/module-info.java    |   5 +-
 .../integrations/oci/sdk/cdi/TestSpike.java   |  22 +-
 7 files changed, 58 insertions(+), 766 deletions(-)

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 26e2b367e55..98f13dccd54 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -124,7 +124,7 @@
         <version.lib.narayana>5.12.0.Final</version.lib.narayana>
         <version.lib.netty>4.1.100.Final</version.lib.netty>
         <version.lib.netty-io_uring>0.0.19.Final</version.lib.netty-io_uring>
-        <version.lib.oci>2.66.0</version.lib.oci>
+        <version.lib.oci>3.26.0</version.lib.oci>
         <version.lib.oci-java-sdk-objectstorage>${version.lib.oci}</version.lib.oci-java-sdk-objectstorage>
         <version.lib.ojdbc8>21.3.0.0</version.lib.ojdbc8>
         <version.lib.database.messaging>19.3.0.0</version.lib.database.messaging>
@@ -1410,8 +1410,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <!-- OCI BOM omitted due to https://github.com/oracle/oci-java-sdk/issues/432 -->
-            <!--
             <dependency>
                 <groupId>com.oracle.oci.sdk</groupId>
                 <artifactId>oci-java-sdk-bom</artifactId>
@@ -1419,742 +1417,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            -->
-
-            <!-- OCI BOM contents inlined below to work around https://github.com/oracle/oci-java-sdk/issues/432 -->
-
-            <!-- Common packages -->
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-circuitbreaker</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-common</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <!-- Service modules, alpha sorted -->
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-audit</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-containerengine</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-core</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-database</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-dns</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-email</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-filestorage</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-identity</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-loadbalancer</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-objectstorage</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-addons-resteasy-client-configurator</artifactId>
-              <version>${version.lib.oci}</version>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-addons-sasl</artifactId>
-              <version>${version.lib.oci}</version>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-addons-graalvm</artifactId>
-              <version>${version.lib.oci}</version>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-resourcesearch</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-addons-apache</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-keymanagement</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-announcementsservice</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-healthchecks</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-waas</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-streaming</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-resourcemanager</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-monitoring</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-ons</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-autoscaling</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-budget</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-workrequests</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-limits</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-functions</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-events</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-dts</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-oce</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-oda</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-analytics</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-integration</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-osmanagement</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-marketplace</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-apigateway</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-applicationmigration</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-datacatalog</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-dataflow</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-datascience</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-nosql</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-secrets</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-vault</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-bds</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-encryption</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-cims</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-datasafe</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-mysql</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-dataintegration</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-ocvp</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-usageapi</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-blockchain</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-loggingingestion</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-logging</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-loganalytics</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-managementdashboard</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-sch</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-loggingsearch</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-managementagent</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-cloudguard</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-opsi</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-computeinstanceagent</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-optimizer</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-tenantmanagercontrolplane</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-rover</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-databasemanagement</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-artifacts</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-apmsynthetics</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-goldengate</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-apmcontrolplane</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-apmtraces</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-networkloadbalancer</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-vulnerabilityscanning</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-databasemigration</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-servicecatalog</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-ailanguage</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-operatoraccesscontrol</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-bastion</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-genericartifactscontent</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-jms</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-devops</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-aianomalydetection</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-datalabelingservice</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-datalabelingservicedataplane</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-apmconfig</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-waf</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-certificates</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-certificatesmanagement</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-usage</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-databasetools</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-servicemanagerproxy</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-appmgmtcontrol</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-ospgateway</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-identitydataplane</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-visualbuilder</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-osubusage</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-osubsubscription</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-osuborganizationsubscription</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-osubbillingschedule</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-dashboardservice</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-threatintelligence</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-aivision</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-aispeech</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-dataconnectivity</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-stackmonitoring</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-servicemesh</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-adm</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-licensemanager</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-onesubscription</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-governancerulescontrolplane</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-waa</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-networkfirewall</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-vnmonitoring</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-emwarehouse</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-lockbox</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-fusionapps</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-mediaservices</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-opa</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-            <dependency>
-              <groupId>com.oracle.oci.sdk</groupId>
-              <artifactId>oci-java-sdk-opensearch</artifactId>
-              <version>${version.lib.oci}</version>
-              <optional>false</optional>
-            </dependency>
-
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/examples/integrations/cdi/oci-objectstorage/pom.xml b/examples/integrations/cdi/oci-objectstorage/pom.xml
index c0daa5172f8..64ac668f750 100644
--- a/examples/integrations/cdi/oci-objectstorage/pom.xml
+++ b/examples/integrations/cdi/oci-objectstorage/pom.xml
@@ -42,6 +42,11 @@
             <artifactId>oci-java-sdk-objectstorage</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.microprofile.config</groupId>
             <artifactId>microprofile-config-api</artifactId>
diff --git a/examples/integrations/oci/atp-cdi/src/main/java/io/helidon/examples/integrations/oci/atp/cdi/AtpResource.java b/examples/integrations/oci/atp-cdi/src/main/java/io/helidon/examples/integrations/oci/atp/cdi/AtpResource.java
index 91657046067..85e73c18a98 100644
--- a/examples/integrations/oci/atp-cdi/src/main/java/io/helidon/examples/integrations/oci/atp/cdi/AtpResource.java
+++ b/examples/integrations/oci/atp-cdi/src/main/java/io/helidon/examples/integrations/oci/atp/cdi/AtpResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,10 +44,11 @@
 import com.oracle.bmc.database.model.GenerateAutonomousDatabaseWalletDetails;
 import com.oracle.bmc.database.requests.GenerateAutonomousDatabaseWalletRequest;
 import com.oracle.bmc.database.responses.GenerateAutonomousDatabaseWalletResponse;
-import com.oracle.bmc.http.internal.ResponseHelper;
 import oracle.security.pki.OraclePKIProvider;
 import oracle.ucp.jdbc.PoolDataSource;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
+
+import static com.oracle.bmc.http.client.Options.shouldAutoCloseResponseInputStream;
 /**
  * JAX-RS resource - REST API for the atp example.
  */
@@ -82,7 +83,7 @@ public class AtpResource {
     @GET
     @Path("/wallet")
     public Response generateWallet() {
-        ResponseHelper.shouldAutoCloseResponseInputStream(false);
+        shouldAutoCloseResponseInputStream(false);
         GenerateAutonomousDatabaseWalletResponse walletResponse =
                 databaseClient.generateAutonomousDatabaseWallet(
                         GenerateAutonomousDatabaseWalletRequest.builder()
diff --git a/integrations/oci/sdk/cdi/pom.xml b/integrations/oci/sdk/cdi/pom.xml
index cdc73ee63ae..4e7722effe7 100644
--- a/integrations/oci/sdk/cdi/pom.xml
+++ b/integrations/oci/sdk/cdi/pom.xml
@@ -57,6 +57,32 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.oracle.oci.sdk</groupId>
+            <artifactId>oci-java-sdk-common-httpclient-jersey</artifactId>
+            <scope>compile</scope>
+            <exclusions>
+                <!-- For dependency convergence. Defer to versions from jersey-apache-connector -->
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpcore</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
         <!-- For dependency convergence. To make sure we use Jersey version of org.apache.httpcomponents:httpclient and httpcore -->
         <dependency>
             <groupId>org.glassfish.jersey.connectors</groupId>
@@ -149,5 +175,5 @@
             </plugin>
         </plugins>
     </build>
-    
+
 </project>
diff --git a/integrations/oci/sdk/cdi/src/main/java/io/helidon/integrations/oci/sdk/cdi/OciExtension.java b/integrations/oci/sdk/cdi/src/main/java/io/helidon/integrations/oci/sdk/cdi/OciExtension.java
index 2795e064247..43d9b82f002 100644
--- a/integrations/oci/sdk/cdi/src/main/java/io/helidon/integrations/oci/sdk/cdi/OciExtension.java
+++ b/integrations/oci/sdk/cdi/src/main/java/io/helidon/integrations/oci/sdk/cdi/OciExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,7 +69,7 @@
 import com.oracle.bmc.Service;
 import com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider;
 import com.oracle.bmc.common.ClientBuilderBase;
-import com.oracle.bmc.http.ClientConfigurator;
+import com.oracle.bmc.http.client.jersey.ClientBuilderDecorator;
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.config.ConfigProvider;
 
@@ -1065,7 +1065,7 @@ private static Class<?> loadClassUnresolved(String name) throws ClassNotFoundExc
     private static void customizeEndpointResolution(ClientBuilderBase<?, ?> clientBuilder) {
         EndpointAdjuster ea = EndpointAdjuster.of(clientBuilder.getClass().getName());
         if (ea != null) {
-            clientBuilder.additionalClientConfigurator(ea);
+            clientBuilder.clientConfigurator(b -> b.property(ClientBuilderDecorator.PROPERTY, ea));
         }
     }
 
@@ -1321,7 +1321,7 @@ public final boolean equals(Object other) {
 
     }
 
-    private enum EndpointAdjuster implements ClientConfigurator, ClientRequestFilter, Predicate<ClientRequestContext> {
+    private enum EndpointAdjuster implements ClientBuilderDecorator, ClientRequestFilter, Predicate<ClientRequestContext> {
 
 
         /*
@@ -1432,9 +1432,10 @@ private enum EndpointAdjuster implements ClientConfigurator, ClientRequestFilter
          */
 
 
-        @Override // ClientConfigurator
-        public void customizeBuilder(ClientBuilder builder) {
+        @Override // ClientBuilderDecorator
+        public Client finish(ClientBuilder builder) {
             builder.register(this, Map.of(ClientRequestFilter.class, Integer.valueOf(Priorities.AUTHENTICATION - 500)));
+            return builder.build();
         }
 
         @Override // Predicate<ClientRequestContext>
@@ -1459,10 +1460,6 @@ private void adjust(ClientRequestContext crc, String hostname) {
             crc.setUri(UriBuilder.fromUri(crc.getUri()).host(this.adjuster.apply(hostname)).build());
         }
 
-        @Override // ClientConfigurator
-        public void customizeClient(Client client) {
-        }
-
 
         /*
          * Static methods.
diff --git a/integrations/oci/sdk/cdi/src/main/java/module-info.java b/integrations/oci/sdk/cdi/src/main/java/module-info.java
index fca390ccb34..fc4e435e327 100644
--- a/integrations/oci/sdk/cdi/src/main/java/module-info.java
+++ b/integrations/oci/sdk/cdi/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@
 @SuppressWarnings({ "requires-automatic", "requires-transitive-automatic" })
 module io.helidon.integrations.oci.sdk.cdi {
 
-    requires com.google.common; // OCI dependency
     requires java.annotation;
     requires java.logging;
     requires java.ws.rs;
@@ -35,6 +34,8 @@
     requires jakarta.interceptor.api;
     requires microprofile.config.api;
     requires oci.java.sdk.common;
+    requires oci.java.sdk.common.httpclient;
+    requires oci.java.sdk.common.httpclient.jersey;
 
     exports io.helidon.integrations.oci.sdk.cdi;
 
diff --git a/integrations/oci/sdk/cdi/src/test/java/io/helidon/integrations/oci/sdk/cdi/TestSpike.java b/integrations/oci/sdk/cdi/src/test/java/io/helidon/integrations/oci/sdk/cdi/TestSpike.java
index 8bc0e6c8a94..5f2df40c8ae 100644
--- a/integrations/oci/sdk/cdi/src/test/java/io/helidon/integrations/oci/sdk/cdi/TestSpike.java
+++ b/integrations/oci/sdk/cdi/src/test/java/io/helidon/integrations/oci/sdk/cdi/TestSpike.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -190,7 +190,7 @@ private ExampleBean(// The service* parameters below are
                             // isn't; see the comments in the
                             // constructor body below.  It should be
                             // unsatisfied.
-                            Instance<com.oracle.bmc.circuitbreaker.JaxRsCircuitBreaker> unresolvedJaxRsCircuitBreakerInstance,
+                            Instance<com.oracle.bmc.circuitbreaker.OciCircuitBreaker> unresolvedOciCircuitBreakerInstance,
                             // Streaming turns out to be the only
                             // convention-violating service in the
                             // entire portfolio, and the violation is
@@ -217,26 +217,26 @@ private ExampleBean(// The service* parameters below are
                             StreamClient streamingServiceClient, // oddball
                             StreamClientBuilder streamingServiceClientBuilder) { // oddball
             super();
-            // unresolvedJaxRsCircuitBreakerInstance
-            // (Instance<com.oracle.bmc.circuitbreaker.JaxRsCircuitBreaker>)
+            // unresolvedOciCircuitBreakerInstance
+            // (Instance<com.oracle.bmc.circuitbreaker.OciCircuitBreaker>)
             // is an example of something that seems like it obeys the
             // OCI client service pattern.  But it deviates in a
             // couple ways.
             //
-            // First, JaxRsCircuitBreaker is part of the common
+            // First, OciCircuitBreaker is part of the common
             // runtime (see
             // https://docs.oracle.com/en-us/iaas/tools/java/latest/overview-summary.html#:~:text=Oracle%20Cloud%20Infrastructure%20Common%20Runtime),
             // and hence is not a service itself.
             //
-            // Second, there are no JaxRsCircuitBreakerAsync,
-            // JaxRsCircuitBreakerAsyncClient,
-            // JaxRsCircuitBreakerAsyncClient$Builder,
-            // JaxRsCircuitBreakerClient or
-            // JaxRsCircuitBreakerClient$Builder classes.
+            // Second, there are no OciCircuitBreakerAsync,
+            // OciCircuitBreakerAsyncClient,
+            // OciCircuitBreakerAsyncClient$Builder,
+            // OciCircuitBreakerClient or
+            // OciCircuitBreakerClient$Builder classes.
             //
             // For all these reasons it should be excluded from
             // processing (and is, or this test would fail).
-            assertTrue(unresolvedJaxRsCircuitBreakerInstance.isUnsatisfied());
+            assertTrue(unresolvedOciCircuitBreakerInstance.isUnsatisfied());
         }
 
         private static void customizeAsyncBuilder(@Observes AIServiceLanguageAsyncClient.Builder asyncClientBuilder) {