Skip to content

Commit 8c3662a

Browse files
committed
Squashable commit; simplifies dependency trees; adjusts ATP CDI example to use non-deprecated (now not present) class
Signed-off-by: Laird Nelson <laird.nelson@oracle.com>
1 parent 7653543 commit 8c3662a

File tree

3 files changed

+19
-8
lines changed
  • examples/integrations
  • integrations/oci/sdk/cdi

3 files changed

+19
-8
lines changed

examples/integrations/cdi/oci-objectstorage/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@
3838
<scope>compile</scope>
3939
</dependency>
4040
<dependency>
41-
<groupId>jakarta.ws.rs</groupId>
42-
<artifactId>jakarta.ws.rs-api</artifactId>
41+
<groupId>com.oracle.oci.sdk</groupId>
42+
<artifactId>oci-java-sdk-objectstorage</artifactId>
4343
<scope>compile</scope>
4444
</dependency>
4545
<dependency>
46-
<groupId>com.oracle.oci.sdk</groupId>
47-
<artifactId>oci-java-sdk-objectstorage</artifactId>
46+
<groupId>jakarta.ws.rs</groupId>
47+
<artifactId>jakarta.ws.rs-api</artifactId>
4848
<scope>compile</scope>
4949
</dependency>
5050
<dependency>

examples/integrations/oci/atp-cdi/src/main/java/io/helidon/examples/integrations/oci/atp/cdi/AtpResource.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2021, 2022 Oracle and/or its affiliates.
2+
* Copyright (c) 2021, 2023 Oracle and/or its affiliates.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -44,10 +44,11 @@
4444
import com.oracle.bmc.database.model.GenerateAutonomousDatabaseWalletDetails;
4545
import com.oracle.bmc.database.requests.GenerateAutonomousDatabaseWalletRequest;
4646
import com.oracle.bmc.database.responses.GenerateAutonomousDatabaseWalletResponse;
47-
import com.oracle.bmc.http.internal.ResponseHelper;
4847
import oracle.security.pki.OraclePKIProvider;
4948
import oracle.ucp.jdbc.PoolDataSource;
5049
import org.eclipse.microprofile.config.inject.ConfigProperty;
50+
51+
import static com.oracle.bmc.http.client.Options.shouldAutoCloseResponseInputStream;
5152
/**
5253
* JAX-RS resource - REST API for the atp example.
5354
*/
@@ -82,7 +83,7 @@ public class AtpResource {
8283
@GET
8384
@Path("/wallet")
8485
public Response generateWallet() {
85-
ResponseHelper.shouldAutoCloseResponseInputStream(false);
86+
shouldAutoCloseResponseInputStream(false);
8687
GenerateAutonomousDatabaseWalletResponse walletResponse =
8788
databaseClient.generateAutonomousDatabaseWallet(
8889
GenerateAutonomousDatabaseWalletRequest.builder()

integrations/oci/sdk/cdi/pom.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,16 @@
7373
</exclusion>
7474
</exclusions>
7575
</dependency>
76+
<dependency>
77+
<groupId>jakarta.inject</groupId>
78+
<artifactId>jakarta.inject-api</artifactId>
79+
<scope>compile</scope>
80+
</dependency>
81+
<dependency>
82+
<groupId>jakarta.ws.rs</groupId>
83+
<artifactId>jakarta.ws.rs-api</artifactId>
84+
<scope>compile</scope>
85+
</dependency>
7686
<!-- For dependency convergence. To make sure we use Jersey version of org.apache.httpcomponents:httpclient and httpcore -->
7787
<dependency>
7888
<groupId>org.glassfish.jersey.connectors</groupId>
@@ -165,5 +175,5 @@
165175
</plugin>
166176
</plugins>
167177
</build>
168-
178+
169179
</project>

0 commit comments

Comments
 (0)