Merge pull request #36 from oracle/andytael/upgrades

Initial commit for upgrades

Author: andytael

.gitignore

@@ -1,16 +1,42 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
+.DS_Store
+**/*.rpm
+**/*.jar
+**/*.bin
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
 *.iml
 *.ipr
-*.iws
+.idea/**
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/**
+/.jpb/**
+
 *.log
-.DS_Store
-.idea
 .run
 target/
 Thumbs.db
-ocibuild.conf
-sca-config.json
-input_ocibuild*
-output_ocibuild*

LICENSE.txt

@@ -1,6 +1,6 @@
 Spring Cloud for OCI.
 
-Copyright (c) 2023, Oracle and/or its affiliates. 
+Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 
 The Universal Permissive License (UPL), Version 1.0 
 

README.md

@@ -3,7 +3,8 @@
 [![License: UPL](https://img.shields.io/badge/license-UPL-green)](https://img.shields.io/badge/license-UPL-green)
 
 ## Introduction
-Spring Cloud for OCI, eases the integration with OCI services with the help of OCI Java SDK internally. It offers a convenient way to interact with OCI-provided services using well-known Spring idioms and APIs, such as the messaging or storage API. Developers can build their applications around the hosted services without having to care about infrastructure or maintenance. Spring Cloud for OCI contains auto-configuration support for OCI-managed services.
+
+Spring Cloud for OCI, eases the integration with OCI services with the help of OCI Java SDK internally. It offers a convenient way to interact with OCI-provided services using well-known Spring idioms and APIs, such as the messaging or storage API. Developers can build their applications around the hosted services without having to care about infrastructure or maintenance. Spring Cloud for OCI contains autoconfiguration support for OCI-managed services.
 
 All Spring Cloud for OCI artifacts are made available through Maven Central. With Spring Cloud for OCI, the developers only need to add some annotations and a small number of configurations to connect Spring Cloud applications to the OCI services.
 
@@ -14,23 +15,24 @@ For a deep dive into the project, refer to the Spring Cloud OCI documentation:
 | Version                | Reference Docs                                                                              | API Docs                                                                        |
 |------------------------|---------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------|
 | Spring Cloud OCI 1.0.0 | [Reference Docs](https://oracle.github.io/spring-cloud-oci/1.0.0/reference/html/index.html) | [API Docs](https://oracle.github.io/spring-cloud-oci/1.0.0/javadocs/index.html) |
-
+| Spring Cloud OCI 1.0.1 | [Reference Docs](https://oracle.github.io/spring-cloud-oci/1.0.0/reference/html/index.html) | [API Docs](https://oracle.github.io/spring-cloud-oci/1.0.0/javadocs/index.html) 
 
 ## Compatibility with Spring Project Versions
 
 This project has dependency and transitive dependencies on Spring Projects. The table below outlines the versions of Spring Cloud, Spring Boot and Spring Framework versions that are compatible with certain Spring Cloud OCI version.
 
-| Spring Cloud OCI  | Spring Cloud              | Spring Boot         | OCI Java SDK |
-|-------------------|---------------------------|---------------------|--------------|
-| 1.0.0  	        | 2022.0.x                  | 3.1.x, 3.0.x        | 3.24.0       |
-
+| Spring Cloud OCI | Spring Cloud | Spring Boot  | OCI Java SDK |
+|------------------|--------------|--------------|--------------|
+| 1.0.0            | 2022.0.x     | 3.1.x, 3.0.x | 3.24.0       |
+| 1.0.1            | 2023.0.x     | 3.2.x        | 3.41.1       |
 
 ## Try out samples
-You may checkout samples for the each service supported by Spring Cloud OCI below.
 
-* [OCI Storage Sample](./spring-cloud-oci-samples/spring-cloud-oci-storage-sample/)
-* [OCI Notification Service Sample](./spring-cloud-oci-samples/spring-cloud-oci-notification-sample/)
-* [OCI Logging Service Sample](./spring-cloud-oci-samples/spring-cloud-oci-logging-sample/)
+Samples for each service supported by Spring Cloud OCI below:
+
+* [OCI Storage Sample](spring-cloud-oci-samples/spring-cloud-oci-storage-sample/README.md)
+* [OCI Notification Service Sample](spring-cloud-oci-samples/spring-cloud-oci-notification-sample/README.md)
+* [OCI Logging Service Sample](spring-cloud-oci-samples/spring-cloud-oci-logging-sample/README.md)
 
 ## Checking out and building
 
@@ -42,35 +44,37 @@ or
 
 To check out the project manually and build it from source, do the following:
 
-```
+```shell
 git clone https://github.com/oracle/spring-cloud-oci.git
 cd spring-cloud-oci
 mvn package
 ```
 
 To build and install jars into your local Maven cache:
 
-```
+```shell
 mvn install
 ```
 
 For faster builds, we recommend using [Maven Daemon](https://github.com/apache/maven-mvnd) and using following commands:
 
 Build:
-```
+
+```shell
 make build
 ```
 
 Clean:
-```
+
+```shell
 make clean
 ```
 
 ## Documentation
 
 Java docs can be generated with below command
 
-```
+```shell
 make javadocs
 ```
 

pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (c) 2023, Oracle and/or its affiliates.
+Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 -->
 
@@ -62,25 +62,24 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
 
     <properties>
         <spring-cloud-oci-dependencies.version>${project.version}</spring-cloud-oci-dependencies.version>
-        <spring-cloud-dependencies.version>2022.0.4</spring-cloud-dependencies.version>
-        <spring-boot-dependencies.version>3.1.2</spring-boot-dependencies.version>
-        <oci-sdk.version>3.24.0</oci-sdk.version>
-        <spring-boot-maven-plugin.version>3.1.2</spring-boot-maven-plugin.version>
+        <spring-cloud-dependencies.version>2023.0.1</spring-cloud-dependencies.version>
+        <spring-boot-dependencies.version>3.2.5</spring-boot-dependencies.version>
+        <oci-sdk.version>3.41.1</oci-sdk.version>
+        <spring-boot-maven-plugin.version>3.2.5</spring-boot-maven-plugin.version>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
-        <maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
-        <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
-        <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
-        <springdoc-openapi-ui.version>1.6.13</springdoc-openapi-ui.version>
-        <commons-lang3.version>3.12.0</commons-lang3.version>
-        <lombok.version>1.18.20</lombok.version>
-        <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
-        <slf4j-simple.version>1.7.33</slf4j-simple.version>
-        <flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
+        <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
+        <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
+        <maven-jar-plugin.version>3.4.1</maven-jar-plugin.version>
+        <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
+        <springdoc-openapi-starter-webmvc-ui.version>2.5.0</springdoc-openapi-starter-webmvc-ui.version>
+        <commons-lang3.version>3.14.0</commons-lang3.version>
+        <lombok.version>1.18.32</lombok.version>
+        <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
+        <flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
         <checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
-        <jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
-        <cc.code-coverage-ratio>0.90</cc.code-coverage-ratio>
+        <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
+        <cc.code-coverage-ratio>0.80</cc.code-coverage-ratio>
         <!--<dependency-check-maven.version>8.4.0</dependency-check-maven.version>
         <failBuildOnCVSS.score>8</failBuildOnCVSS.score> -->
     </properties>
@@ -101,8 +100,8 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
             </dependency>
             <dependency>
                 <groupId>org.springdoc</groupId>
-                <artifactId>springdoc-openapi-ui</artifactId>
-                <version>${springdoc-openapi-ui.version}</version>
+                <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+                <version>${springdoc-openapi-starter-webmvc-ui.version}</version>
             </dependency>
 
             <dependency>
@@ -117,9 +116,9 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>javax.servlet-api</artifactId>
-                <version>${javax.servlet-api.version}</version>
+                <groupId>jakarta.servlet</groupId>
+                <artifactId>jakarta.servlet-api</artifactId>
+                <version>${jakarta.servlet-api.version}</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
@@ -148,11 +147,6 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
     </dependencyManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>${slf4j-simple.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

spring-cloud-oci-autoconfigure/src/main/java/com/oracle/cloud/spring/autoconfigure/core/CredentialsProvider.java

@@ -7,7 +7,13 @@
 
 import com.oracle.bmc.ClientRuntime;
 import com.oracle.bmc.Region;
-import com.oracle.bmc.auth.*;
+import com.oracle.bmc.auth.BasicAuthenticationDetailsProvider;
+import com.oracle.bmc.auth.ConfigFileAuthenticationDetailsProvider;
+import com.oracle.bmc.auth.InstancePrincipalsAuthenticationDetailsProvider;
+import com.oracle.bmc.auth.ResourcePrincipalAuthenticationDetailsProvider;
+import com.oracle.bmc.auth.SessionTokenAuthenticationDetailsProvider;
+import com.oracle.bmc.auth.SimpleAuthenticationDetailsProvider;
+import com.oracle.bmc.auth.SimplePrivateKeySupplier;
 
 import java.io.IOException;
 

spring-cloud-oci-autoconfigure/src/main/java/com/oracle/cloud/spring/autoconfigure/core/CredentialsProviderAutoConfiguration.java

@@ -5,16 +5,7 @@
 
 package com.oracle.cloud.spring.autoconfigure.core;
 
-import com.oracle.bmc.ClientRuntime;
-import com.oracle.bmc.Region;
 import com.oracle.bmc.auth.AuthenticationDetailsProvider;
-import com.oracle.bmc.auth.BasicAuthenticationDetailsProvider;
-import com.oracle.bmc.auth.ConfigFileAuthenticationDetailsProvider;
-import com.oracle.bmc.auth.InstancePrincipalsAuthenticationDetailsProvider;
-import com.oracle.bmc.auth.ResourcePrincipalAuthenticationDetailsProvider;
-import com.oracle.bmc.auth.SimpleAuthenticationDetailsProvider;
-import com.oracle.bmc.auth.SimplePrivateKeySupplier;
-import com.oracle.bmc.auth.SessionTokenAuthenticationDetailsProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;

spring-cloud-oci-autoconfigure/src/main/java/com/oracle/cloud/spring/streaming/StreamingAutoConfiguration.java

@@ -45,6 +45,7 @@ Streaming getStreamingImpl(Stream stream, StreamAdmin streamAdmin) {
         return new StreamingImpl(stream, streamAdmin);
     }
 
+    // TODO: StreamClient has been deprecated
     @Bean
     @RefreshScope
     @ConditionalOnMissingBean

spring-cloud-oci-autoconfigure/src/test/java/com/oracle/cloud/spring/autoconfigure/core/RegionProviderAutoConfigurationTests.java

@@ -7,14 +7,17 @@
 
 import com.oracle.bmc.Region;
 import com.oracle.bmc.auth.RegionProvider;
-import com.oracle.cloud.spring.core.compartment.CompartmentProvider;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 class RegionProviderAutoConfigurationTests {
     private final ApplicationContextRunner contextRunner =
             new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(

spring-cloud-oci-autoconfigure/src/test/java/com/oracle/cloud/spring/function/FunctionAutoConfigurationTests.java

@@ -23,7 +23,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.when;
 
 public class FunctionAutoConfigurationTests {

spring-cloud-oci-autoconfigure/src/test/java/com/oracle/cloud/spring/logging/LoggingAutoConfigurationTests.java

@@ -12,6 +12,15 @@
 import com.oracle.cloud.spring.autoconfigure.TestCommonConfigurationBeans;
 import com.oracle.cloud.spring.autoconfigure.core.CredentialsProvider;
 import com.oracle.cloud.spring.core.region.StaticRegionProvider;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.when;
+
 import org.junit.jupiter.api.Test;
 import org.mockito.MockedStatic;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
@@ -20,10 +29,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
 class LoggingAutoConfigurationTests {
     private final ApplicationContextRunner contextRunner =
             new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(LoggingAutoConfiguration.class,