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 @@ This project adds support for the RestEasyClientConfigurator for the Java SDK https://docs.cloud.oracle.com/Content/API/SDKDocs/javasdk.htm - - - - org.jboss.resteasy - resteasy-client - 4.5.9.Final - - org.jboss.resteasy - resteasy-jaxrs - 3.15.1.Final + resteasy-core - - - - org.apache.httpcomponents - httpclient - ${apache-httpcomponents.version} - - com.oracle.oci.sdk oci-java-sdk-common 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 @@ com.google.protobuf protobuf-java - 3.19.3 com.oracle.oci.sdk diff --git a/bmc-circuitbreaker/pom.xml b/bmc-circuitbreaker/pom.xml index 5673e141a00..39cccd35e85 100644 --- a/bmc-circuitbreaker/pom.xml +++ b/bmc-circuitbreaker/pom.xml @@ -13,47 +13,22 @@ This project contains the Circuit Breaker module used for Oracle Cloud Infrastructure SDKs https://docs.cloud.oracle.com/Content/API/SDKDocs/javasdk.htm - - UTF-8 - - - - - - - - src/main/resources - true - - - - - - org.projectlombok - lombok - com.google.guava guava - - - com.google.code.findbugs - jsr305 + provided io.github.resilience4j resilience4j-circuitbreaker + org.glassfish.jersey.core jersey-client + test - - org.glassfish.jersey.inject - jersey-hk2 - - org.mockito mockito-core diff --git a/bmc-common/pom.xml b/bmc-common/pom.xml index ad81069cd51..435f794f12a 100644 --- a/bmc-common/pom.xml +++ b/bmc-common/pom.xml @@ -13,11 +13,6 @@ This project contains the common runtime components of the SDK used for Oracle Cloud Infrastructure https://docs.cloud.oracle.com/Content/API/SDKDocs/javasdk.htm - - 1.70 - - - @@ -29,6 +24,23 @@ + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.google.code.findbugs + jsr305 + provided + com.google.guava guava @@ -45,21 +57,6 @@ org.apache.commons commons-lang3 - - - com.google.code.findbugs - jsr305 - - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - com.fasterxml.jackson.datatype - jackson-datatype-jdk8 - - org.glassfish.jersey.core jersey-client @@ -72,26 +69,17 @@ org.glassfish.jersey.media jersey-media-json-jackson - org.bouncycastle bcpkix-jdk15on - ${bouncycastle.version} org.bouncycastle bcprov-jdk15on - ${bouncycastle.version} com.nimbusds nimbus-jose-jwt - 9.11.1 - - - net.minidev - json-smart - 2.4.7 io.github.resilience4j @@ -106,12 +94,6 @@ org.glassfish.jersey.connectors jersey-apache-connector - ${jersey.version} - - - org.apache.httpcomponents - httpclient - ${apache-httpcomponents.version} diff --git a/bmc-encryption/pom.xml b/bmc-encryption/pom.xml index 40a73ae81c9..cbe0df61f6a 100644 --- a/bmc-encryption/pom.xml +++ b/bmc-encryption/pom.xml @@ -14,24 +14,11 @@ This project contains the common runtime components of the SDK used for Oracle Cloud Infrastructure https://docs.cloud.oracle.com/Content/API/SDKDocs/javasdk.htm - - 1.70 - - - - - - com.oracle.oci.sdk oci-java-sdk-common 2.22.0 - - - com.oracle.oci.sdk - oci-java-sdk-circuitbreaker - 2.22.0 com.oracle.oci.sdk @@ -39,12 +26,21 @@ 2.22.0 - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 + com.fasterxml.jackson.core + jackson-annotations - com.fasterxml.jackson.datatype - jackson-datatype-jdk8 + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + net.minidev + json-smart + 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 @@ org.slf4j slf4j-simple - ${slf4j.version} runtime @@ -124,7 +123,6 @@ net.jodah failsafe - 0.9.2 com.oracle.oci.sdk @@ -463,4 +461,4 @@ oci-java-sdk-dataconnectivity - \ No newline at end of file + 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 @@ org.slf4j slf4j-api - ${slf4j.version} org.bouncycastle bcpkix-jdk15on - ${bouncycastle.version} org.bouncycastle bcprov-jdk15on - ${bouncycastle.version} - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index d3fc9e4accb..cb7d3e9baa9 100644 --- a/pom.xml +++ b/pom.xml @@ -37,8 +37,11 @@ 2.13.1 2.35 4.5.13 + ${apache-httpcomponents.version} + 4.4.15 31.0.1-jre 4.13.2 + 2.0.0.0 1.18.20 1.18.20.0 3.0.2 @@ -50,10 +53,15 @@ 1.7.1 0.10.4 + 2.4.7 3.1.1 1.70 + 3.19.3 + 4.5.9.Final 1.10.19 + 9.11.1 1.7.4 + 0.9.2 **/*IntegrationAutoTest.java true true @@ -476,7 +484,6 @@ org.hamcrest hamcrest-junit - 2.0.0.0 test @@ -487,13 +494,11 @@ org.powermock powermock-module-junit4 - ${powermock.version} test org.powermock powermock-api-mockito - ${powermock.version} test @@ -506,30 +511,44 @@ jakarta.ws.rs jakarta.ws.rs-api - ${jakarta.ws.rs-api.version} org.slf4j slf4j-api - ${slf4j.version} - org.glassfish.jersey.core - jersey-client - ${jersey.version} + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs-api.version} - org.glassfish.jersey.inject - jersey-hk2 + org.glassfish.jersey + jersey-bom ${jersey.version} + pom + import - org.glassfish.jersey.media - jersey-media-json-jackson - ${jersey.version} + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import + + + org.jboss.resteasy + resteasy-bom + ${resteasy.version} + pom + import + + + org.jboss.resteasy + resteasy-core + ${resteasy.version} com.google.code.findbugs @@ -541,11 +560,25 @@ guava ${guava.version} + + com.google.protobuf + protobuf-java + ${protobuf.java.version} + + + org.apache.httpcomponents + httpclient + ${apache.httpcomponents.httpclient.version} + + + org.apache.httpcomponents + httpcore + ${apache.httpcomponents.httpcore.version} + org.projectlombok lombok ${lombok.version} - provided commons-codec @@ -562,36 +595,6 @@ commons-io ${commons-io.version} - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-base - ${jackson.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-jdk8 - ${jackson.version} - io.github.resilience4j resilience4j-core @@ -603,21 +606,76 @@ ${resilience4jVersion} + io.vavr vavr ${io.vavr.version} + + net.minidev + json-smart + ${json.smart.version} + junit junit ${junit.version} + + org.bouncycastle + bcpkix-jdk15on + ${bouncycastle.version} + + + org.bouncycastle + bcprov-jdk15on + ${bouncycastle.version} + + + org.bouncycastle + bcutil-jdk15on + ${bouncycastle.version} + + + com.nimbusds + nimbus-jose-jwt + ${nimbus.jose.jwt.version} + org.mockito mockito-core ${mockito.version} - test + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-simple + ${slf4j.version} + + + org.hamcrest + hamcrest-junit + ${hamcrest.junit.version} + + + org.powermock + powermock-module-junit4 + ${powermock.version} + + + org.powermock + powermock-api-mockito + ${powermock.version} + + + net.jodah + failsafe + ${net.jodah.failsafe.version} @@ -731,4 +789,4 @@ bmc-full bmc-shaded - \ No newline at end of file +