Upgrade spring-cloud-dependencies version to 2021.0.0 (#26060)

* fix version tags and upgrade spring-cloud-dependencies version * Temporarily fix compilation errors, this class will be removed in other PR * Update changelog file
Azure · Dec 16, 2021 · b157cf5 · b157cf5
1 parent 753b1be
commit b157cf5
Show file tree

Hide file tree

Showing 24 changed files with 329 additions and 319 deletions.
diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt
@@ -41,7 +41,7 @@ com.squareup.okhttp3:okhttp;4.9.2
 com.zaxxer:HikariCP;4.0.3
 commons-codec:commons-codec;1.15
 commons-net:commons-net;3.6
-io.fabric8:kubernetes-client;4.13.3
+io.fabric8:kubernetes-client;5.9.0
 io.github.bonigarcia:webdrivermanager;4.3.1
 io.micrometer:micrometer-core;1.8.0
 io.micrometer:micrometer-registry-azure-monitor;1.8.0
@@ -102,7 +102,7 @@ org.slf4j:slf4j-simple;1.7.32
 
 ## Spring boot dependency versions
 org.springframework.boot:spring-boot-dependencies;2.6.1
-org.springframework.boot:spring-boot-actuator;2.5.4
+org.springframework.boot:spring-boot-actuator;2.6.1
 org.springframework.boot:spring-boot-actuator-autoconfigure;2.6.1
 org.springframework.boot:spring-boot-autoconfigure-processor;2.6.1
 org.springframework.boot:spring-boot-autoconfigure;2.6.1
@@ -111,6 +111,7 @@ org.springframework.boot:spring-boot-starter-actuator;2.6.1
 org.springframework.boot:spring-boot-starter-aop;2.6.1
 org.springframework.boot:spring-boot-starter-cache;2.6.1
 org.springframework.boot:spring-boot-starter-data-redis;2.6.1
+org.springframework.boot:spring-boot-starter-integration;2.6.1
 org.springframework.boot:spring-boot-starter-logging;2.6.1
 org.springframework.boot:spring-boot-starter-test;2.6.1
 org.springframework.boot:spring-boot-starter-validation;2.6.1
@@ -146,15 +147,15 @@ org.springframework.retry:spring-retry;1.3.1
 org.springframework.boot:spring-boot-starter-parent;2.6.1
 
 ## Spring cloud dependency versions
-org.springframework.cloud:spring-cloud-dependencies;2020.0.4
-org.springframework.cloud:spring-cloud-starter-bootstrap;3.0.4
-org.springframework.cloud:spring-cloud-bus;3.0.3
-org.springframework.cloud:spring-cloud-context;3.0.4
-org.springframework.cloud:spring-cloud-sleuth-api;3.0.3
-org.springframework.cloud:spring-cloud-starter-sleuth;3.0.3
-org.springframework.cloud:spring-cloud-starter-stream-kafka;3.1.4
-org.springframework.cloud:spring-cloud-stream-binder-test;3.1.4
-org.springframework.cloud:spring-cloud-stream;3.1.4
+org.springframework.cloud:spring-cloud-dependencies;2021.0.0
+org.springframework.cloud:spring-cloud-starter-bootstrap;3.1.0
+org.springframework.cloud:spring-cloud-bus;3.1.0
+org.springframework.cloud:spring-cloud-context;3.1.0
+org.springframework.cloud:spring-cloud-sleuth-api;3.1.0
+org.springframework.cloud:spring-cloud-starter-sleuth;3.1.0
+org.springframework.cloud:spring-cloud-starter-stream-kafka;3.2.1
+org.springframework.cloud:spring-cloud-stream-binder-test;3.2.1
+org.springframework.cloud:spring-cloud-stream;3.2.1
 
 pl.pragmatists:JUnitParams;1.1.1
 
@@ -196,7 +197,7 @@ org.eclipse.jetty:jetty-http;9.4.44.v20210927
 org.eclipse.jetty:jetty-server;9.4.44.v20210927
 org.eclipse.jgit:org.eclipse.jgit;4.5.7.201904151645-r
 org.glassfish:javax.json;1.1.4
-org.glassfish:jakarta.el;3.0.3
+org.glassfish:jakarta.el;3.0.4
 org.hamcrest:hamcrest-all;1.3
 org.hamcrest:hamcrest-library;2.2
 org.junit.jupiter:junit-jupiter;5.8.1

diff --git a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-bus</artifactId>
-            <version>3.0.3</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
+            <version>3.1.0</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -101,7 +101,7 @@
                             <includes>
                                 <include>org.springframework.boot:spring-boot-starter-actuator:[2.6.1]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
                                 <include>org.springframework.boot:spring-boot-starter-web:[2.6.1]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
-                                <include>org.springframework.cloud:spring-cloud-bus:[3.0.3]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
+                                <include>org.springframework.cloud:spring-cloud-bus:[3.1.0]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
                             </includes>
                         </bannedDependencies>
                     </rules>

diff --git a/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml b/sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/pom.xml
@@ -42,12 +42,12 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-bootstrap</artifactId>
-            <version>3.0.4</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
+            <version>3.1.0</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-context</artifactId>
-            <version>3.0.4</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
+            <version>3.1.0</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -142,8 +142,8 @@
                                 <include>org.springframework.boot:spring-boot-autoconfigure:[2.6.1]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
                                 <include>org.springframework.boot:spring-boot-actuator-autoconfigure:[2.6.1]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
                                 <include>org.springframework.boot:spring-boot-configuration-processor:[2.6.1]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
-                                <include>org.springframework.cloud:spring-cloud-context:[3.0.4]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
-                                <include>org.springframework.cloud:spring-cloud-starter-bootstrap:[3.0.4]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
+                                <include>org.springframework.cloud:spring-cloud-context:[3.1.0]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
+                                <include>org.springframework.cloud:spring-cloud-starter-bootstrap:[3.1.0]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
                                 <include>org.springframework:spring-web:[5.3.13]</include> <!-- {x-include-update;org.springframework:spring-web;external_dependency} -->
                             </includes>
                         </bannedDependencies>

diff --git a/sdk/appconfiguration/spring-cloud-azure-appconfiguration-config-web/pom.xml b/sdk/appconfiguration/spring-cloud-azure-appconfiguration-config-web/pom.xml
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-bus</artifactId>
-      <version>3.0.3</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
+      <version>3.1.0</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
       <optional>true</optional>
       <scope>compile</scope>
     </dependency>
@@ -86,7 +86,7 @@
                 <include>org.springframework.boot:spring-boot-starter-actuator:[2.6.1]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-actuator;external_dependency} -->
                 <include>com.microsoft.azure:spring-cloud-azure-appconfiguration-config:[1.4.0-beta.1]</include> <!-- {x-include-update;com.microsoft.azure:spring-cloud-azure-appconfiguration-config;current} -->
                 <include>org.springframework.boot:spring-boot-starter-web:[2.6.1]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-web;external_dependency} -->
