Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace OCI Java SDK shaded jar with v3 for OCI integration #5704

Merged
merged 8 commits into from
Dec 16, 2022
+118 −383
Merged

Replace OCI Java SDK shaded jar with v3 for OCI integration #5704

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dacb420
Replace OCI Java SDK shaded jar with v3 for OCI integration
klustria Dec 15, 2022
39ac0e0
Merge remote-tracking branch 'upstream/helidon-3.x' into 5702-use_oci…
klustria Dec 15, 2022
464867a
Set compile scope for jersey 3 httpclient dependency
klustria Dec 15, 2022
c187045
Fix parent version for oci atp reactive exzmple
klustria Dec 15, 2022
1db5530
Remove import that is not needed anymore
klustria Dec 15, 2022
41f6357
Remove a NOTE pointing to links to oci-compatibility include doc
klustria Dec 16, 2022
962b497
Fix httpclient dependency scoping in MP and add httpclient dependency…
klustria Dec 16, 2022
b3c412f
Merge remote-tracking branch 'upstream/helidon-3.x' into 5702-use_oci…
klustria Dec 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
<version.lib.neo4j>4.4.3</version.lib.neo4j>
<version.lib.netty>4.1.77.Final</version.lib.netty>
<version.lib.netty-io_uring>0.0.8.Final</version.lib.netty-io_uring>
<version.lib.oci>2.45.0</version.lib.oci>
<version.lib.oci>3.0.0</version.lib.oci>
<version.lib.ojdbc8>21.3.0.0</version.lib.ojdbc8>
<version.lib.database.messaging>19.3.0.0</version.lib.database.messaging>
<version.lib.okhttp3>3.14.9</version.lib.okhttp3>
Expand Down Expand Up @@ -1494,6 +1494,12 @@
<version>${version.lib.oci}</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-common-httpclient-jersey3</artifactId>
<version>${version.lib.oci}</version>
<optional>false</optional>
</dependency>
<!-- Service modules, alpha sorted -->
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
Expand Down
59 changes: 0 additions & 59 deletions docs/includes/oci.adoc
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions docs/mp/integrations/oci.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,7 @@ Once you have injected an ObjectStorage client you can use it as described in:
* link:{oci-javasdk-objstore-javadoc-base-url}/package-summary.html[OCI SDK Object Storage Javadocs]
* link:{oci-objstore-url}[OCI Object Storage Overview]

include::{rootdir}/includes/oci.adoc[leveloffset=+1]

== References

* link:{integration-oci-sdk-cdi-javadoc-base-url}/io/helidon/integrations/oci/sdk/cdi/OciExtension.html[OciExtension] Javadocs
* link:{helidon-github-tree-url}/examples/integrations/oci[OCI SDK Usage Examples]
* link:{helidon-github-tree-url}/examples/integrations/oci[OCI SDK Usage Examples]
5 changes: 1 addition & 4 deletions docs/se/integrations/oci.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,8 @@ Once you have created an ObjectStorage client you can use it as described in:
* link:{oci-javasdk-objstore-javadoc-base-url}/package-summary.html[OCI SDK Object Storage Javadocs]
* link:{oci-objstore-url}[OCI Object Storage Overview]


include::{rootdir}/includes/oci.adoc[leveloffset=+1]

== References

* link:{helidon-github-tree-url}/examples/integrations/oci[OCI SDK Usage Examples]
* link:https://docs.oracle.com/en-us/iaas/Content/home.htm[OCI Documentation]
]
]
8 changes: 1 addition & 7 deletions examples/integrations/oci/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
# OCI SDK setup for Examples Build

OCI SDK uses JAX-RS Client 2.1.6 (javax package names), which makes it incompatible with Helidon 3 applications and any application that uses JAX-RS 3 (jakarta package naming).

