Logging clashes fix, sample app update and MN comments

Author: andytael

.github/workflows/integrationTest.yml

@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
-      - name: Setup Java 21
+      - name: Setup Java 17
         uses: actions/setup-java@v1
         with:
-          java-version: 21
+          java-version: 17
           distribution: 'temurin'
           java-package: 'jdk'
           cache: 'maven'

.gitignore

@@ -5,11 +5,6 @@
 **/*.rpm
 **/*.jar
 **/*.bin
-*.patch
-env.sh
-labs/.DS_Store
-
-.idea/**
 
 ### STS ###
 .apt_generated
@@ -38,19 +33,10 @@ build/
 !**/src/test/**/build/
 
 ### VS Code ###
-.vscode/
+.vscode/**
 /.jpb/**
 
-*.iml
-*.ipr
-*.iws
 *.log
-.DS_Store
-.idea
 .run
 target/
 Thumbs.db
-ocibuild.conf
-sca-config.json
-input_ocibuild*
-output_ocibuild*

README.md

@@ -15,14 +15,16 @@ 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, 2023.0.x | 3.2.x, 3.1.x, 3.0.x | 3.41.1       |
+| 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
 

pom.xml

@@ -76,7 +76,6 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
         <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>
-        <slf4j-simple.version>2.0.13</slf4j-simple.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.12</jacoco-maven-plugin.version>
@@ -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>
@@ -183,29 +177,6 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
         </pluginManagement>
 
 		<plugins>
-            <!-- OpenRewrite Plugin 
-            Due to a bug, the build has to be executed like this:
-            mvn -U org.openrewrite.maven:rewrite-maven-plugin:dryRun \
-            -Drewrite.recipeArtifactCoordinates=org.openrewrite.recipe:rewrite-spring:RELEASE \
-            -Drewrite.activeRecipes=org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2
-             -->
-            <plugin>
-                <groupId>org.openrewrite.maven</groupId>
-                <artifactId>rewrite-maven-plugin</artifactId>
-                <version>5.30.0</version>
-                <configuration>
-                <activeRecipes>
-                    <recipe>org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2</recipe>
-                </activeRecipes>
-                </configuration>
-                <dependencies>
-                <dependency>
-                    <groupId>org.openrewrite.recipe</groupId>
-                    <artifactId>rewrite-spring</artifactId>
-                    <version>5.9.0</version>
-                </dependency>
-                </dependencies>
-            </plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>

spring-cloud-oci-samples/spring-cloud-oci-function-sample/src/main/resources/application.properties

@@ -2,4 +2,4 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 spring.cloud.oci.region.static = us-ashburn-1
-spring.cloud.oci.config.type = SESSION_TOKEN
+#spring.cloud.oci.config.type = SESSION_TOKEN