update sca 4.14/5.8 (#736)

update sb 2.7.18/3.2(sc 2023.0.0) open app config sample for 5.x(remove guava for unused)
Azure-Samples · Dec 15, 2023 · 2e2c9d5 · 2e2c9d5
1 parent 76bf6ca
commit 2e2c9d5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 28 deletions.
diff --git a/...convert-sample/spring-cloud-azure-appconfiguration-config-convert-sample-complete/pom.xml b/...convert-sample/spring-cloud-azure-appconfiguration-config-convert-sample-complete/pom.xml
@@ -23,10 +23,6 @@
       <groupId>com.azure.spring</groupId>
       <artifactId>spring-cloud-azure-starter-data-cosmos</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.azure.spring</groupId>
       <artifactId>spring-cloud-azure-appconfiguration-config</artifactId>

diff --git a/...ple/spring-cloud-azure-appconfiguration-config-convert-sample-initial/README.md b/...ple/spring-cloud-azure-appconfiguration-config-convert-sample-initial/README.md
@@ -192,7 +192,7 @@ In this section, you clone a containerized Spring Boot application and test it l
    <dependency>
      <groupId>com.azure.spring</groupId>
      <artifactId>spring-cloud-azure-appconfiguration-config</artifactId>
-     <version>4.13.0</version>
+     <version>4.14.0</version>
    </dependency>
     ```
     

diff --git a/...-convert-sample/spring-cloud-azure-appconfiguration-config-convert-sample-initial/pom.xml b/...-convert-sample/spring-cloud-azure-appconfiguration-config-convert-sample-initial/pom.xml
@@ -24,10 +24,6 @@
       <groupId>com.azure.spring</groupId>
       <artifactId>spring-cloud-azure-starter-data-cosmos</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-logging</artifactId>

diff --git a/...azure-feature-management/spring-cloud-azure-feature-management-sample/README.md b/...azure-feature-management/spring-cloud-azure-feature-management-sample/README.md
@@ -53,7 +53,7 @@ It will have you confirm the feature flag before loading it.
 <dependency>
     <groupId>com.azure.spring</groupId>
     <artifactId>spring-cloud-azure-appconfiguration-config</artifactId>
-    <version>4.13.0</version>
+    <version>4.14.0</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -118,21 +118,15 @@
       <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <version.spring.boot>2.7.17</version.spring.boot>
-        <version.guava>31.1-jre</version.guava>
+        <version.spring.boot>2.7.18</version.spring.boot>
         <version.spring.cloud>2021.0.8</version.spring.cloud>
-        <version.spring.cloud.azure>4.13.0</version.spring.cloud.azure>
+        <version.spring.cloud.azure>4.14.0</version.spring.cloud.azure>
         <version.azure-spring-boot-starter-keyvault-certificates>3.14.0</version.azure-spring-boot-starter-keyvault-certificates>
         <version.maven-surefire-plugin>3.0.0</version.maven-surefire-plugin>
         <mockito.version>4.11.0</mockito.version>
       </properties>
       <dependencyManagement>
         <dependencies>
-          <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>${version.guava}</version>
-          </dependency>
           <dependency>
             <groupId>com.azure.spring</groupId>
             <artifactId>azure-spring-boot-starter-keyvault-certificates</artifactId>
@@ -144,13 +138,12 @@
     <profile>
       <id>spring-cloud-azure-5.x</id>
       <modules>
-<!--will be open after spring-data-cosmos supported-->
-<!--        <module>-->
-<!--          appconfiguration/spring-cloud-azure-appconfiguration-config/spring-cloud-azure-appconfiguration-config-convert-sample/spring-cloud-azure-appconfiguration-config-convert-sample-complete-->
-<!--        </module>-->
-<!--        <module>-->
-<!--          appconfiguration/spring-cloud-azure-appconfiguration-config/spring-cloud-azure-appconfiguration-config-convert-sample/spring-cloud-azure-appconfiguration-config-convert-sample-initial-->
-<!--        </module>-->
+        <module>
+          appconfiguration/spring-cloud-azure-appconfiguration-config/spring-cloud-azure-appconfiguration-config-convert-sample/spring-cloud-azure-appconfiguration-config-convert-sample-complete
+        </module>
+        <module>
+          appconfiguration/spring-cloud-azure-appconfiguration-config/spring-cloud-azure-appconfiguration-config-convert-sample/spring-cloud-azure-appconfiguration-config-convert-sample-initial
+        </module>
         <module>appconfiguration/spring-cloud-azure-appconfiguration-config/spring-cloud-azure-appconfiguration-config-sample</module>
         <module>appconfiguration/spring-cloud-azure-feature-management-web/spring-cloud-azure-feature-management-web-sample</module>
         <module>appconfiguration/spring-cloud-azure-feature-management/spring-cloud-azure-feature-management-sample</module>
@@ -189,9 +182,9 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <java.version>17</java.version>
-        <version.spring.boot>3.1.5</version.spring.boot>
-        <version.spring.cloud>2022.0.4</version.spring.cloud>
-        <version.spring.cloud.azure>5.7.0</version.spring.cloud.azure>
+        <version.spring.boot>3.2.0</version.spring.boot>
+        <version.spring.cloud>2023.0.0</version.spring.cloud>
+        <version.spring.cloud.azure>5.8.0</version.spring.cloud.azure>
         <version.thymeleaf-extras-springsecurity6>3.1.1.RELEASE</version.thymeleaf-extras-springsecurity6>
         <version.jakarta-persistence>3.1.0</version.jakarta-persistence>