Please see our [Guide](https://github.com/oracle/helidon/tree/master/docs/includes/oci.adoc) for detailed information on how to work around this issue.

Once you have this setup, you can build examples in this repository directory.
# OCI Java SDK Examples
17 changes: 1 addition & 16 deletions examples/integrations/oci/atp-cdi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,6 @@
<name>Helidon Examples Integration OCI ATP CDI</name>
<description>CDI integration with OCI ATP.</description>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-shaded-full</artifactId>
<version>${version.lib.oci}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>io.helidon.microprofile.bundles</groupId>
Expand All @@ -64,12 +54,7 @@
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-shaded-full</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<scope>runtime</scope>
<artifactId>oci-java-sdk-database</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.config</groupId>
Expand Down
4 changes: 2 additions & 2 deletions ...s/oci/atp-cdi/src/main/java/io/helidon/examples/integrations/oci/atp/cdi/AtpResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
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 com.oracle.bmc.http.client.Options;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import jakarta.ws.rs.GET;
Expand Down Expand Up @@ -82,7 +82,7 @@ public class AtpResource {
@GET
@Path("/wallet")
public Response generateWallet() {
ResponseHelper.shouldAutoCloseResponseInputStream(false);
Options.shouldAutoCloseResponseInputStream(false);
GenerateAutonomousDatabaseWalletResponse walletResponse =
databaseClient.generateAutonomousDatabaseWallet(
GenerateAutonomousDatabaseWalletRequest.builder()
Expand Down
17 changes: 1 addition & 16 deletions examples/integrations/oci/atp-reactive/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,6 @@
<mainClass>io.helidon.examples.integrations.oci.atp.reactive.OciAtpMain</mainClass>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-shaded-full</artifactId>
<version>${version.lib.oci}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>io.helidon.webserver</groupId>
Expand All @@ -71,12 +61,7 @@
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-shaded-full</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<scope>runtime</scope>
<artifactId>oci-java-sdk-database</artifactId>
</dependency>
</dependencies>

Expand Down
17 changes: 1 addition & 16 deletions examples/integrations/oci/metrics-reactive/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,6 @@
<name>Helidon Examples Integration OCI Metrics Reactive</name>
<description>Reactive integration with OCI Metrics.</description>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-shaded-full</artifactId>
<version>${version.lib.oci}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>io.helidon.webserver</groupId>
Expand All @@ -58,12 +48,7 @@
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-shaded-full</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<scope>runtime</scope>
<artifactId>oci-java-sdk-monitoring</artifactId>
</dependency>
</dependencies>

Expand Down
18 changes: 1 addition & 17 deletions examples/integrations/oci/objectstorage-cdi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,6 @@
<mainClass>io.helidon.examples.integrations.oci.objectstorage.cdi.ObjectStorageCdiMain</mainClass>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-shaded-full</artifactId>
<version>${version.lib.oci}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>io.helidon.microprofile.bundles</groupId>
Expand All @@ -55,16 +45,10 @@
<dependency>
<groupId>io.helidon.integrations.oci.sdk</groupId>
<artifactId>helidon-integrations-oci-sdk-cdi</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-shaded-full</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<scope>runtime</scope>
<artifactId>oci-java-sdk-objectstorage</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.config</groupId>
Expand Down
17 changes: 2 additions & 15 deletions examples/integrations/oci/objectstorage-reactive/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,7 @@
<properties>
<mainClass>io.helidon.examples.integrations.oci.objecstorage.reactive.OciObjectStorageMain</mainClass>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-shaded-full</artifactId>
<version>${version.lib.oci}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>io.helidon.webserver</groupId>
Expand All @@ -56,12 +48,7 @@
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-shaded-full</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<scope>runtime</scope>
<artifactId>oci-java-sdk-objectstorage</artifactId>
</dependency>
</dependencies>

Expand Down
22 changes: 7 additions & 15 deletions examples/integrations/oci/vault-cdi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,6 @@
<mainClass>io.helidon.examples.integrations.oci.vault.cdi.VaultCdiMain</mainClass>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-shaded-full</artifactId>
<version>${version.lib.oci}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>io.helidon.microprofile.bundles</groupId>
Expand All @@ -55,16 +45,18 @@
<dependency>
<groupId>io.helidon.integrations.oci.sdk</groupId>
<artifactId>helidon-integrations-oci-sdk-cdi</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-shaded-full</artifactId>
<artifactId>oci-java-sdk-keymanagement</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<scope>runtime</scope>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-secrets</artifactId>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-vault</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down
21 changes: 7 additions & 14 deletions examples/integrations/oci/vault-reactive/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,6 @@
<mainClass>io.helidon.examples.integrations.oci.vault.reactive.OciVaultMain</mainClass>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-shaded-full</artifactId>
<version>${version.lib.oci}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>io.helidon.webserver</groupId>
Expand All @@ -58,12 +48,15 @@
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-shaded-full</artifactId>
<artifactId>oci-java-sdk-keymanagement</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<scope>runtime</scope>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-secrets</artifactId>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-vault</artifactId>
</dependency>
</dependencies>

Expand Down
Loading