-                <include>org.springframework.cloud:spring-cloud-bus:[3.0.3]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
+                <include>org.springframework.cloud:spring-cloud-bus:[3.1.0]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-bus;external_dependency} -->
               </includes>
             </bannedDependencies>
           </rules>

diff --git a/sdk/appconfiguration/spring-cloud-azure-appconfiguration-config/pom.xml b/sdk/appconfiguration/spring-cloud-azure-appconfiguration-config/pom.xml
@@ -36,12 +36,12 @@
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-context</artifactId>
-      <version>3.0.4</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
+      <version>3.1.0</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
     </dependency>
     <dependency>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-starter-bootstrap</artifactId>
-        <version>3.0.4</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
+        <version>3.1.0</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
@@ -170,8 +170,8 @@
                 <include>org.springframework.boot:spring-boot-autoconfigure:[2.6.1]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
                 <include>org.springframework.boot:spring-boot-actuator-autoconfigure:[2.6.1]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-actuator-autoconfigure;external_dependency} -->
                 <include>org.springframework.boot:spring-boot-configuration-processor:[2.6.1]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
-                <include>org.springframework.cloud:spring-cloud-context:[3.0.4]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
-                <include>org.springframework.cloud:spring-cloud-starter-bootstrap:[3.0.4]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
+                <include>org.springframework.cloud:spring-cloud-context:[3.1.0]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
+                <include>org.springframework.cloud:spring-cloud-starter-bootstrap:[3.1.0]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
                 <include>org.springframework:spring-web:[5.3.13]</include> <!-- {x-include-update;org.springframework:spring-web;external_dependency} -->
               </includes>
             </bannedDependencies>

diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml b/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml
@@ -118,7 +118,7 @@
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-client</artifactId>
-      <version>4.13.3</version> <!-- {x-version-update;io.fabric8:kubernetes-client;external_dependency} -->
+      <version>5.9.0</version> <!-- {x-version-update;io.fabric8:kubernetes-client;external_dependency} -->
     </dependency>
     <dependency>
       <groupId>com.microsoft.sqlserver</groupId>
@@ -198,7 +198,7 @@
             <bannedDependencies>
               <includes>
                 <include>org.apache.httpcomponents:httpclient:[4.5.13]</include> <!-- {x-include-update;org.apache.httpcomponents:httpclient;external_dependency} -->
-                <include>io.fabric8:kubernetes-client:[4.13.3]</include> <!-- {x-include-update;io.fabric8:kubernetes-client;external_dependency} -->
+                <include>io.fabric8:kubernetes-client:[5.9.0]</include> <!-- {x-include-update;io.fabric8:kubernetes-client;external_dependency} -->
                 <include>com.jcraft:jsch:[0.1.55]</include> <!-- {x-include-update;resourcemanager_com.jcraft:jsch;external_dependency} -->
                 <include>org.slf4j:slf4j-simple:[1.7.32]</include> <!-- {x-include-update;org.slf4j:slf4j-simple;external_dependency} -->
                 <include>com.google.guava:guava:[30.1.1-jre]</include> <!-- {x-include-update;com.google.guava:guava;external_dependency} -->

diff --git a/sdk/spring/CHANGELOG.md b/sdk/spring/CHANGELOG.md
@@ -1,9 +1,16 @@
 # Release History
 
 ## 4.0.0-beta.3 (Unreleased)
+- Supported spring-boot version: 2.6.0 - 2.6.1
+- Supported spring-cloud version: 2021.0.0
 
 ### Features Added
 
+### Breaking Changes
+
+### Dependency Updates
+Upgrade dependency according to spring-boot-dependencies:2.6.1 and spring-cloud-dependencies:2021.0.0
+
 ### Breaking Changes
 1. Property name "spring.cloud.azure.active-directory.tenant-id" changed to "spring.cloud.azure.active-directory.profile.tenant-id".
 2. Property name "spring.cloud.azure.active-directory.client-id" changed to "spring.cloud.azure.active-directory.credential.client-id".

diff --git a/sdk/spring/azure-spring-boot-test-parent/pom.xml b/sdk/spring/azure-spring-boot-test-parent/pom.xml
@@ -26,7 +26,7 @@
       <dependency>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-dependencies</artifactId>
-        <version>2020.0.4</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-dependencies;external_dependency} -->
+        <version>2021.0.0</version> <!-- {x-version-update;org.springframework.cloud:spring-cloud-dependencies;external_dependency} -->
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/sdk/spring/scripts/README.md b/sdk/spring/scripts/README.md
@@ -6,7 +6,7 @@ Scripts in this folder is used to hold the scripts used in Spring Cloud Azure pr
 
 ## How to upgrade spring boot versions.
 
-1. Update `SPRING_BOOT_VERSION` and `SPRING_CLOUD_VERSION` in `update_spring_boot_managed_external_dependencies.py`.
+1. Update `SPRING_BOOT_VERSION` and `SPRING_CLOUD_VERSION` in `get_spring_boot_managed_external_dependencies.py`.
 2. Run command `python .\sdk\spring\scripts\get_spring_boot_managed_external_dependencies.py`.
 3. Update `SPRING_BOOT_VERSION` in `sync_external_dependencies.py`.
 4. Run command `python .\sdk\spring\scripts\sync_external_dependencies.py`.

diff --git a/sdk/spring/scripts/get_spring_boot_managed_external_dependencies.py b/sdk/spring/scripts/get_spring_boot_managed_external_dependencies.py
@@ -21,7 +21,7 @@
 from pom import Pom
 
 SPRING_BOOT_VERSION = '2.6.1'
-SPRING_CLOUD_VERSION = '2020.0.4'
+SPRING_CLOUD_VERSION = '2021.0.0'
 
 ROOT_POMS = [
     'org.springframework.boot:spring-boot-starter-parent;{}'.format(SPRING_BOOT_VERSION),